Mostly cosmetic changes from Uros

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3575 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 27 insertions, 29 deletions

diff --git a/nuttx/include/nuttx/progmem.h b/nuttx/include/nuttx/progmem.h
index e9e05ed2c..021eb035e 100644
--- a/nuttx/include/nuttx/progmem.h
+++ b/nuttx/include/nuttx/progmem.h
@@ -41,6 +41,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <sys/types.h>
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/nuttx/include/nuttx/sensors/st_lis331dl.h b/nuttx/include/nuttx/sensors/lis331dl.h
index 404d4a480..2e83dbe1f 100644
--- a/nuttx/include/nuttx/sensors/st_lis331dl.h
+++ b/nuttx/include/nuttx/sensors/lis331dl.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/sensors/st_lis331dl.h
+ * include/nuttx/sensors/lis331dl.h
  *
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *
@@ -39,8 +39,8 @@
  *  \brief ST LIS331DL I2C Device Driver
  **/ 
 
-#ifndef __INCLUDE_NUTTX_SENSORS_ST_LIS331DL_H
-#define __INCLUDE_NUTTX_SENSORS_ST_LIS331DL_H
+#ifndef __INCLUDE_NUTTX_SENSORS_LIS331DL_H
+#define __INCLUDE_NUTTX_SENSORS_LIS331DL_H
 
 #include <nuttx/i2c.h>
 #include <stdbool.h>
