From 3e9ba72441e2487da454d65ad681b2b24fc6eabb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 1 Jul 2018 10:05:15 -0600 Subject: [PATCH] net/sixlowpan: Fix typo uint16->uint16_t. Also picks up some cosmetic USB host changes. --- drivers/usbhost/usbhost_skeleton.c | 2 +- include/nuttx/usb/max3421e.h | 8 ++++++-- net/sixlowpan/sixlowpan_tcpsend.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/usbhost/usbhost_skeleton.c b/drivers/usbhost/usbhost_skeleton.c index c79d2498ae..3e1a4fdd28 100644 --- 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 * * 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 index fbb705c2cb..1bb56d25a0 100644 --- a/include/nuttx/usb/max3421e.h +++ b/include/nuttx/usb/max3421e.h @@ -42,7 +42,7 @@ #include -#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 index 2f449395db..b9a2af6e95 100644 --- 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 */