diff options
| author | flabbergast <s3+flabbergast@sdfeu.org> | 2016-04-16 19:40:24 +0100 |
|---|---|---|
| committer | flabbergast <s3+flabbergast@sdfeu.org> | 2016-04-24 18:36:00 +0100 |
| commit | a5cd9d134b1be7e3a80451f4cd57684a04616b60 (patch) | |
| tree | c084e007f7751172f350b611a953fa0385e65bee /os/common/ext | |
| parent | c35568fafc579061a8565669c106a4fcc32d8681 (diff) | |
| download | ChibiOS-Contrib-a5cd9d134b1be7e3a80451f4cd57684a04616b60.tar.gz ChibiOS-Contrib-a5cd9d134b1be7e3a80451f4cd57684a04616b60.tar.bz2 ChibiOS-Contrib-a5cd9d134b1be7e3a80451f4cd57684a04616b60.zip | |
[KINETIS] Rename I2Cx.S1 to I2Cx.S for KL26Z.
For some strange reason Freescale refers to this I2C register as 'S1'
on KL26Z and as 'S' on all other Kinetises (K20x, KL2xZ).
To avoid horrible #ifs in the driver, use 'S' also on KL26Z.
Diffstat (limited to 'os/common/ext')
| -rw-r--r-- | os/common/ext/CMSIS/KINETIS/kl26z.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/os/common/ext/CMSIS/KINETIS/kl26z.h b/os/common/ext/CMSIS/KINETIS/kl26z.h index 2c63f12..88caf38 100644 --- a/os/common/ext/CMSIS/KINETIS/kl26z.h +++ b/os/common/ext/CMSIS/KINETIS/kl26z.h @@ -152,7 +152,7 @@ typedef struct __IO uint8_t A1; __IO uint8_t F; __IO uint8_t C1; - __IO uint8_t S1; + __IO uint8_t S; /* Denoted 'S1' in datasheet. */ __IO uint8_t D; __IO uint8_t C2; __IO uint8_t FLT; @@ -876,14 +876,14 @@ typedef struct { #define I2Cx_C1_DMAEN ((uint8_t)0x01) /*!< DMA Enable */ /*********** Bits definition for I2Cx_S1 register *************/ -#define I2Cx_S1_TCF ((uint8_t)0x80) /*!< Transfer Complete Flag */ -#define I2Cx_S1_IAAS ((uint8_t)0x40) /*!< Addressed As A Slave */ -#define I2Cx_S1_BUSY ((uint8_t)0x20) /*!< Bus Busy */ -#define I2Cx_S1_ARBL ((uint8_t)0x10) /*!< Arbitration Lost */ -#define I2Cx_S1_RAM ((uint8_t)0x08) /*!< Range Address Match */ -#define I2Cx_S1_SRW ((uint8_t)0x04) /*!< Slave Read/Write */ -#define I2Cx_S1_IICIF ((uint8_t)0x02) /*!< Interrupt Flag */ -#define I2Cx_S1_RXAK ((uint8_t)0x01) /*!< Receive Acknowledge */ +#define I2Cx_S_TCF ((uint8_t)0x80) /*!< Transfer Complete Flag */ +#define I2Cx_S_IAAS ((uint8_t)0x40) /*!< Addressed As A Slave */ +#define I2Cx_S_BUSY ((uint8_t)0x20) /*!< Bus Busy */ +#define I2Cx_S_ARBL ((uint8_t)0x10) /*!< Arbitration Lost */ +#define I2Cx_S_RAM ((uint8_t)0x08) /*!< Range Address Match */ +#define I2Cx_S_SRW ((uint8_t)0x04) /*!< Slave Read/Write */ +#define I2Cx_S_IICIF ((uint8_t)0x02) /*!< Interrupt Flag */ +#define I2Cx_S_RXAK ((uint8_t)0x01) /*!< Receive Acknowledge */ /*********** Bits definition for I2Cx_D register **************/ #define I2Cx_D_DATA_SHIFT 0 /*!< Data */ |