diff --git a/arch b/arch index 5fa7ebb25b..0c8200c21f 160000 --- a/arch +++ b/arch @@ -1 +1 @@ -Subproject commit 5fa7ebb25b9d0b3f58d987ec3255709fa70ef368 +Subproject commit 0c8200c21f76a67e621d364b51e73bda4f6ba28c diff --git a/configs b/configs index d074eda220..87c0e8d612 160000 --- a/configs +++ b/configs @@ -1 +1 @@ -Subproject commit d074eda220e892489e53a3cca49165619b18a607 +Subproject commit 87c0e8d6124f7e0ec849e5430534eedd9495aba9 diff --git a/drivers/wireless/cc3000/cc3000_socket.h b/drivers/wireless/cc3000/cc3000_socket.h index 4287e9cf5d..0218221abc 100644 --- a/drivers/wireless/cc3000/cc3000_socket.h +++ b/drivers/wireless/cc3000/cc3000_socket.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * drivers/wireless/cc3000_socket.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef __DRIVERS_WIRELESS_CC3000_SOCKET_H #define __DRIVERS_WIRELESS_CC3000_SOCKET_H @@ -43,9 +43,9 @@ #include #include -/***************************************************************************** +/**************************************************************************** * Pre-processor Definitions - *****************************************************************************/ + ****************************************************************************/ #define CC3000_HOSTNAME_MAX_LENGTH (230) /* 230 bytes + header shouldn't exceed 8 * bit value */ @@ -150,9 +150,9 @@ sockaddr.sa_data[4] = 0x0; \ sockaddr.sa_data[5] = 0xfb; -/***************************************************************************** +/**************************************************************************** * Public Types - *****************************************************************************/ + ****************************************************************************/ /* The fd_set member is required to be an array of longs. */ @@ -165,19 +165,19 @@ typedef struct __fd_mask fds_bits[CC3000_FD_SETSIZE / __NFDBITS]; } TICC3000fd_set; -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus extern "C" { #endif -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes - *****************************************************************************/ + ****************************************************************************/ -/***************************************************************************** +/**************************************************************************** * Name: cc3000_socket_impl * * Decription: @@ -198,11 +198,11 @@ extern "C" { * On success, socket handle that is used for consequent socket * operations. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ int cc3000_socket_impl(long domain, long type, long protocol); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_closesocket_impl * * Decription: @@ -214,11 +214,11 @@ int cc3000_socket_impl(long domain, long type, long protocol); * Returned Value: * On success, zero is returned. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ long cc3000_closesocket_impl(long sd); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_accept_impl * * Decription: @@ -261,11 +261,11 @@ long cc3000_closesocket_impl(long sd); * - On connection pending, SOC_IN_PROGRESS (-2) * - On failure, SOC_ERROR (-1) * - *****************************************************************************/ + ****************************************************************************/ long cc3000_accept_impl(long sd, struct sockaddr *addr, socklen_t *addrlen); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_bind_impl * * Decription: @@ -286,11 +286,11 @@ long cc3000_accept_impl(long sd, struct sockaddr *addr, socklen_t *addrlen); * Returned Value: * On success, zero is returned. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ long cc3000_bind_impl(long sd, FAR const struct sockaddr *addr, socklen_t addrlen); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_listen_impl * * Decription: @@ -312,11 +312,11 @@ long cc3000_bind_impl(long sd, FAR const struct sockaddr *addr, socklen_t addrle * Returned Value: * On success, zero is returned. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ long cc3000_listen_impl(long sd, long backlog); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_connect_impl * * Decription: @@ -344,11 +344,11 @@ long cc3000_listen_impl(long sd, long backlog); * Returned Value: * On success, zero is returned. On error, -1 is returned * - *****************************************************************************/ + ****************************************************************************/ long cc3000_connect_impl(long sd, FAR const struct sockaddr *addr, socklen_t addrlen); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_select_impl * * Decription: @@ -385,7 +385,7 @@ long cc3000_connect_impl(long sd, FAR const struct sockaddr *addr, socklen_t add * will return without delay. * *exceptfds - return the sockets which closed recently. * - *****************************************************************************/ + ****************************************************************************/ struct timeval; @@ -396,7 +396,7 @@ int cc3000_select(int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, #ifndef CC3000_TINY_DRIVER -/***************************************************************************** +/**************************************************************************** * Name: cc3000_setsockopt_impl * * Decription: @@ -442,12 +442,12 @@ int cc3000_select(int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, * Returned Value: * On success, zero is returned. On error, -1 is returned * - *****************************************************************************/ + ****************************************************************************/ int cc3000_setsockopt_impl(long sd, long level, long optname, const void *optval, socklen_t optlen); #endif -/***************************************************************************** +/**************************************************************************** * Name: cc3000_getsockopt_impl * * Decription: @@ -493,12 +493,12 @@ int cc3000_setsockopt_impl(long sd, long level, long optname, const void *optval * Returned Value: * On success, zero is returned. On error, -1 is returned * - *****************************************************************************/ + ****************************************************************************/ int cc3000_getsockopt_impl(long sd, long level, long optname, void *optval, socklen_t *optlen); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_recv_impl * * Decription: @@ -518,11 +518,11 @@ int cc3000_getsockopt_impl(long sd, long level, long optname, void *optval, sock * Return the number of bytes received, or -1 if an error * occurred * - *****************************************************************************/ + ****************************************************************************/ int cc3000_recv_impl(long sd, void *buf, long len, long flags); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_recvfrom_impl * * Decription: @@ -549,12 +549,12 @@ int cc3000_recv_impl(long sd, void *buf, long len, long flags); * Return the number of bytes received, or -1 if an error * occurred * - *****************************************************************************/ + ****************************************************************************/ int cc3000_recvfrom_impl(long sd, void *buf, long len, long flags, struct sockaddr *from, socklen_t *fromlen); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_send_impl * * Decription: @@ -574,11 +574,11 @@ int cc3000_recvfrom_impl(long sd, void *buf, long len, long flags, * Return the number of bytes transmitted, or -1 if an * error occurred * - *****************************************************************************/ + ****************************************************************************/ int cc3000_send_impl(long sd, const void *buf, long len, long flags); -/***************************************************************************** +/**************************************************************************** * Name: cc3000_sendto_impl * * Decription: @@ -602,13 +602,13 @@ int cc3000_send_impl(long sd, const void *buf, long len, long flags); * Return the number of bytes transmitted, or -1 if an * error occurred * - *****************************************************************************/ + ****************************************************************************/ int cc3000_sendto_impl(long sd, FAR const void *buf, long len, long flags, FAR const struct sockaddr *to, socklen_t tolen); #ifndef CC3000_TINY_DRIVER -/***************************************************************************** +/**************************************************************************** * Name: cc3000_gethostbyname_impl * * Decription: @@ -629,13 +629,13 @@ int cc3000_sendto_impl(long sd, FAR const void *buf, long len, long flags, * Returned Value: * On success, positive is returned. On error, negative is returned * - *****************************************************************************/ + ****************************************************************************/ //struct hostent *gethostbyname(const char *name); int cc3000_gethostbyname_impl(char * hostname, uint16_t usNameLen, unsigned long* out_ip_addr); #endif -/***************************************************************************** +/**************************************************************************** * Name: cc3000_mdnsAdvertiser_impl * * Decription: @@ -651,7 +651,7 @@ int cc3000_gethostbyname_impl(char * hostname, uint16_t usNameLen, unsigned long * On success, zero is returned, return SOC_ERROR if socket was not * opened successfully, or if an error occurred. * - *****************************************************************************/ + ****************************************************************************/ int cc3000_mdnsadvertiser_impl(uint16_t mdnsEnabled, char * deviceServiceName, uint16_t deviceServiceNameLength); diff --git a/drivers/wireless/cc3000/cc3000drv.h b/drivers/wireless/cc3000/cc3000drv.h index 7c8af0e9b7..4c67fa2fe4 100644 --- a/drivers/wireless/cc3000/cc3000drv.h +++ b/drivers/wireless/cc3000/cc3000drv.h @@ -33,31 +33,31 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef __DRIVERS_WIRELESS_CC3000_CC3000DRV_H #define __DRIVERS_WIRELESS_CC3000_CC3000DRV_H -/***************************************************************************** +/**************************************************************************** * Included Files - *****************************************************************************/ + ****************************************************************************/ #include #include -/***************************************************************************** +/**************************************************************************** * Public Types - *****************************************************************************/ + ****************************************************************************/ typedef void (*gcSpiHandleRx)(void *p); -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus #define EXTERN extern "C" diff --git a/drivers/wireless/cc3000/host_driver_version.h b/drivers/wireless/cc3000/host_driver_version.h index 70204b17fa..e191ba1ae0 100644 --- a/drivers/wireless/cc3000/host_driver_version.h +++ b/drivers/wireless/cc3000/host_driver_version.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * * host_driver_version.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ diff --git a/drivers/wireless/cc3000/spi_version.h b/drivers/wireless/cc3000/spi_version.h index 0ca1516f99..607988fb0e 100644 --- a/drivers/wireless/cc3000/spi_version.h +++ b/drivers/wireless/cc3000/spi_version.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * * spi_version.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ diff --git a/include/nuttx/board.h b/include/nuttx/board.h index 6a22d515af..74431a16eb 100644 --- a/include/nuttx/board.h +++ b/include/nuttx/board.h @@ -301,7 +301,7 @@ struct fb_vtable_s; FAR struct fb_vtable_s *board_graphics_setup(unsigned int devno); #endif -/***************************************************************************** +/**************************************************************************** * Name: board_can_initialize * * Description: diff --git a/include/nuttx/lcd/memlcd.h b/include/nuttx/lcd/memlcd.h index 629e79cfa1..afdc7bf3bd 100644 --- a/include/nuttx/lcd/memlcd.h +++ b/include/nuttx/lcd/memlcd.h @@ -1,4 +1,4 @@ -/******************************************************************************* +/**************************************************************************** * include/nuttx/lcd/memlcd.h * Common definitions for the Sharp Memory LCD driver * @@ -32,14 +32,14 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - ******************************************************************************/ + ****************************************************************************/ #ifndef __INCLUDE_NUTTX_MEMLCD_H #define __INCLUDE_NUTTX_MEMLCD_H -/******************************************************************************* +/**************************************************************************** * Included Files - ******************************************************************************/ + ****************************************************************************/ #include @@ -51,13 +51,13 @@ extern "C" # define EXTERN extern #endif -/******************************************************************************* +/**************************************************************************** * Pre-processor Definitions - ******************************************************************************/ + ****************************************************************************/ -/******************************************************************************* +/**************************************************************************** * Public Types - ******************************************************************************/ + ****************************************************************************/ /* A reference to a structure of this type must be passed to the initialization * method. It provides some board-specific hooks used by driver to manage the @@ -89,15 +89,15 @@ struct memlcd_priv_s void (*setvcomfreq) (unsigned int freq); }; -/******************************************************************************* +/**************************************************************************** * Public Data - ******************************************************************************/ + ****************************************************************************/ -/******************************************************************************* +/**************************************************************************** * Public Function Prototypes - ******************************************************************************/ + ****************************************************************************/ -/******************************************************************************* +/**************************************************************************** * Name: memlcd_initialize * * Description: @@ -114,7 +114,7 @@ struct memlcd_priv_s * On success, this function returns a reference to the LCD object for the * specified LCD. NULL is returned on any failure. * - ******************************************************************************/ + ****************************************************************************/ struct lcd_dev_s; /* see nuttx/lcd.h */ struct spi_dev_s; /* see nuttx/spi/spi.h */ diff --git a/include/nuttx/usb/usbdev_trace.h b/include/nuttx/usb/usbdev_trace.h index b05eaca210..445ef5f560 100644 --- a/include/nuttx/usb/usbdev_trace.h +++ b/include/nuttx/usb/usbdev_trace.h @@ -462,7 +462,7 @@ EXTERN const struct trace_msg_t g_usb_trace_strings_intdecode[]; * Public Function Prototypes ****************************************************************************/ -/******************************************************************************* +/**************************************************************************** * Name: usbtrace_enable * * Description: @@ -478,7 +478,7 @@ EXTERN const struct trace_msg_t g_usb_trace_strings_intdecode[]; * Assumptions: * - May be called from an interrupt handler * - *******************************************************************************/ + ****************************************************************************/ #if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB)) usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset); @@ -486,7 +486,7 @@ usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset); # define usbtrace_enable(idset) #endif -/******************************************************************************* +/**************************************************************************** * Name: usbtrace * * Description: @@ -495,7 +495,7 @@ usbtrace_idset_t usbtrace_enable(usbtrace_idset_t idset); * Assumptions: * May be called from an interrupt handler * - *******************************************************************************/ + ****************************************************************************/ #if defined(CONFIG_USBDEV_TRACE) || (defined(CONFIG_DEBUG) && defined(CONFIG_DEBUG_USB)) void usbtrace(uint16_t event, uint16_t value); @@ -503,7 +503,7 @@ void usbtrace(uint16_t event, uint16_t value); # define usbtrace(event, value) #endif -/******************************************************************************* +/**************************************************************************** * Name: usbtrace_enumerate * * Description: @@ -512,7 +512,7 @@ void usbtrace(uint16_t event, uint16_t value); * Assumptions: * NEVER called from an interrupt handler * - *******************************************************************************/ + ****************************************************************************/ #ifdef CONFIG_USBDEV_TRACE int usbtrace_enumerate(trace_callback_t callback, void *arg); @@ -520,13 +520,13 @@ int usbtrace_enumerate(trace_callback_t callback, void *arg); # define usbtrace_enumerate(event) #endif -/******************************************************************************* +/**************************************************************************** * Name: usbtrace_trprint * * Description: * Print the trace record using the supplied printing function * - *******************************************************************************/ + ****************************************************************************/ void usbtrace_trprintf(trprintf_t trprintf, uint16_t event, uint16_t value); diff --git a/include/nuttx/usb/usbhost.h b/include/nuttx/usb/usbhost.h index 1e72ae2635..587917701c 100644 --- a/include/nuttx/usb/usbhost.h +++ b/include/nuttx/usb/usbhost.h @@ -163,7 +163,7 @@ #define CLASS_DISCONNECTED(devclass) ((devclass)->disconnected(devclass)) -/******************************************************************************* +/**************************************************************************** * Name: CONN_WAIT * * Description: @@ -186,7 +186,7 @@ * - Called from a single thread so no mutual exclusion is required. * - Never called from an interrupt handler. * - *******************************************************************************/ + ****************************************************************************/ #define CONN_WAIT(conn,hport) ((conn)->wait(conn,hport)) @@ -1103,7 +1103,7 @@ int usbhost_mouse_init(void); int usbhost_wlaninit(void); -/******************************************************************************* +/**************************************************************************** * Name: usbhost_enumerate * * Description: @@ -1135,7 +1135,7 @@ int usbhost_wlaninit(void); * - Called from a single thread so no mutual exclusion is required. * - Never called from an interrupt handler. * - *******************************************************************************/ + ****************************************************************************/ int usbhost_enumerate(FAR struct usbhost_hubport_s *hub, FAR struct usbhost_class_s **devclass); diff --git a/include/nuttx/usb/usbhost_devaddr.h b/include/nuttx/usb/usbhost_devaddr.h index 718d804cae..df4514f395 100644 --- a/include/nuttx/usb/usbhost_devaddr.h +++ b/include/nuttx/usb/usbhost_devaddr.h @@ -1,4 +1,4 @@ -/******************************************************************************* +/**************************************************************************** * include/nuttx/usb/usbhost_devaddr.h * Manage USB device addresses * @@ -38,31 +38,31 @@ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - *******************************************************************************/ + ****************************************************************************/ #ifndef _INCLUDE_NUTTX_USB_USBHOST_DEVADDR_H #define _INCLUDE_NUTTX_USB_USBHOST_DEVADDR_H -/******************************************************************************* +/**************************************************************************** * Included Files - *******************************************************************************/ + ****************************************************************************/ #include #include #include -/******************************************************************************* +/**************************************************************************** * Pre-processor Definitions - *******************************************************************************/ -/* Configuration ***************************************************************/ + ****************************************************************************/ +/* Configuration ************************************************************/ #define USBHOST_DEVADDR_HASHSIZE 8 #define USBHOST_DEVADDR_HASHMASK (USBHOST_DEVADDR_HASHSIZE-1) -/******************************************************************************* +/**************************************************************************** * Public Types - *******************************************************************************/ + ****************************************************************************/ struct usbhost_devaddr_s { @@ -71,9 +71,9 @@ struct usbhost_devaddr_s uint32_t alloctab[4]; /* Bit allocation table */ }; -/******************************************************************************* +/**************************************************************************** * Public Data - *******************************************************************************/ + ****************************************************************************/ #undef EXTERN #if defined(__cplusplus) @@ -84,14 +84,14 @@ extern "C" # define EXTERN extern #endif -/******************************************************************************* +/**************************************************************************** * Public Functions - *******************************************************************************/ + ****************************************************************************/ struct usbhost_hubport_s; /* Forward reference */ struct usbhost_roothubport_s; /* Forward reference */ -/******************************************************************************* +/**************************************************************************** * Name: usbhost_devaddr_initialize * * Description: @@ -105,11 +105,11 @@ struct usbhost_roothubport_s; /* Forward reference */ * Returned Value: * None * - *******************************************************************************/ + ****************************************************************************/ void usbhost_devaddr_initialize(FAR struct usbhost_roothubport_s *rhport); -/******************************************************************************* +/**************************************************************************** * Name: usbhost_devaddr_create * * Description: @@ -123,11 +123,11 @@ void usbhost_devaddr_initialize(FAR struct usbhost_roothubport_s *rhport); * On success, a new device function address in the the range 0x01 to 0x7f * is returned. On failure, a negated errno value is returned. * - *******************************************************************************/ + ****************************************************************************/ int usbhost_devaddr_create(FAR struct usbhost_hubport_s *hport); -/******************************************************************************* +/**************************************************************************** * Name: usbhost_devaddr_destroy * * Description: @@ -141,7 +141,7 @@ int usbhost_devaddr_create(FAR struct usbhost_hubport_s *hport); * Returned Value: * None * - *******************************************************************************/ + ****************************************************************************/ void usbhost_devaddr_destroy(FAR struct usbhost_hubport_s *hport, uint8_t devaddr); diff --git a/include/nuttx/wireless/cc3000.h b/include/nuttx/wireless/cc3000.h index 6747bd7193..f369dc0794 100644 --- a/include/nuttx/wireless/cc3000.h +++ b/include/nuttx/wireless/cc3000.h @@ -110,7 +110,7 @@ extern "C" #define EXTERN extern #endif -/***************************************************************************** +/**************************************************************************** * Name: wlan_init * * Description: @@ -146,7 +146,7 @@ extern "C" * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ void wlan_init(size_t max_tx_len, tWlanCB sWlanCB, tFWPatches sFWPatches, diff --git a/include/nuttx/wireless/cc3000/cc3000_common.h b/include/nuttx/wireless/cc3000/cc3000_common.h index b28ef353c8..4a11f74591 100644 --- a/include/nuttx/wireless/cc3000/cc3000_common.h +++ b/include/nuttx/wireless/cc3000/cc3000_common.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * cc3000_common.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -30,14 +30,14 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_CC3000_COMMON_H #define _INCLUDE_NUTTX_WIRELESS_CC3000_CC3000_COMMON_H -/***************************************************************************** +/**************************************************************************** * Included files - *****************************************************************************/ + ****************************************************************************/ #include #include @@ -46,9 +46,9 @@ #include #include -/***************************************************************************** +/**************************************************************************** * Pre-processor Definitions - *****************************************************************************/ + ****************************************************************************/ /* Error codes */ @@ -199,9 +199,9 @@ #define STREAM_TO_STREAM(p, a, l) {register int16_t _i; for (_i = 0; _i < l; _i++) *(a)++= ((uint8_t *) p)[_i];} -/***************************************************************************** +/**************************************************************************** * Public Types - *****************************************************************************/ + ****************************************************************************/ typedef struct wlan_buffer_desc_s { @@ -250,9 +250,9 @@ typedef struct uint8_t InformHostOnTxComplete; } sSimplLinkInformation; -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus extern "C" @@ -261,11 +261,11 @@ extern "C" extern volatile sSimplLinkInformation tSLInformation; -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes - *****************************************************************************/ + ****************************************************************************/ -/***************************************************************************** +/**************************************************************************** * Name: wlan_get_buffer * * Input Parameters: @@ -274,11 +274,11 @@ extern volatile sSimplLinkInformation tSLInformation; * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ void wlan_get_buffer(wlan_buffer_desc *pdes); -/***************************************************************************** +/**************************************************************************** * Name: SimpleLinkWaitEvent * * Description: @@ -292,11 +292,11 @@ void wlan_get_buffer(wlan_buffer_desc *pdes); * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ void SimpleLinkWaitEvent(uint16_t usOpcode, void *pRetParams); -/***************************************************************************** +/**************************************************************************** * Name: SimpleLinkWaitData * * Description: @@ -311,11 +311,11 @@ void SimpleLinkWaitEvent(uint16_t usOpcode, void *pRetParams); * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen); -/***************************************************************************** +/**************************************************************************** * Name: UINT32_TO_STREAM_f * * Description: @@ -329,11 +329,11 @@ void SimpleLinkWaitData(uint8_t *pBuf, uint8_t *from, uint8_t *fromlen); * Returned Value: * Pointer to the new stream * - *****************************************************************************/ + ****************************************************************************/ uint8_t *UINT32_TO_STREAM_f(uint8_t *p, unsigned long u32); -/***************************************************************************** +/**************************************************************************** * Name: UINT16_TO_STREAM_f * * Description: @@ -347,11 +347,11 @@ uint8_t *UINT32_TO_STREAM_f(uint8_t *p, unsigned long u32); * Returned Value: * Pointer to the new stream * - *****************************************************************************/ + ****************************************************************************/ uint8_t *UINT16_TO_STREAM_f(uint8_t *p, uint16_t u16); -/***************************************************************************** +/**************************************************************************** * Name: STREAM_TO_UINT16_f * * Description: @@ -365,11 +365,11 @@ uint8_t *UINT16_TO_STREAM_f(uint8_t *p, uint16_t u16); * Returned Value: * Pointer to the new 16 bit * - *****************************************************************************/ + ****************************************************************************/ uint16_t STREAM_TO_UINT16_f(char* p, uint16_t offset); -/***************************************************************************** +/**************************************************************************** * Name: STREAM_TO_UINT32_f * * Description: @@ -383,7 +383,7 @@ uint16_t STREAM_TO_UINT16_f(char* p, uint16_t offset); * Returned Value: * Pointer to the new 32 bit * - *****************************************************************************/ + ****************************************************************************/ unsigned long STREAM_TO_UINT32_f(char* p, uint16_t offset); diff --git a/include/nuttx/wireless/cc3000/evnt_handler.h b/include/nuttx/wireless/cc3000/evnt_handler.h index 6ffaa2c369..fe5f4ecdad 100644 --- a/include/nuttx/wireless/cc3000/evnt_handler.h +++ b/include/nuttx/wireless/cc3000/evnt_handler.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * * evnt_handler.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ diff --git a/include/nuttx/wireless/cc3000/hci.h b/include/nuttx/wireless/cc3000/hci.h index 42c162b4e4..409fd9d1e9 100644 --- a/include/nuttx/wireless/cc3000/hci.h +++ b/include/nuttx/wireless/cc3000/hci.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * hci.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -30,20 +30,20 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_HCI_H #define _INCLUDE_NUTTX_WIRELESS_CC3000_HCI_H -/***************************************************************************** +/**************************************************************************** * Included Files - *****************************************************************************/ + ****************************************************************************/ #include "cc3000_common.h" -/***************************************************************************** +/**************************************************************************** * Pre-processor Definitions - *****************************************************************************/ + ****************************************************************************/ #define SPI_HEADER_SIZE (5) #define SIMPLE_LINK_HCI_CMND_HEADER_SIZE (4) @@ -197,20 +197,20 @@ #define HCI_EVENT_STATUS_OFFSET (4) #define HCI_DATA_LENGTH_OFFSET (3) -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus extern "C" { #endif -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes - *****************************************************************************/ + ****************************************************************************/ -/****************************************************************************** +/**************************************************************************** * Name: hci_command_send * * Description: @@ -224,13 +224,13 @@ extern "C" * Returned Value: * Zero * - *****************************************************************************/ + ****************************************************************************/ uint16_t hci_command_send(uint16_t usOpcode, uint8_t *pucBuff, uint8_t ucArgsLength); -/****************************************************************************** +/**************************************************************************** * Name: hci_data_send * * Description: @@ -246,13 +246,13 @@ uint16_t hci_command_send(uint16_t usOpcode, uint8_t *pucBuff, * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ long hci_data_send(uint8_t ucOpcode, uint8_t *ucArgs, uint16_t usArgsLength, uint16_t usDataLength, const uint8_t *ucTail, uint16_t usTailLength); -/****************************************************************************** +/**************************************************************************** * Name: hci_data_command_send * * Description: @@ -267,12 +267,12 @@ long hci_data_send(uint8_t ucOpcode, uint8_t *ucArgs, uint16_t usArgsLength, * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ void hci_data_command_send(uint16_t usOpcode, uint8_t *pucBuff, uint8_t ucArgsLength,uint16_t ucDataLength); -/****************************************************************************** +/**************************************************************************** * Name: hci_patch_send * * Description: @@ -287,7 +287,7 @@ void hci_data_command_send(uint16_t usOpcode, uint8_t *pucBuff, * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ void hci_patch_send(uint8_t ucOpcode, uint8_t *pucBuff, char *patch, uint16_t usDataLength); diff --git a/include/nuttx/wireless/cc3000/include/sys/socket.h b/include/nuttx/wireless/cc3000/include/sys/socket.h index 87e39c9501..f40f7b6406 100644 --- a/include/nuttx/wireless/cc3000/include/sys/socket.h +++ b/include/nuttx/wireless/cc3000/include/sys/socket.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * socket.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef __INCLUDE_NUTTX_WIRELESS_CC3000_INCLUDE_SYS_SOCKET_H #define __INCLUDE_NUTTX_WIRELESS_CC3000_INCLUDE_SYS_SOCKET_H @@ -43,9 +43,9 @@ #include #include -/***************************************************************************** +/**************************************************************************** * Pre-processor Definitions - *****************************************************************************/ + ****************************************************************************/ #define socket(a,t,p) cc3000_socket(a,t,p) #define closesocket(s) cc3000_closesocket(s) @@ -62,24 +62,24 @@ #define gethostbyname(h,l,i) cc3000_gethostbyname(h,l,i) #define mdnsadvertiser(e,n,l) cc3000_mdnsadvertiser(e,n,l) -/***************************************************************************** +/**************************************************************************** * Public Types - *****************************************************************************/ + ****************************************************************************/ -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus extern "C" { #endif -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes - *****************************************************************************/ + ****************************************************************************/ -/***************************************************************************** +/**************************************************************************** * Name: socket * * Decription: @@ -100,11 +100,11 @@ extern "C" * On success, socket handle that is used for consequent socket * operations. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ int socket(int domain, int type, int protocol); -/***************************************************************************** +/**************************************************************************** * Name: closesocket * * Decription: @@ -116,11 +116,11 @@ int socket(int domain, int type, int protocol); * Returned Value: * On success, zero is returned. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ int closesocket(int sockfd); -/***************************************************************************** +/**************************************************************************** * Name: accept * * Decription: @@ -163,11 +163,11 @@ int closesocket(int sockfd); * - On connection pending, SOC_IN_PROGRESS (-2) * - On failure, SOC_ERROR (-1) * - *****************************************************************************/ + ****************************************************************************/ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen); -/***************************************************************************** +/**************************************************************************** * Name: bind * * Decription: @@ -188,11 +188,11 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen); * Returned Value: * On success, zero is returned. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ int bind(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen); -/***************************************************************************** +/**************************************************************************** * Name: listen * * Decription: @@ -214,11 +214,11 @@ int bind(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen); * Returned Value: * On success, zero is returned. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ int listen(int sockfd, int backlog); -/***************************************************************************** +/**************************************************************************** * Name: connect * * Decription: @@ -246,11 +246,11 @@ int listen(int sockfd, int backlog); * Returned Value: * On success, zero is returned. On error, -1 is returned * - *****************************************************************************/ + ****************************************************************************/ int connect(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen); -/***************************************************************************** +/**************************************************************************** * Name: select * * Decription: @@ -287,14 +287,14 @@ int connect(int sockfd, FAR const struct sockaddr *addr, socklen_t addrlen); * will return without delay. * *exceptfds - return the sockets which closed recently. * - *****************************************************************************/ + ****************************************************************************/ struct timeval; int cc3000_select(int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, struct timeval *timeout); #ifndef CC3000_TINY_DRIVER -/***************************************************************************** +/**************************************************************************** * Name: setsockopt * * Decription: @@ -340,12 +340,12 @@ int cc3000_select(int nfds, fd_set *readfds, fd_set *writefds,fd_set *exceptfds, * Returned Value: * On success, zero is returned. On error, -1 is returned * - *****************************************************************************/ + ****************************************************************************/ int setsockopt(int sockfd, int level, int option, FAR const void *value, socklen_t value_len); #endif -/***************************************************************************** +/**************************************************************************** * Name: getsockopt * * Decription: @@ -391,11 +391,11 @@ int setsockopt(int sockfd, int level, int option, FAR const void *value, socklen * Returned Value: * On success, zero is returned. On error, -1 is returned * - *****************************************************************************/ + ****************************************************************************/ int getsockopt(int sockfd, int level, int option, FAR void *value, FAR socklen_t *value_len); -/***************************************************************************** +/**************************************************************************** * Name: recv * * Decription: @@ -415,11 +415,11 @@ int getsockopt(int sockfd, int level, int option, FAR void *value, FAR socklen_t * Return the number of bytes received, or -1 if an error * occurred * - *****************************************************************************/ + ****************************************************************************/ ssize_t recv(int sockfd, FAR void *buf, size_t len, int flags); -/***************************************************************************** +/**************************************************************************** * Name: recvfrom * * Decription: @@ -446,12 +446,12 @@ ssize_t recv(int sockfd, FAR void *buf, size_t len, int flags); * Return the number of bytes received, or -1 if an error * occurred * - *****************************************************************************/ + ****************************************************************************/ ssize_t recvfrom(int sockfd, FAR void *buf, size_t len, int flags, FAR struct sockaddr *from, FAR socklen_t *fromlen); -/***************************************************************************** +/**************************************************************************** * Name: send * * Decription: @@ -471,11 +471,11 @@ ssize_t recvfrom(int sockfd, FAR void *buf, size_t len, int flags, * Return the number of bytes transmitted, or -1 if an * error occurred * - *****************************************************************************/ + ****************************************************************************/ ssize_t send(int sockfd, FAR const void *buf, size_t len, int flags); -/***************************************************************************** +/**************************************************************************** * Name: sendto * * Decription: @@ -499,13 +499,13 @@ ssize_t send(int sockfd, FAR const void *buf, size_t len, int flags); * Return the number of bytes transmitted, or -1 if an * error occurred * - *****************************************************************************/ + ****************************************************************************/ ssize_t sendto(int sockfd, FAR const void *buf, size_t len, int flags, FAR const struct sockaddr *to, socklen_t tolen); #ifndef CC3000_TINY_DRIVER -/***************************************************************************** +/**************************************************************************** * Name: gethostbyname * * Decription: @@ -526,12 +526,12 @@ ssize_t sendto(int sockfd, FAR const void *buf, size_t len, int flags, * Returned Value: * On success, positive is returned. On error, negative is returned * - *****************************************************************************/ + ****************************************************************************/ int gethostbyname(char * hostname, uint16_t usNameLen, unsigned long* out_ip_addr); #endif -/***************************************************************************** +/**************************************************************************** * Name: mdnsAdvertiser * * Decription: @@ -547,7 +547,7 @@ int gethostbyname(char * hostname, uint16_t usNameLen, unsigned long* out_ip_add * On success, zero is returned, return SOC_ERROR if socket was not * opened successfully, or if an error occurred. * - *****************************************************************************/ + ****************************************************************************/ int mdnsadvertiser(uint16_t mdnsEnabled, char *deviceServiceName, uint16_t deviceServiceNameLength); diff --git a/include/nuttx/wireless/cc3000/netapp.h b/include/nuttx/wireless/cc3000/netapp.h index 8d0785c73c..e42b5876a4 100644 --- a/include/nuttx/wireless/cc3000/netapp.h +++ b/include/nuttx/wireless/cc3000/netapp.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * netapp.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -30,18 +30,18 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_NETAPP_H #define _INCLUDE_NUTTX_WIRELESS_CC3000_NETAPP_H -/***************************************************************************** +/**************************************************************************** * Included Files - *****************************************************************************/ + ****************************************************************************/ -/***************************************************************************** +/**************************************************************************** * Public Types - *****************************************************************************/ + ****************************************************************************/ typedef struct _netapp_dhcp_ret_args_t { @@ -74,20 +74,20 @@ typedef struct _netapp_pingreport_args unsigned long avg_round_time; } netapp_pingreport_args_t; -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus extern "C" { #endif -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes - *****************************************************************************/ + ****************************************************************************/ -/****************************************************************************** +/**************************************************************************** * Name: netapp_config_mac_adrress * * Description: @@ -101,11 +101,11 @@ extern "C" * Returned Value: * Return on success 0, otherwise error. * - *****************************************************************************/ + ****************************************************************************/ long netapp_config_mac_adrress(uint8_t *mac); -/****************************************************************************** +/**************************************************************************** * Name: netapp_dhcp * * Description: @@ -130,12 +130,12 @@ long netapp_config_mac_adrress(uint8_t *mac); * Returned Value: * Return on success 0, otherwise error. * - *****************************************************************************/ + ****************************************************************************/ long netapp_dhcp(unsigned long *aucIP, unsigned long *aucSubnetMask, unsigned long *aucDefaultGateway, unsigned long *aucDNSServer); -/****************************************************************************** +/**************************************************************************** * Name: netapp_timeout_values * * Description: @@ -183,7 +183,7 @@ long netapp_dhcp(unsigned long *aucIP, unsigned long *aucSubnetMask, * Returned Value: * Return on success 0, otherwise error. * - *****************************************************************************/ + ****************************************************************************/ #ifndef CC3000_TINY_DRIVER long netapp_timeout_values(unsigned long *aucDHCP, unsigned long *aucARP, @@ -191,7 +191,7 @@ long netapp_timeout_values(unsigned long *aucDHCP, unsigned long *aucARP, unsigned long *aucInactivity); #endif -/****************************************************************************** +/**************************************************************************** * Name: netapp_ping_send * * Description: @@ -213,14 +213,14 @@ long netapp_timeout_values(unsigned long *aucDHCP, unsigned long *aucARP, * Returned Value: * Return on success 0, otherwise error. * - *****************************************************************************/ + ****************************************************************************/ #ifndef CC3000_TINY_DRIVER long netapp_ping_send(unsigned long *ip, unsigned long ulPingAttempts, unsigned long ulPingSize, unsigned long ulPingTimeout); #endif -/****************************************************************************** +/**************************************************************************** * Name: netapp_ping_stop * * Description: @@ -232,13 +232,13 @@ long netapp_ping_send(unsigned long *ip, unsigned long ulPingAttempts, * Returned Value: * On success, zero is returned. On error, -1 is returned. * - *****************************************************************************/ + ****************************************************************************/ #ifndef CC3000_TINY_DRIVER long netapp_ping_stop(void); #endif -/****************************************************************************** +/**************************************************************************** * Name: netapp_ping_report * * Description: @@ -263,14 +263,14 @@ long netapp_ping_stop(void); * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ #ifndef CC3000_TINY_DRIVER void netapp_ping_report(void); #endif -/****************************************************************************** +/**************************************************************************** * Name: netapp_ipconfig * * Description: @@ -298,11 +298,11 @@ void netapp_ping_report(void); * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ void netapp_ipconfig(tNetappIpconfigRetArgs * ipconfig); -/****************************************************************************** +/**************************************************************************** * Name: netapp_arp_flush * * Description: @@ -314,13 +314,13 @@ void netapp_ipconfig(tNetappIpconfigRetArgs * ipconfig); * Returned Value: * None * - *****************************************************************************/ + ****************************************************************************/ #ifndef CC3000_TINY_DRIVER long netapp_arp_flush(void); #endif -/****************************************************************************** +/**************************************************************************** * Name: netapp_set_debug_level * * Description: @@ -344,7 +344,7 @@ long netapp_arp_flush(void); * Returned Value: * On success, zero is returned. On error, -1 is returned * - *****************************************************************************/ + ****************************************************************************/ #ifndef CC3000_TINY_DRIVER long netapp_set_debug_level(unsigned long ulLevel); diff --git a/include/nuttx/wireless/cc3000/nvmem.h b/include/nuttx/wireless/cc3000/nvmem.h index 35902def69..f9b3b48695 100644 --- a/include/nuttx/wireless/cc3000/nvmem.h +++ b/include/nuttx/wireless/cc3000/nvmem.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * nvmem.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -30,20 +30,20 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_NVMEM_H #define _INCLUDE_NUTTX_WIRELESS_CC3000_NVMEM_H -/***************************************************************************** +/**************************************************************************** * Included Files - *****************************************************************************/ + ****************************************************************************/ #include "cc3000_common.h" -/***************************************************************************** +/**************************************************************************** * Pre-processor Definitions - *****************************************************************************/ + ****************************************************************************/ /* NVMEM file ID - system files*/ @@ -69,20 +69,20 @@ #define NVMEM_MAX_ENTRY (16) -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus extern "C" { #endif -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes - *****************************************************************************/ + ****************************************************************************/ -/****************************************************************************** +/**************************************************************************** * Name: nvmem_read * * Description: @@ -106,12 +106,12 @@ extern "C" * Returned Value: * Number of bytes read, otherwise error. * - *****************************************************************************/ + ****************************************************************************/ signed long nvmem_read(unsigned long ulFileId, unsigned long ulLength, unsigned long ulOffset, uint8_t *buff); -/****************************************************************************** +/**************************************************************************** * Name: nvmem_write * * Description: @@ -132,12 +132,12 @@ signed long nvmem_read(unsigned long ulFileId, unsigned long ulLength, * Returned Value: * On success 0, error otherwise. * - *****************************************************************************/ + ****************************************************************************/ signed long nvmem_write(unsigned long ulFileId, unsigned long ulLength, unsigned long ulEntryOffset, uint8_t *buff); -/****************************************************************************** +/**************************************************************************** * Name: nvmem_set_mac_address * * Description: @@ -150,11 +150,11 @@ signed long nvmem_write(unsigned long ulFileId, unsigned long ulLength, * Returned Value: * On success 0, error otherwise. * - *****************************************************************************/ + ****************************************************************************/ uint8_t nvmem_set_mac_address(uint8_t *mac); -/****************************************************************************** +/**************************************************************************** * Name: nvmem_get_mac_address * * Description: @@ -167,11 +167,11 @@ uint8_t nvmem_set_mac_address(uint8_t *mac); * Returned Value: * On success 0, error otherwise. * - *****************************************************************************/ + ****************************************************************************/ uint8_t nvmem_get_mac_address(uint8_t *mac); -/****************************************************************************** +/**************************************************************************** * Name: nvmem_write_patch * * Description: @@ -188,12 +188,12 @@ uint8_t nvmem_get_mac_address(uint8_t *mac); * Returned Value: * On success 0, error otherwise. * - *****************************************************************************/ + ****************************************************************************/ uint8_t nvmem_write_patch(unsigned long ulFileId, unsigned long spLength, const uint8_t *spData); -/****************************************************************************** +/**************************************************************************** * Name: nvmem_read_sp_version * * Description: @@ -207,13 +207,13 @@ uint8_t nvmem_write_patch(unsigned long ulFileId, unsigned long spLength, * Returned Value: * On success 0, error otherwise. * - *****************************************************************************/ + ****************************************************************************/ #ifndef CC3000_TINY_DRIVER uint8_t nvmem_read_sp_version(uint8_t *patchVer); #endif -/****************************************************************************** +/**************************************************************************** * Name: nvmem_create_entry * * Description: @@ -233,7 +233,7 @@ uint8_t nvmem_read_sp_version(uint8_t *patchVer); * Returned Value: * On success 0, error otherwise. * - *****************************************************************************/ + ****************************************************************************/ signed long nvmem_create_entry(unsigned long ulFileId, unsigned long ulNewLen); diff --git a/include/nuttx/wireless/cc3000/security.h b/include/nuttx/wireless/cc3000/security.h index c3ed8f40e7..4a57340bb1 100644 --- a/include/nuttx/wireless/cc3000/security.h +++ b/include/nuttx/wireless/cc3000/security.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * security.h - CC3000 Host Driver Implementation. * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ * @@ -30,39 +30,39 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef _INCLUDE_NUTTX_WIRELESS_CC3000_SECURITY_H #define _INCLUDE_NUTTX_WIRELESS_CC3000_SECURITY_H -/***************************************************************************** +/**************************************************************************** * Included Files - *****************************************************************************/ + ****************************************************************************/ #include "nvmem.h" -/***************************************************************************** +/**************************************************************************** * Pre-processor Definitions - *****************************************************************************/ + ****************************************************************************/ #define AES128_KEY_SIZE 16 #ifndef CC3000_UNENCRYPTED_SMART_CONFIG -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus extern "C" { #endif -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes -/***************************************************************************** +/**************************************************************************** -/***************************************************************************** +/**************************************************************************** * Name: aes_encrypt * * Description: @@ -77,11 +77,11 @@ extern "C" * Returned Value * None * - *****************************************************************************/ + ****************************************************************************/ void aes_encrypt(uint8_t *state, uint8_t *key); -/***************************************************************************** +/**************************************************************************** * Name: aes_decrypt * * Description: @@ -96,11 +96,11 @@ void aes_encrypt(uint8_t *state, uint8_t *key); * Returned Value * None * - *****************************************************************************/ + ****************************************************************************/ void aes_decrypt(uint8_t *state, uint8_t *key); -/***************************************************************************** +/**************************************************************************** * Name: aes_read_key * * Description: @@ -113,11 +113,11 @@ void aes_decrypt(uint8_t *state, uint8_t *key); * Returned Value * On success 0, error otherwise. * - *****************************************************************************/ + ****************************************************************************/ signed long aes_read_key(uint8_t *key); -/***************************************************************************** +/**************************************************************************** * Name: aes_write_key * * Description: @@ -130,7 +130,7 @@ signed long aes_read_key(uint8_t *key); * Returned Value * On success 0, error otherwise. * - *****************************************************************************/ + ****************************************************************************/ signed long aes_write_key(uint8_t *key); diff --git a/include/nuttx/wireless/cc3000/wlan.h b/include/nuttx/wireless/cc3000/wlan.h index 6acf62a56f..867ea2032b 100644 --- a/include/nuttx/wireless/cc3000/wlan.h +++ b/include/nuttx/wireless/cc3000/wlan.h @@ -1,4 +1,4 @@ -/***************************************************************************** +/**************************************************************************** * include/nuttx/wireless/cc3000/wlan.h * * wlan.h - CC3000 Host Driver Implementation. @@ -32,40 +32,40 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - *****************************************************************************/ + ****************************************************************************/ #ifndef __INCLUDE_NUTTX_WIRELESS_CC3000_WLAN_H #define __INCLUDE_NUTTX_WIRELESS_CC3000_WLAN_H -/***************************************************************************** +/**************************************************************************** * Included Files - *****************************************************************************/ + ****************************************************************************/ #include "cc3000_common.h" -/***************************************************************************** +/**************************************************************************** * Pre-processor Definitions - *****************************************************************************/ + ****************************************************************************/ #define WLAN_SEC_UNSEC (0) #define WLAN_SEC_WEP (1) #define WLAN_SEC_WPA (2) #define WLAN_SEC_WPA2 (3) -/***************************************************************************** +/**************************************************************************** * Public Data - *****************************************************************************/ + ****************************************************************************/ #ifdef __cplusplus extern "C" { #endif -/***************************************************************************** +/**************************************************************************** * Public Function Prototypes - *****************************************************************************/ + ****************************************************************************/ -/***************************************************************************** +/**************************************************************************** * Name: wlan_init * * Input Parameters: @@ -109,14 +109,14 @@ extern "C" * * WARNING: This function must be called before ANY other wlan driver function * - *****************************************************************************/ + ****************************************************************************/ void wlan_init(size_t max_tx_len, tWlanCB sWlanCB, tFWPatches sFWPatches, tDriverPatches sDriverPatches, tBootLoaderPatches sBootLoaderPatches); -/***************************************************************************** +/**************************************************************************** * Name: wlan_start * * Input Parameters: @@ -141,11 +141,11 @@ void wlan_init(size_t max_tx_len, * WARNING: This function must be called after wlan_init and before any * other wlan API * - *****************************************************************************/ + ****************************************************************************/ void wlan_start(uint16_t usPatchesAvailableAtHost); -/***************************************************************************** +/**************************************************************************** * Name: wlan_stop * * Input Parameters: @@ -157,11 +157,11 @@ void wlan_start(uint16_t usPatchesAvailableAtHost); * Description: * Stop WLAN device by putting it into reset state. * - *****************************************************************************/ + ****************************************************************************/ void wlan_stop(void); -/***************************************************************************** +/**************************************************************************** * Name: wlan_connect * * Input Parameters: @@ -191,7 +191,7 @@ void wlan_stop(void); * type WEP, please confirm that the key is set as ASCII and not * as HEX. * - *****************************************************************************/ + ****************************************************************************/ #ifndef CC3000_TINY_DRIVER long wlan_connect(unsigned long ulSecType, FAR const char *ssid, @@ -201,7 +201,7 @@ long wlan_connect(unsigned long ulSecType, FAR const char *ssid, long wlan_connect(FAR const char *ssid, long ssid_len); #endif -/***************************************************************************** +/**************************************************************************** * Name: wlan_disconnect * * Input Parameters: @@ -213,11 +213,11 @@ long wlan_connect(FAR const char *ssid, long ssid_len); * Description: * Disconnect connection from AP. * - *****************************************************************************/ + ****************************************************************************/ long wlan_disconnect(void); -/***************************************************************************** +/**************************************************************************** * Name: wlan_add_profile * * Input Parameters: @@ -243,7 +243,7 @@ long wlan_disconnect(void); * profile based on security policy, signal strength, etc * parameters. All the profiles are stored in CC3000 NVMEM. * - *****************************************************************************/ + ****************************************************************************/ long wlan_add_profile(unsigned long ulSecType, uint8_t* ucSsid, unsigned long ulSsidLen, uint8_t *ucBssid, @@ -253,7 +253,7 @@ long wlan_add_profile(unsigned long ulSecType, uint8_t* ucSsid, unsigned long ulKeyMgmt, uint8_t* ucPf_OrKey, unsigned long ulPassPhraseLen); -/***************************************************************************** +/**************************************************************************** * Name: wlan_ioctl_del_profile * * Input Parameters: @@ -267,11 +267,11 @@ long wlan_add_profile(unsigned long ulSecType, uint8_t* ucSsid, * * @Note In order to delete all stored profile, set index to 255. * - *****************************************************************************/ + ****************************************************************************/ long wlan_ioctl_del_profile(unsigned long ulIndex); -/***************************************************************************** +/**************************************************************************** * Name: wlan_set_event_mask * * Input Parameters: @@ -293,11 +293,11 @@ long wlan_ioctl_del_profile(unsigned long ulIndex); * Mask event according to bit mask. In case that event is * masked (1), the device will not send the masked event to host. * - *****************************************************************************/ + ****************************************************************************/ long wlan_set_event_mask(unsigned long ulMask); -/***************************************************************************** +/**************************************************************************** * Name: wlan_ioctl_statusget * * Input Parameters: @@ -310,11 +310,11 @@ long wlan_set_event_mask(unsigned long ulMask); * Description: * get wlan status: disconnected, scanning, connecting or connected * - *****************************************************************************/ + ****************************************************************************/ long wlan_ioctl_statusget(void); -/***************************************************************************** +/**************************************************************************** * Name: wlan_ioctl_set_connection_policy * * Input Parameters: @@ -344,13 +344,13 @@ long wlan_ioctl_statusget(void); * enabled, the device will try to connect to any AP. * * Note that the policy settings are stored in the CC3000 NVMEM. * - *****************************************************************************/ + ****************************************************************************/ long wlan_ioctl_set_connection_policy(unsigned long should_connect_to_open_ap, unsigned long ulShouldUseFastConnect, unsigned long ulUseProfiles); -/***************************************************************************** +/**************************************************************************** * Name: wlan_ioctl_get_scan_results * * Input Parameters: @@ -381,11 +381,11 @@ long wlan_ioctl_set_connection_policy(unsigned long should_connect_to_open_ap, * * NOTE: scan_timeout, is not supported on this version. * - *****************************************************************************/ + ****************************************************************************/ long wlan_ioctl_get_scan_results(unsigned long ulScanTimeout, uint8_t *ucResults); -/***************************************************************************** +/**************************************************************************** * Name: wlan_ioctl_set_scan_params * * Input Parameters: @@ -420,7 +420,7 @@ long wlan_ioctl_get_scan_results(unsigned long ulScanTimeout, uint8_t *ucResults * * @Note uiDefaultTxPower, is not supported on this version. * - *****************************************************************************/ + ****************************************************************************/ long wlan_ioctl_set_scan_params(unsigned long uiEnable, unsigned long uiMinDwellTime, @@ -431,7 +431,7 @@ long wlan_ioctl_set_scan_params(unsigned long uiEnable, unsigned long uiDefaultTxPower, unsigned long *aiIntervalList); -/***************************************************************************** +/**************************************************************************** * Name: wlan_smart_config_start * * Input Parameters: @@ -450,11 +450,11 @@ long wlan_ioctl_set_scan_params(unsigned long uiEnable, * @Note An asynchronous event - Smart Config Done will be generated as soon * as the process finishes successfully. * - *****************************************************************************/ + ****************************************************************************/ long wlan_smart_config_start(unsigned long algoEncryptedFlag); -/***************************************************************************** +/**************************************************************************** * Name: wlan_smart_config_stop * * Input Parameters: @@ -466,11 +466,11 @@ long wlan_smart_config_start(unsigned long algoEncryptedFlag); * Description: * Stop the acquire profile procedure * - *****************************************************************************/ + ****************************************************************************/ long wlan_smart_config_stop(void); -/***************************************************************************** +/**************************************************************************** * Name: wlan_smart_config_set_prefix * * Input Parameters: @@ -485,11 +485,11 @@ long wlan_smart_config_stop(void); * * @Note The prefix is stored in CC3000 NVMEM * - *****************************************************************************/ + ****************************************************************************/ long wlan_smart_config_set_prefix(char* cNewPrefix); -/***************************************************************************** +/**************************************************************************** * Name: wlan_smart_config_process * * Input Parameters: @@ -504,7 +504,7 @@ long wlan_smart_config_set_prefix(char* cNewPrefix); * The encrypted data is decrypted and stored as a profile. * behavior is as defined by connection policy. * - *****************************************************************************/ + ****************************************************************************/ long wlan_smart_config_process(void);