net/sixlowpan: Fix typo uint16->uint16_t. Also picks up some cosmetic…

… USB host changes.
lucic71 · Jul 1, 2018 · 3e9ba72 · 3e9ba72
1 parent 824f1dd
commit 3e9ba72
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * drivers/usbhost/usbhost_skeleton.c
  *
- *   Copyright (C) 2017 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2018 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/include/nuttx/usb/max3421e.h b/include/nuttx/usb/max3421e.h
@@ -42,7 +42,7 @@
 
 #include <nuttx/config.h>
 
-#ifdef CONFIG_USBMONITOR
+#ifdef CONFIG_USBHOST_MAX3421E
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -308,6 +308,10 @@
 
 #define MAX3421E_SPIMODE                SPIDEV_MODE0
 
+/* The SPI clock frequency can be between DC and 26MHz. */
+
+#define MAX3421E_SPIFREQ_MAX            (26*1000*1000)
+
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -340,5 +344,5 @@ extern "C"
 }
 #endif
 
-#endif /* CONFIG_USBMONITOR */
+#endif /* CONFIG_USBHOST_MAX3421E */
 #endif /* __INCLUDE_NUTTX_USB_MAX3421E_H */
diff --git a/net/sixlowpan/sixlowpan_tcpsend.c b/net/sixlowpan/sixlowpan_tcpsend.c
@@ -269,7 +269,7 @@ static int sixlowpan_tcp_header(FAR struct tcp_conn_s *conn,
     {
       /* Update the TCP received window based on I/O buffer availability */
 
-      uint16 recvwndo = tcp_get_recvwindow(dev);
+      uint16_t recvwndo = tcp_get_recvwindow(dev);
 
       /* Set the TCP Window */