Some restructing of the CC3000 build

This commit is contained in:
Gregory Nutt
2013-09-04 16:40:57 -06:00
parent 4377b4f5e8
commit ce6368793a
26 changed files with 429 additions and 401 deletions
+4
View File
@@ -13,6 +13,10 @@ menuconfig WL_CC3000
default n
select SPI
if WL_CC3000
source drivers/wireless/cc3000/Kconfig
endif
config WL_NRF24L01
bool "nRF24l01+ transceiver support"
default n
+4
View File
@@ -45,6 +45,10 @@ ifeq ($(CONFIG_WL_NRF24L01),y)
CSRCS += nrf24l01.c
endif
ifeq ($(CONFIG_WL_CC3000),y)
include wireless$(DELIM)cc3000$(DELIM)Make.defs
endif
# Include wireless devices build support
DEPPATH += --dep-path wireless
+4 -4
View File
@@ -43,10 +43,10 @@
* Include files
*
*****************************************************************************/
#include <nuttx/cc3000/cc3000_common.h>
#include <nuttx/cc3000/socket.h>
#include <nuttx/cc3000/wlan.h>
#include <nuttx/cc3000/evnt_handler.h>
#include <nuttx/wireless/cc3000/cc3000_common.h>
#include <nuttx/wireless/cc3000/socket.h>
#include <nuttx/wireless/cc3000/wlan.h>
#include <nuttx/wireless/cc3000/evnt_handler.h>
//*****************************************************************************
//
+7 -7
View File
@@ -44,13 +44,13 @@
//******************************************************************************
#include <string.h>
#include <nuttx/cc3000/cc3000_common.h>
#include <nuttx/cc3000/hci.h>
#include <nuttx/cc3000/evnt_handler.h>
#include <nuttx/cc3000/wlan.h>
#include <nuttx/cc3000/socket.h>
#include <nuttx/cc3000/netapp.h>
#include <nuttx/cc3000/spi.h>
#include <nuttx/wireless/cc3000/cc3000_common.h>
#include <nuttx/wireless/cc3000/hci.h>
#include <nuttx/wireless/cc3000/evnt_handler.h>
#include <nuttx/wireless/cc3000/wlan.h>
#include <nuttx/wireless/cc3000/socket.h>
#include <nuttx/wireless/cc3000/netapp.h>
#include <nuttx/wireless/cc3000/spi.h>
+5 -5
View File
@@ -41,11 +41,11 @@
//*****************************************************************************
#include <string.h>
#include <nuttx/cc3000/cc3000_common.h>
#include <nuttx/cc3000/hci.h>
#include <nuttx/cc3000/spi.h>
#include <nuttx/cc3000/evnt_handler.h>
#include <nuttx/cc3000/wlan.h>
#include <nuttx/wireless/cc3000/cc3000_common.h>
#include <nuttx/wireless/cc3000/hci.h>
#include <nuttx/wireless/cc3000/spi.h>
#include <nuttx/wireless/cc3000/evnt_handler.h>
#include <nuttx/wireless/cc3000/wlan.h>
#define SL_PATCH_PORTION_SIZE (1000)
+5 -5
View File
@@ -33,11 +33,11 @@
*
*****************************************************************************/
#include <string.h>
#include <nuttx/cc3000/netapp.h>
#include <nuttx/cc3000/hci.h>
#include <nuttx/cc3000/socket.h>
#include <nuttx/cc3000/evnt_handler.h>
#include <nuttx/cc3000/nvmem.h>
#include <nuttx/wireless/cc3000/netapp.h>
#include <nuttx/wireless/cc3000/hci.h>
#include <nuttx/wireless/cc3000/socket.h>
#include <nuttx/wireless/cc3000/evnt_handler.h>
#include <nuttx/wireless/cc3000/nvmem.h>
#define MIN_TIMER_VAL_SECONDS 20
#define MIN_TIMER_SET(t) if ((0 != t) && (t < MIN_TIMER_VAL_SECONDS)) \
+4 -4
View File
@@ -42,10 +42,10 @@
#include <stdio.h>
#include <string.h>
#include <nuttx/cc3000/nvmem.h>
#include <nuttx/cc3000/hci.h>
#include <nuttx/cc3000/socket.h>
#include <nuttx/cc3000/evnt_handler.h>
#include <nuttx/wireless/cc3000/nvmem.h>
#include <nuttx/wireless/cc3000/hci.h>
#include <nuttx/wireless/cc3000/socket.h>
#include <nuttx/wireless/cc3000/evnt_handler.h>
//*****************************************************************************
//
+1 -1
View File
@@ -40,7 +40,7 @@
//
//*****************************************************************************
#include <nuttx/cc3000/security.h>
#include <nuttx/wireless/cc3000/security.h>
#ifndef CC3000_UNENCRYPTED_SMART_CONFIG
// foreward sbox
+4 -4
View File
@@ -43,10 +43,10 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <nuttx/cc3000/hci.h>
#include <nuttx/cc3000/socket.h>
#include <nuttx/cc3000/evnt_handler.h>
#include <nuttx/cc3000/netapp.h>
#include <nuttx/wireless/cc3000/hci.h>
#include <nuttx/wireless/cc3000/socket.h>
#include <nuttx/wireless/cc3000/evnt_handler.h>
#include <nuttx/wireless/cc3000/netapp.h>
File diff suppressed because it is too large Load Diff
+7 -7
View File
@@ -40,13 +40,13 @@
//
//*****************************************************************************
#include <string.h>
#include <nuttx/cc3000/wlan.h>
#include <nuttx/cc3000/hci.h>
#include <nuttx/cc3000/spi.h>
#include <nuttx/cc3000/socket.h>
#include <nuttx/cc3000/nvmem.h>
#include <nuttx/cc3000/security.h>
#include <nuttx/cc3000/evnt_handler.h>
#include <nuttx/wireless/cc3000/wlan.h>
#include <nuttx/wireless/cc3000/hci.h>
#include <nuttx/wireless/cc3000/spi.h>
#include <nuttx/wireless/cc3000/socket.h>
#include <nuttx/wireless/cc3000/nvmem.h>
#include <nuttx/wireless/cc3000/security.h>
#include <nuttx/wireless/cc3000/evnt_handler.h>
volatile sSimplLinkInformation tSLInformation;