git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2808 35acf78f-673a-0410-8e92-d51de3d6d3f4

10 files changed, 69 insertions, 69 deletions

diff --git a/os/hal/templates/adc_lld.c b/os/hal/templates/adc_lld.c
index 6c541f557..4a6acbee6 100644
--- a/os/hal/templates/adc_lld.c
+++ b/os/hal/templates/adc_lld.c
@@ -83,7 +83,7 @@ void adc_lld_start(ADCDriver *adcp) {
  */

 void adc_lld_stop(ADCDriver *adcp) {

 

-  if (adcp->ad_state == ADC_READY) {

+  if (adcp->state == ADC_READY) {

     /* Clock de-activation.*/

 

   }

diff --git a/os/hal/templates/adc_lld.h b/os/hal/templates/adc_lld.h
index 54d78fd44..1cfba2f72 100644
--- a/os/hal/templates/adc_lld.h
+++ b/os/hal/templates/adc_lld.h
@@ -86,15 +86,15 @@ typedef struct {
   /**

    * @brief Enables the circular buffer mode for the group.

    */

-  bool_t                    acg_circular;

+  bool_t                    circular;

   /**

    * @brief Number of the analog channels belonging to the conversion group.

    */

-  adc_channels_num_t        acg_num_channels;

+  adc_channels_num_t        num_channels;

   /**

    * @brief Callback function associated to the group or @p NULL.

    */

-  adccallback_t             acg_endcb;

+  adccallback_t             end_cb;

   /* End of the mandatory fields.*/

 } ADCConversionGroup;

 

@@ -117,37 +117,37 @@ struct ADCDriver {
   /**

    * @brief Driver state.

    */

-  adcstate_t                ad_state;

+  adcstate_t                state;

   /**

    * @brief Current configuration data.

    */

-  const ADCConfig           *ad_config;

+  const ADCConfig           *config;

   /**

    * @brief Current samples buffer pointer or @p NULL.

    */

-  adcsample_t               *ad_samples;

+  adcsample_t               *samples;

   /**

    * @brief Current samples buffer depth or @p 0.

    */

-  size_t                    ad_depth;

+  size_t                    depth;

   /**

    * @brief Current conversion group pointer or @p NULL.

    */

-  const ADCConversionGroup  *ad_grpp;

+  const ADCConversionGroup  *grpp;

 #if ADC_USE_WAIT || defined(__DOXYGEN__)

   /**

    * @brief Waiting thread.

    */

-  Thread                    *ad_thread;

+  Thread                    *thread;

 #endif /* SPI_USE_WAIT */

 #if ADC_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)

 #if CH_USE_MUTEXES || defined(__DOXYGEN__)

   /**

    * @brief Mutex protecting the peripheral.

    */

-  Mutex                     ad_mutex;

+  Mutex                     mutex;

 #elif CH_USE_SEMAPHORES

-  Semaphore                 ad_semaphore;

+  Semaphore                 semaphore;

 #endif

 #endif /* ADC_USE_MUTUAL_EXCLUSION */

 #if defined(ADC_DRIVER_EXT_FIELDS)

diff --git a/os/hal/templates/can_lld.c b/os/hal/templates/can_lld.c
index 2dc92f169..3662d2867 100644
--- a/os/hal/templates/can_lld.c
+++ b/os/hal/templates/can_lld.c
@@ -80,7 +80,7 @@ void can_lld_start(CANDriver *canp) {
 void can_lld_stop(CANDriver *canp) {

 

   /* If in ready state then disables the CAN peripheral.*/

-  if (canp->cd_state == CAN_READY) {

+  if (canp->state == CAN_READY) {

 

   }

 }

diff --git a/os/hal/templates/can_lld.h b/os/hal/templates/can_lld.h
index 37ce7f157..4817cdc7f 100644
--- a/os/hal/templates/can_lld.h
+++ b/os/hal/templates/can_lld.h
@@ -82,22 +82,22 @@ typedef uint32_t canstatus_t;
  */

 typedef struct {

   struct {

-    uint8_t                 cf_DLC:4;       /**< @brief Data length.        */

-    uint8_t                 cf_RTR:1;       /**< @brief Frame type.         */

-    uint8_t                 cf_IDE:1;       /**< @brief Identifier type.    */

+    uint8_t                 DLC:4;          /**< @brief Data length.        */

+    uint8_t                 RTR:1;          /**< @brief Frame type.         */

+    uint8_t                 IDE:1;          /**< @brief Identifier type.    */

   };

   union {

     struct {

-      uint32_t              cf_SID:11;      /**< @brief Standard identifier.*/

+      uint32_t              SID:11;         /**< @brief Standard identifier.*/

     };

     struct {

-      uint32_t              cf_EID:29;      /**< @brief Extended identifier.*/

+      uint32_t              EID:29;         /**< @brief Extended identifier.*/

     };

   };

   union {

-    uint8_t                 cf_data8[8];    /**< @brief Frame data.         */

-    uint16_t                cf_data16[4];   /**< @brief Frame data.         */

-    uint32_t                cf_data32[2];   /**< @brief Frame data.         */

+    uint8_t                 data8[8];       /**< @brief Frame data.         */

+    uint16_t                data16[4];      /**< @brief Frame data.         */

+    uint32_t                data32[2];      /**< @brief Frame data.         */

   };

 } CANTxFrame;

 

@@ -109,22 +109,22 @@ typedef struct {
  */

 typedef struct {

   struct {

-    uint8_t                 cf_DLC:4;       /**< @brief Data length.        */

-    uint8_t                 cf_RTR:1;       /**< @brief Frame type.         */

-    uint8_t                 cf_IDE:1;       /**< @brief Identifier type.    */

+    uint8_t                 DLC:4;          /**< @brief Data length.        */

+    uint8_t                 RTR:1;          /**< @brief Frame type.         */

+    uint8_t                 IDE:1;          /**< @brief Identifier type.    */

   };

   union {

     struct {

-      uint32_t              cf_SID:11;      /**< @brief Standard identifier.*/

+      uint32_t              SID:11;         /**< @brief Standard identifier.*/

     };

     struct {

-      uint32_t              cf_EID:29;      /**< @brief Extended identifier.*/

+      uint32_t              EID:29;         /**< @brief Extended identifier.*/

     };

   };

   union {

-    uint8_t                 cf_data8[8];    /**< @brief Frame data.         */

-    uint16_t                cf_data16[4];   /**< @brief Frame data.         */

-    uint32_t                cf_data32[2];   /**< @brief Frame data.         */

+    uint8_t                 data8[8];       /**< @brief Frame data.         */

+    uint16_t                data16[4];      /**< @brief Frame data.         */

+    uint32_t                data32[2];      /**< @brief Frame data.         */

   };

 } CANRxFrame;

 

@@ -155,19 +155,19 @@ typedef struct {
   /**

    * @brief Driver state.

    */

-  canstate_t                cd_state;

+  canstate_t                state;

   /**

    * @brief Current configuration data.

    */

-  const CANConfig           *cd_config;

+  const CANConfig           *config;

   /**

    * @brief Transmission queue semaphore.

    */

-  Semaphore                 cd_txsem;

+  Semaphore                 txsem;

   /**

    * @brief Receive queue semaphore.

    */

-  Semaphore                 cd_rxsem;

+  Semaphore                 rxsem;

   /**

    * @brief One or more frames become available.

    * @note  After broadcasting this event it will not be broadcasted again

@@ -177,28 +177,28 @@ typedef struct {
    *        invoking @p chReceive() when listening to this event. This behavior

    *        minimizes the interrupt served by the system because CAN traffic.

    */

-  EventSource               cd_rxfull_event;

+  EventSource               rxfull_event;

   /**

    * @brief One or more transmission slots become available.

    */

-  EventSource               cd_txempty_event;

+  EventSource               txempty_event;

   /**

    * @brief A CAN bus error happened.

    */

-  EventSource               cd_error_event;

+  EventSource               error_event;

   /**

    * @brief Error flags set when an error event is broadcasted.

    */

-  canstatus_t               cd_status;

+  canstatus_t               status;

 #if CAN_USE_SLEEP_MODE || defined (__DOXYGEN__)

   /**

    * @brief Entering sleep state event.

    */

-  EventSource               cd_sleep_event;

+  EventSource               sleep_event;

   /**

    * @brief Exiting sleep state event.

    */

-  EventSource               cd_wakeup_event;

+  EventSource               wakeup_event;

 #endif /* CAN_USE_SLEEP_MODE */

   /* End of the mandatory fields.*/

 } CANDriver;

diff --git a/os/hal/templates/mac_lld.h b/os/hal/templates/mac_lld.h
index 869fa5db8..f9b532009 100644
--- a/os/hal/templates/mac_lld.h
+++ b/os/hal/templates/mac_lld.h
@@ -73,10 +73,10 @@
  *          architecture dependent, fields.

  */

 typedef struct {

-  Semaphore             md_tdsem;       /**< Transmit semaphore.        */

-  Semaphore             md_rdsem;       /**< Receive semaphore.         */

+  Semaphore             tdsem;              /**< Transmit semaphore.        */

+  Semaphore             rdsem;              /**< Receive semaphore.         */

 #if CH_USE_EVENTS

-  EventSource           md_rdevent;     /**< Receive event source.      */

+  EventSource           rdevent;            /**< Receive event source.      */

 #endif

   /* End of the mandatory fields.*/

 } MACDriver;

@@ -87,8 +87,8 @@ typedef struct {
  *          architecture dependent, fields.

  */

 typedef struct {

-  size_t                td_offset;      /**< Current write offset.      */

-  size_t                td_size;        /**< Available space size.      */

+  size_t                offset;             /**< Current write offset.      */

+  size_t                size;               /**< Available space size.      */

   /* End of the mandatory fields.*/

 } MACTransmitDescriptor;

 

@@ -98,8 +98,8 @@ typedef struct {
  *          architecture dependent, fields.

  */

 typedef struct {

-  size_t                rd_offset;      /**< Current read offset.       */

-  size_t                rd_size;        /**< Available data size.       */

+  size_t                offset;             /**< Current read offset.       */

+  size_t                size;               /**< Available data size.       */

   /* End of the mandatory fields.*/

 } MACReceiveDescriptor;

 

diff --git a/os/hal/templates/pwm_lld.c b/os/hal/templates/pwm_lld.c
index 7e904765a..712ab5982 100644
--- a/os/hal/templates/pwm_lld.c
+++ b/os/hal/templates/pwm_lld.c
@@ -68,7 +68,7 @@ void pwm_lld_init(void) {
  */

 void pwm_lld_start(PWMDriver *pwmp) {

 

-  if (pwmp->pd_state == PWM_STOP) {

+  if (pwmp->state == PWM_STOP) {

     /* Clock activation.*/

   }

   /* Configuration.*/

diff --git a/os/hal/templates/pwm_lld.h b/os/hal/templates/pwm_lld.h
index 74fb280a7..bf0222981 100644
--- a/os/hal/templates/pwm_lld.h
+++ b/os/hal/templates/pwm_lld.h
@@ -84,13 +84,13 @@ typedef struct {
   /**

    * @brief Channel active logic level.

    */

-  pwmmode_t                 pcc_mode;

+  pwmmode_t                 mode;

   /**

    * @brief Channel callback pointer.

    * @note  This callback is invoked on the channel compare event. If set to

    *        @p NULL then the callback is disabled.

    */

-  pwmcallback_t             pcc_callback;

+  pwmcallback_t             callback;

   /* End of the mandatory fields.*/

 } PWMChannelConfig;

 

@@ -105,11 +105,11 @@ typedef struct {
    * @note  This callback is invoked on PWM counter reset. If set to

    *        @p NULL then the callback is disabled.

    */

-  pwmcallback_t             pc_callback;

+  pwmcallback_t             callback;

   /**

    * @brief Channels configurations.

    */

-  PWMChannelConfig          pc_channels[PWM_CHANNELS];

+  PWMChannelConfig          channels[PWM_CHANNELS];

   /* End of the mandatory fields.*/

 } PWMConfig;

 

@@ -122,11 +122,11 @@ struct PWMDriver {
   /**

    * @brief Driver state.

    */

-  pwmstate_t                pd_state;

+  pwmstate_t                state;

   /**

    * @brief Current configuration data.

    */

-  const PWMConfig           *pd_config;

+  const PWMConfig           *config;

 #if defined(PWM_DRIVER_EXT_FIELDS)

   PWM_DRIVER_EXT_FIELDS

 #endif

diff --git a/os/hal/templates/spi_lld.c b/os/hal/templates/spi_lld.c
index 5b76e3bdf..1235417c7 100644
--- a/os/hal/templates/spi_lld.c
+++ b/os/hal/templates/spi_lld.c
@@ -68,7 +68,7 @@ void spi_lld_init(void) {
  */

 void spi_lld_start(SPIDriver *spip) {

 

-  if (spip->spd_state == SPI_STOP) {

+  if (spip->state == SPI_STOP) {

     /* Clock activation.*/

   }

   /* Configuration.*/

diff --git a/os/hal/templates/spi_lld.h b/os/hal/templates/spi_lld.h
index e985aa727..047f0756c 100644
--- a/os/hal/templates/spi_lld.h
+++ b/os/hal/templates/spi_lld.h
@@ -68,7 +68,7 @@ typedef struct {
   /**

    * @brief Operation complete callback.
    */

-  spicallback_t         spc_endcb;

+  spicallback_t         end_cb;

   /* End of the mandatory fields.*/

 } SPIConfig;

 

@@ -81,25 +81,25 @@ struct SPIDriver {
   /**

    * @brief Driver state.

    */

-  spistate_t            spd_state;

+  spistate_t            state;

   /**

    * @brief Current configuration data.

    */

-  const SPIConfig       *spd_config;

+  const SPIConfig       *config;

 #if SPI_USE_WAIT || defined(__DOXYGEN__)

   /**

    * @brief Waiting thread.
    */

-  Thread                *spd_thread;

+  Thread                *thread;

 #endif /* SPI_USE_WAIT */

 #if SPI_USE_MUTUAL_EXCLUSION || defined(__DOXYGEN__)

 #if CH_USE_MUTEXES || defined(__DOXYGEN__)

   /**

    * @brief Mutex protecting the bus.

    */

-  Mutex                 spd_mutex;

+  Mutex                 mutex;

 #elif CH_USE_SEMAPHORES

-  Semaphore             spd_semaphore;

+  Semaphore             semaphore;

 #endif

 #endif /* SPI_USE_MUTUAL_EXCLUSION */

 #if defined(SPI_DRIVER_EXT_FIELDS)

diff --git a/os/hal/templates/uart_lld.h b/os/hal/templates/uart_lld.h
index 531e7f3ab..8808d6589 100644
--- a/os/hal/templates/uart_lld.h
+++ b/os/hal/templates/uart_lld.h
@@ -90,23 +90,23 @@ typedef struct {
   /**

    * @brief End of transmission buffer callback.

    */

-  uartcb_t                  uc_txend1;

+  uartcb_t                  txend1_cb;

   /**

    * @brief Physical end of transmission callback.

    */

-  uartcb_t                  uc_txend2;

+  uartcb_t                  txend2_cb;

   /**

    * @brief Receive buffer filled callback.

    */

-  uartcb_t                  uc_rxend;

+  uartcb_t                  rxend_cb;

   /**

    * @brief Character received while out if the @p UART_RECEIVE state.

    */

-  uartccb_t                 uc_rxchar;

+  uartccb_t                 rxchar_cb;

   /**

    * @brief Receive error callback.

    */

-  uartecb_t                 uc_rxerr;

+  uartecb_t                 rxerr_cb;

   /* End of the mandatory fields.*/

 } UARTConfig;

 

@@ -119,19 +119,19 @@ struct UARTDriver {
   /**

    * @brief Driver state.

    */

-  uartstate_t               ud_state;

+  uartstate_t               state;

   /**

    * @brief Transmitter state.

    */

-  uarttxstate_t             ud_txstate;

+  uarttxstate_t             txstate;

   /**

    * @brief Receiver state.

    */

-  uartrxstate_t             ud_rxstate;

+  uartrxstate_t             rxstate;

   /**

    * @brief Current configuration data.

    */

-  const UARTConfig          *ud_config;

+  const UARTConfig          *config;

 #if defined(UART_DRIVER_EXT_FIELDS)

   UART_DRIVER_EXT_FIELDS

 #endif