@@ -64,9 +64,9 @@ extern "C" {
  * Public Data Types
  ************************************************************************************/
 
-struct st_lis331dl_dev_s;
+struct lis331dl_dev_s;
 
-struct st_lis331dl_vector_s {
+struct lis331dl_vector_s {
     int8_t  x, y, z;
 };
 
@@ -86,21 +86,21 @@ struct st_lis331dl_vector_s {
  *  - EFAULT: When there is no device at given address.
  *  - EBUSY: When device is already addressed by other device driver (not yet supported by low-level driver)
  **/
-EXTERN struct st_lis331dl_dev_s * st_lis331dl_init(struct i2c_dev_s * i2c, uint16_t address);
+EXTERN struct lis331dl_dev_s * lis331dl_init(struct i2c_dev_s * i2c, uint16_t address);
 
 /** Deinitialize ST LIS331DL Chip
  * 
- * \param dev Device to LIS331DL device structure, as returned by the st_lis331dl_init()
+ * \param dev Device to LIS331DL device structure, as returned by the lis331dl_init()
  * \return OK On success
  * 
  **/
-EXTERN int st_lis331dl_deinit(struct st_lis331dl_dev_s * dev);
+EXTERN int lis331dl_deinit(struct lis331dl_dev_s * dev);
 
 /** Power up device, start conversion */
-EXTERN int st_lis331dl_powerup(struct st_lis331dl_dev_s * dev);
+EXTERN int lis331dl_powerup(struct lis331dl_dev_s * dev);
 
 /** Power down device, stop conversion */
-EXTERN int st_lis331dl_powerdown(struct st_lis331dl_dev_s * dev);
+EXTERN int lis331dl_powerdown(struct lis331dl_dev_s * dev);
 
 /** Configure conversion 
  * 
@@ -109,19 +109,19 @@ EXTERN int st_lis331dl_powerdown(struct st_lis331dl_dev_s * dev);
  * \param fast When set, conversion operates at 400 Hz, otherwise at 100 Hz
  * \return OK on success or errno is set
  **/
-EXTERN int st_lis331dl_setconversion(struct st_lis331dl_dev_s * dev, bool full, bool fast);
+EXTERN int lis331dl_setconversion(struct lis331dl_dev_s * dev, bool full, bool fast);
 
 /** Get precision
  * 
  * \return Precision of 1 LSB in terms of unit [mg]
  **/
-EXTERN int st_lis331dl_getprecision(struct st_lis331dl_dev_s * dev);
+EXTERN int lis331dl_getprecision(struct lis331dl_dev_s * dev);
 
 /** Get sample rate 
  * 
  * \return Sample rate in unit of [Hz]
  **/
-EXTERN int st_lis331dl_getsamplerate(struct st_lis331dl_dev_s * dev);
+EXTERN int lis331dl_getsamplerate(struct lis331dl_dev_s * dev);
 
 /** Get readings, updates internal data structure
  * 
@@ -130,8 +130,7 @@ EXTERN int st_lis331dl_getsamplerate(struct st_lis331dl_dev_s * dev);
  *   If data is not yet ready to be read from the LIS331 then errno is set to EAGAIN otherwise
  *   errno is set by I2C_TRANSFER().
  */
-EXTERN const struct st_lis331dl_vector_s * st_lis331dl_getreadings(struct st_lis331dl_dev_s * dev);
-
+EXTERN const struct lis331dl_vector_s * lis331dl_getreadings(struct lis331dl_dev_s * dev);
 
 
 #undef EXTERN
@@ -140,5 +139,4 @@ EXTERN const struct st_lis331dl_vector_s * st_lis331dl_getreadings(struct st_lis
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __INCLUDE_NUTTX_SENSORS_ST_LIS331DL_H */
-
+#endif /* __INCLUDE_NUTTX_SENSORS_LIS331DL_H */
diff --git a/nuttx/include/nuttx/wireless/chipcon_cc1101.h b/nuttx/include/nuttx/wireless/cc1101.h
index 0daadada1..c0d756e72 100755
--- a/nuttx/include/nuttx/wireless/chipcon_cc1101.h
+++ b/nuttx/include/nuttx/wireless/cc1101.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/wireless/chipcon_cc1101.h
+ * include/nuttx/wireless/cc1101.h
  *
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
  *
@@ -39,8 +39,8 @@
  *  \brief Chipcon CC1101 Device Driver
  **/ 
 
-#ifndef __INCLUDE_NUTTX_WIRELESS_CHIPCON_CC1101_H
-#define __INCLUDE_NUTTX_WIRELESS_CHIPCON_CC1101_H
+#ifndef __INCLUDE_NUTTX_WIRELESS_CC1101_H
+#define __INCLUDE_NUTTX_WIRELESS_CC1101_H
 
 #include <nuttx/config.h>
 #include <nuttx/spi.h>
@@ -67,7 +67,7 @@ extern "C" {
  * Public Data Types
  ************************************************************************************/
 
-struct chipcon_cc1101_dev_s;
+struct cc1101_dev_s;
 
 
 /************************************************************************************
@@ -84,24 +84,24 @@ struct chipcon_cc1101_dev_s;
  *  - EFAULT: When there is no device
  *  - EBUSY: When device is already addressed by other device driver (not yet supported by low-level driver)
  **/
-EXTERN struct chipcon_cc1101_dev_s * chipcon_cc1101_init(struct spi_dev_s * spi);
+EXTERN struct cc1101_dev_s * cc1101_init(struct spi_dev_s * spi);
 
 /** Deinitialize Chipcon CC1101 Chip
  * 
- * \param dev Device to CC1101 device structure, as returned by the chipcon_cc1101_init()
+ * \param dev Device to CC1101 device structure, as returned by the cc1101_init()
  * \return OK On success
  * 
  **/
-EXTERN int chipcon_cc1101_deinit(struct chipcon_cc1101_dev_s * dev);
+EXTERN int cc1101_deinit(struct cc1101_dev_s * dev);
 
 /** Power up device, start conversion */
-EXTERN int chipcon_cc1101_powerup(struct chipcon_cc1101_dev_s * dev);
+EXTERN int cc1101_powerup(struct cc1101_dev_s * dev);
 
 /** Power down device, stop conversion */
-EXTERN int chipcon_cc1101_powerdown(struct chipcon_cc1101_dev_s * dev);
+EXTERN int cc1101_powerdown(struct cc1101_dev_s * dev);
 
 /** Set Multi Purpose Output Function */
-EXTERN int chipcon_cc1101_setgdo(struct chipcon_cc1101_dev_s * dev, uint8_t pin, uint8_t function);
+EXTERN int cc1101_setgdo(struct cc1101_dev_s * dev, uint8_t pin, uint8_t function);
 
 
 #undef EXTERN
@@ -109,5 +109,4 @@ EXTERN int chipcon_cc1101_setgdo(struct chipcon_cc1101_dev_s * dev, uint8_t pin,
 }
 #endif
 #endif /* __ASSEMBLY__ */
-#endif /* __INCLUDE_NUTTX_WIRELESS_CHIPCON_CC1101_H */
-
+#endif /* __INCLUDE_NUTTX_WIRELESS_CC1101_H */