summaryrefslogtreecommitdiff
path: root/nuttx/include
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2013-10-18 17:14:58 -0600
committerGregory Nutt <gnutt@nuttx.org>2013-10-18 17:14:58 -0600
commit95621702e8ce219b6c53edc5bc2e444ce6694cad (patch)
tree7bd36a2ac7dd665561bb190361a565067dc57683 /nuttx/include
parenta500d703dcd27675581b173ae43ff5c3dfa8d4de (diff)
downloadpx4-nuttx-95621702e8ce219b6c53edc5bc2e444ce6694cad.tar.gz
px4-nuttx-95621702e8ce219b6c53edc5bc2e444ce6694cad.tar.bz2
px4-nuttx-95621702e8ce219b6c53edc5bc2e444ce6694cad.zip
Updated Spark/cc3000 files from David Sidrane
Diffstat (limited to 'nuttx/include')
-rw-r--r--nuttx/include/nuttx/wireless/cc3000.h2
-rw-r--r--nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/include/nuttx/wireless/cc3000.h b/nuttx/include/nuttx/wireless/cc3000.h
index 93da43244..d899770ba 100644
--- a/nuttx/include/nuttx/wireless/cc3000.h
+++ b/nuttx/include/nuttx/wireless/cc3000.h
@@ -149,7 +149,7 @@ EXTERN void CC3000_wlan_init(tWlanCB sWlanCB,
*
************************************************************************************/
-void wireless_archinitialize(void);
+int wireless_archinitialize();
#undef EXTERN
diff --git a/nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h b/nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h
index d987182f2..3341e1a0a 100644
--- a/nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h
+++ b/nuttx/include/nuttx/wireless/cc3000/include/cc3000_upif.h
@@ -161,7 +161,7 @@ extern "C" {
#endif
/****************************************************************************
- * Name: CC3000_register
+ * Name: cc3000_register
*
* Description:
* Configure the CC3000 to use the provided SPI device instance. This
@@ -179,7 +179,7 @@ extern "C" {
*
****************************************************************************/
-int CC3000_register(FAR struct spi_dev_s *spi,
+int cc3000_register(FAR struct spi_dev_s *spi,
FAR struct cc3000_config_s *config, int minor);
#undef EXTERN