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

1 files changed, 40 insertions, 40 deletions

diff --git a/os/hal/platforms/STM32/can_lld.h b/os/hal/platforms/STM32/can_lld.h
index 0d4c9b615..2e82c45e3 100644
--- a/os/hal/platforms/STM32/can_lld.h
+++ b/os/hal/platforms/STM32/can_lld.h
@@ -121,22 +121,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;

 

@@ -147,26 +147,26 @@ typedef struct {
  */

 typedef struct {

   struct {

-    uint8_t                 cf_FMI;         /**< @brief Filter id.          */

-    uint16_t                cf_TIME;        /**< @brief Time stamp.         */

+    uint8_t                 FMI;            /**< @brief Filter id.          */

+    uint16_t                TIME;           /**< @brief Time stamp.         */

   };

   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;

 

@@ -180,27 +180,27 @@ typedef struct {
    * @note  This bit represent the CAN_FM1R register bit associated to this

    *        filter (0=mask mode, 1=list mode).

    */

-  uint32_t                  cf_mode:1;

+  uint32_t                  mode:1;

   /**

    * @brief Filter sclae.

    * @note  This bit represent the CAN_FS1R register bit associated to this

    *        filter (0=16 bits mode, 1=32 bits mode).

    */

-  uint32_t                  cf_scale:1;

+  uint32_t                  scale:1;

   /**

    * @brief Filter mode.

    * @note  This bit represent the CAN_FFA1R register bit associated to this

    *        filter, must be set to zero in this version of the driver.

    */

-  uint32_t                  cf_assignment:1;

+  uint32_t                  assignment:1;

   /**

    * @brief Filter register 1 (identifier).

    */

-  uint32_t                  cf_register1;

+  uint32_t                  register1;

   /**

-   * @brief Filter register 2 (mask/identifier depending on cf_mode=0/1).

+   * @brief Filter register 2 (mask/identifier depending on mode=0/1).

    */

-  uint32_t                  cf_register2;

+  uint32_t                  register2;

 } CANFilter;

 

 /**

@@ -212,25 +212,25 @@ typedef struct {
    * @note  Some bits in this register are enforced by the driver regardless

    *        their status in this field.

    */

-  uint32_t                  cc_mcr;

+  uint32_t                  mcr;

   /**

    * @brief CAN BTR register initialization data.

    * @note  Some bits in this register are enforced by the driver regardless

    *        their status in this field.

    */

-  uint32_t                  cc_btr;

+  uint32_t                  btr;

   /**

    * @brief Number of elements into the filters array.

    * @note  By setting this field to zero a default filter is enabled that

    *        allows all frames, this should be adequate  for simple applications.

    */

-  uint32_t                  cc_num;

+  uint32_t                  num;

   /**

    * @brief Pointer to an array of @p CANFilter structures.

-   * @note  This field can be set to @p NULL if the field @p cc_num is set to

+   * @note  This field can be set to @p NULL if the field @p num is set to

    *        zero.

    */

-  const CANFilter           *cc_filters;

+  const CANFilter           *filters;

 } CANConfig;

 

 /**

@@ -240,19 +240,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

@@ -262,34 +262,34 @@ 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.*/

   /**

    * @brief Pointer to the CAN registers.

    */

-  CAN_TypeDef               *cd_can;

+  CAN_TypeDef               *can;

 } CANDriver;

 

 /*===========================================================================*/