diff options
| -rw-r--r-- | apps/examples/cc3000/cc3000basic.c | 1 | ||||
| -rw-r--r-- | nuttx/include/nuttx/wireless/cc3000/cc3000_common.h | 2 | ||||
| -rw-r--r-- | nuttx/include/nuttx/wireless/cc3000/hci.h | 2 | ||||
| -rw-r--r-- | nuttx/include/nuttx/wireless/cc3000/wlan.h | 3 |
4 files changed, 3 insertions, 5 deletions
diff --git a/apps/examples/cc3000/cc3000basic.c b/apps/examples/cc3000/cc3000basic.c index 3c53a873d..0a0142654 100644 --- a/apps/examples/cc3000/cc3000basic.c +++ b/apps/examples/cc3000/cc3000basic.c @@ -103,7 +103,6 @@ void ShowFreeRAM(void); void Blinker(void); void StartSmartConfig(void); void ManualConnect(void); -void ManualConnect(void); void ManualAddProfile(void); void ListAccessPoints(void); void PrintIPBytes(uint8_t *ipBytes); diff --git a/nuttx/include/nuttx/wireless/cc3000/cc3000_common.h b/nuttx/include/nuttx/wireless/cc3000/cc3000_common.h index 40fef3d44..5a8e05a68 100644 --- a/nuttx/include/nuttx/wireless/cc3000/cc3000_common.h +++ b/nuttx/include/nuttx/wireless/cc3000/cc3000_common.h @@ -333,7 +333,7 @@ uint8_t *UINT32_TO_STREAM_f(uint8_t *p, unsigned long u32); * *****************************************************************************/ -uint8_t *UINT16_TO_STREAM_f(uint8_t *p, uint16_t u16) +uint8_t *UINT16_TO_STREAM_f(uint8_t *p, uint16_t u16); /***************************************************************************** * Name: STREAM_TO_UINT16_f diff --git a/nuttx/include/nuttx/wireless/cc3000/hci.h b/nuttx/include/nuttx/wireless/cc3000/hci.h index 22b66cdee..c4e1b1689 100644 --- a/nuttx/include/nuttx/wireless/cc3000/hci.h +++ b/nuttx/include/nuttx/wireless/cc3000/hci.h @@ -142,7 +142,7 @@ #define HCI_EVNT_SETSOCKOPT HCI_CMND_SETSOCKOPT #define HCI_EVNT_GETSOCKOPT HCI_CMND_GETSOCKOPT #define HCI_EVNT_BSD_GETHOSTBYNAME HCI_CMND_GETHOSTNAME -#define HCI_EVNT_MDNS_ADVERTISE CI_CMND_MDNS_ADVERTISE +#define HCI_EVNT_MDNS_ADVERTISE HCI_CMND_MDNS_ADVERTISE #define HCI_EVNT_SEND 0x1003 #define HCI_EVNT_WRITE 0x100E diff --git a/nuttx/include/nuttx/wireless/cc3000/wlan.h b/nuttx/include/nuttx/wireless/cc3000/wlan.h index 671d144f6..c59e26b8b 100644 --- a/nuttx/include/nuttx/wireless/cc3000/wlan.h +++ b/nuttx/include/nuttx/wireless/cc3000/wlan.h @@ -116,7 +116,7 @@ void wlan_init(tWlanCB sWlanCB, tFWPatches sFWPatches, tWlanReadInteruptPin sReadWlanInterruptPin, tWlanInterruptEnable sWlanInterruptEnable, tWlanInterruptDisable sWlanInterruptDisable, - tWriteWlanPin sWriteWlanPin)' + tWriteWlanPin sWriteWlanPin); /***************************************************************************** @@ -424,7 +424,6 @@ long wlan_ioctl_get_scan_results(unsigned long ulScanTimeout, uint8_t *ucResults * *****************************************************************************/ -#ifndef CC3000_TINY_DRIVER long wlan_ioctl_set_scan_params(unsigned long uiEnable, unsigned long uiMinDwellTime, unsigned long uiMaxDwellTime, |