cpu/msp430: make use of vendor header files

The MSP430 vendor files already provide macros containing register constants and symbols (provided via linker scripts) containing addresses of peripheral registers. So lets make use of that rather than maintaining a long list of constants.
RIOT-OS · Jul 4, 2023 · 45b353c · 45b353c
1 parent ff7f8ae
commit 45b353c
Show file tree

Hide file tree

Showing 29 changed files with 391 additions and 608 deletions.
diff --git a/boards/msb-430/include/periph_conf.h b/boards/msb-430/include/periph_conf.h
@@ -49,7 +49,7 @@ static const msp430_clock_params_t clock_params = {
  * @{
  */
 #define TIMER_NUMOF         (1U)
-#define TIMER_BASE          (TIMER_A)
+#define TIMER_BASE          (&TIMER_A)
 #define TIMER_CHAN          (3)
 #define TIMER_ISR_CC0       (TIMERA0_VECTOR)
 #define TIMER_ISR_CCX       (TIMERA1_VECTOR)
@@ -61,14 +61,12 @@ static const msp430_clock_params_t clock_params = {
  */
 #define UART_NUMOF          (1U)
 
-#define UART_BASE           (USART_1)
-#define UART_IE             (SFR->IE2)
-#define UART_IF             (SFR->IFG2)
+#define UART_BASE           (&USART_1)
+#define UART_SFR            (&USART_1_SFR)
 #define UART_IE_RX_BIT      (1 << 4)
 #define UART_IE_TX_BIT      (1 << 5)
-#define UART_ME             (SFR->ME2)
 #define UART_ME_BITS        (0x30)
-#define UART_PORT           (PORT_3)
+#define UART_PORT           (&PORT_3)
 #define UART_RX_PIN         (1 << 6)
 #define UART_TX_PIN         (1 << 7)
 #define UART_RX_ISR         (USART1RX_VECTOR)
@@ -82,12 +80,10 @@ static const msp430_clock_params_t clock_params = {
 #define SPI_NUMOF           (1U)
 
 /* SPI configuration */
-#define SPI_BASE            (USART_0)
-#define SPI_IE              (SFR->IE1)
-#define SPI_IF              (SFR->IFG1)
+#define SPI_BASE            (&USART_0)
+#define SPI_SFR             (&USART_0_SFR)
 #define SPI_IE_RX_BIT       (1 << 6)
 #define SPI_IE_TX_BIT       (1 << 7)
-#define SPI_ME              (SFR->ME1)
 #define SPI_ME_BIT          (1 << 6)
 #define SPI_PIN_MISO        GPIO_PIN(P5, 2)
 #define SPI_PIN_MOSI        GPIO_PIN(P5, 1)

diff --git a/boards/msb-430h/include/periph_conf.h b/boards/msb-430h/include/periph_conf.h
@@ -48,7 +48,7 @@ static const msp430_clock_params_t clock_params = {
  * @{
  */
 #define TIMER_NUMOF         (1U)
-#define TIMER_BASE          (TIMER_A)
+#define TIMER_BASE          (&TIMER_A)
 #define TIMER_CHAN          (3)
 #define TIMER_ISR_CC0       (TIMERA0_VECTOR)
 #define TIMER_ISR_CCX       (TIMERA1_VECTOR)
@@ -60,14 +60,12 @@ static const msp430_clock_params_t clock_params = {
  */
 #define UART_NUMOF          (1U)
 
-#define UART_BASE           (USART_1)
-#define UART_IE             (SFR->IE2)
-#define UART_IF             (SFR->IFG2)
+#define UART_BASE           (&USART_1)
+#define UART_SFR            (&USART_1_SFR)
 #define UART_IE_RX_BIT      (1 << 4)
 #define UART_IE_TX_BIT      (1 << 5)
-#define UART_ME             (SFR->ME2)
 #define UART_ME_BITS        (0x30)
-#define UART_PORT           (PORT_3)
+#define UART_PORT           (&PORT_3)
 #define UART_RX_PIN         (1 << 6)
 #define UART_TX_PIN         (1 << 7)
 #define UART_RX_ISR         (USART1RX_VECTOR)
@@ -81,12 +79,10 @@ static const msp430_clock_params_t clock_params = {
 #define SPI_NUMOF           (1U)
 
 /* SPI configuration */
-#define SPI_BASE            (USART_0)
-#define SPI_IE              (SFR->IE1)
-#define SPI_IF              (SFR->IFG1)
+#define SPI_BASE            (&USART_0)
+#define SPI_SFR             (&USART_0_SFR)
 #define SPI_IE_RX_BIT       (1 << 6)
 #define SPI_IE_TX_BIT       (1 << 7)
-#define SPI_ME              (SFR->ME1)
 #define SPI_ME_BIT          (1 << 6)
 #define SPI_PIN_MISO        GPIO_PIN(P3, 2)
 #define SPI_PIN_MOSI        GPIO_PIN(P3, 1)

diff --git a/boards/olimex-msp430-h1611/include/periph_conf.h b/boards/olimex-msp430-h1611/include/periph_conf.h
@@ -48,7 +48,7 @@ static const msp430_clock_params_t clock_params = {
  * @{
  */
 #define TIMER_NUMOF         (1U)
-#define TIMER_BASE          (TIMER_A)
+#define TIMER_BASE          (&TIMER_A)
 #define TIMER_CHAN          (3)
 #define TIMER_ISR_CC0       (TIMERA0_VECTOR)
 #define TIMER_ISR_CCX       (TIMERA1_VECTOR)
@@ -60,14 +60,12 @@ static const msp430_clock_params_t clock_params = {
  */
 #define UART_NUMOF          (1U)
 
-#define UART_BASE           (USART_1)
-#define UART_IE             (SFR->IE2)
-#define UART_IF             (SFR->IFG2)
+#define UART_BASE           (&USART_1)
+#define UART_SFR            (&USART_1_SFR)
 #define UART_IE_RX_BIT      (1 << 4)
 #define UART_IE_TX_BIT      (1 << 5)
-#define UART_ME             (SFR->ME2)
 #define UART_ME_BITS        (0x30)
-#define UART_PORT           (PORT_3)
+#define UART_PORT           (&PORT_3)
 #define UART_RX_PIN         (1 << 6)
 #define UART_TX_PIN         (1 << 7)
 #define UART_RX_ISR         (USART1RX_VECTOR)
@@ -81,12 +79,10 @@ static const msp430_clock_params_t clock_params = {
 #define SPI_NUMOF           (1U)
 
 /* SPI configuration */
-#define SPI_BASE            (USART_0)
-#define SPI_IE              (SFR->IE1)
-#define SPI_IF              (SFR->IFG1)
+#define SPI_BASE            (&USART_0)
+#define SPI_SFR             (&USART_0_SFR)
 #define SPI_IE_RX_BIT       (1 << 6)
 #define SPI_IE_TX_BIT       (1 << 7)
-#define SPI_ME              (SFR->ME1)
 #define SPI_ME_BIT          (1 << 6)
 #define SPI_PIN_MISO        GPIO_PIN(P3, 2)
 #define SPI_PIN_MOSI        GPIO_PIN(P3, 1)

diff --git a/boards/olimex-msp430-h2618/include/periph_conf.h b/boards/olimex-msp430-h2618/include/periph_conf.h
@@ -47,7 +47,7 @@ static const msp430_clock_params_t clock_params = {
  * @{
  */
 #define TIMER_NUMOF         (1U)
-#define TIMER_BASE          (TIMER_A)
+#define TIMER_BASE          (&TIMER_A)
 #define TIMER_CHAN          (3)
 #define TIMER_ISR_CC0       (TIMERA0_VECTOR)
 #define TIMER_ISR_CCX       (TIMERA1_VECTOR)
@@ -59,14 +59,14 @@ static const msp430_clock_params_t clock_params = {
  */
 #define UART_NUMOF          (1U)
 
-#define UART_BASE           (USCI_0)
-#define UART_IE             (SFR->IE2)
-#define UART_IF             (SFR->IFG2)
+#define UART_BASE           (&USCI_A0)
+#define UART_IE             (IE2)
+#define UART_IF             (IFG2)
 #define UART_IE_RX_BIT      (1 << 0)
 #define UART_IE_TX_BIT      (1 << 1)
-#define UART_RX_PORT        ((msp_port_t *)PORT_3)
+#define UART_RX_PORT        (&PORT_3)
 #define UART_RX_PIN         (1 << 5)
-#define UART_TX_PORT        ((msp_port_t *)PORT_3)
+#define UART_TX_PORT        (&PORT_3)
 #define UART_TX_PIN         (1 << 4)
 #define UART_RX_ISR         (USCIAB0RX_VECTOR)
 #define UART_TX_ISR         (USCIAB0TX_VECTOR)
@@ -79,9 +79,9 @@ static const msp430_clock_params_t clock_params = {
 #define SPI_NUMOF           (1U)
 
 /* SPI configuration */
-#define SPI_BASE            (USCI_0_B_SPI)
-#define SPI_IE              (SFR->IE2)
-#define SPI_IF              (SFR->IFG2)
+#define SPI_BASE            (&USCI_B0)
+#define SPI_IE              (IE2)
+#define SPI_IF              (IFG2)
 #define SPI_IE_RX_BIT       (1 << 2)
 #define SPI_IE_TX_BIT       (1 << 3)
 #define SPI_PIN_MISO        GPIO_PIN(P3, 2)

diff --git a/boards/telosb/include/periph_conf.h b/boards/telosb/include/periph_conf.h
@@ -48,7 +48,7 @@ static const msp430_clock_params_t clock_params = {
  * @{
  */
 #define TIMER_NUMOF         (1U)
-#define TIMER_BASE          (TIMER_A)
+#define TIMER_BASE          (&TIMER_A)
 #define TIMER_CHAN          (3)
 #define TIMER_ISR_CC0       (TIMERA0_VECTOR)
 #define TIMER_ISR_CCX       (TIMERA1_VECTOR)
@@ -60,14 +60,12 @@ static const msp430_clock_params_t clock_params = {
  */
 #define UART_NUMOF          (1U)
 
-#define UART_BASE           (USART_1)
-#define UART_IE             (SFR->IE2)
-#define UART_IF             (SFR->IFG2)
+#define UART_BASE           (&USART_1)
+#define UART_SFR            (&USART_1_SFR)
 #define UART_IE_RX_BIT      (1 << 4)
 #define UART_IE_TX_BIT      (1 << 5)
-#define UART_ME             (SFR->ME2)
 #define UART_ME_BITS        (0x30)
-#define UART_PORT           (PORT_3)
+#define UART_PORT           (&PORT_3)
 #define UART_RX_PIN         (1 << 6)
 #define UART_TX_PIN         (1 << 7)
 #define UART_RX_ISR         (USART1RX_VECTOR)
@@ -80,13 +78,10 @@ static const msp430_clock_params_t clock_params = {
  */
 #define SPI_NUMOF           (1U)
 
-/* SPI configuration */
-#define SPI_BASE            (USART_0)
-#define SPI_IE              (SFR->IE1)
-#define SPI_IF              (SFR->IFG1)
+#define SPI_BASE            (&USART_0)
+#define SPI_SFR             (&USART_0_SFR)
 #define SPI_IE_RX_BIT       (1 << 6)
 #define SPI_IE_TX_BIT       (1 << 7)
-#define SPI_ME              (SFR->ME1)
 #define SPI_ME_BIT          (1 << 6)
 #define SPI_PIN_MISO        GPIO_PIN(P3, 2)
 #define SPI_PIN_MOSI        GPIO_PIN(P3, 1)

diff --git a/boards/z1/include/periph_conf.h b/boards/z1/include/periph_conf.h
@@ -48,7 +48,7 @@ static const msp430_clock_params_t clock_params = {
  * @{
  */
 #define TIMER_NUMOF         (1U)
-#define TIMER_BASE          (TIMER_A)
+#define TIMER_BASE          (&TIMER_A)
 #define TIMER_CHAN          (3)
 #define TIMER_ISR_CC0       (TIMERA0_VECTOR)
 #define TIMER_ISR_CCX       (TIMERA1_VECTOR)
@@ -60,14 +60,14 @@ static const msp430_clock_params_t clock_params = {
  */
 #define UART_NUMOF          (1U)
 
-#define UART_BASE           (USCI_0)
-#define UART_IE             (SFR->IE2)
-#define UART_IF             (SFR->IFG2)
+#define UART_BASE           (&USCI_A0)
+#define UART_IE             (IE2)
+#define UART_IF             (IFG2)
 #define UART_IE_RX_BIT      (1 << 0)
 #define UART_IE_TX_BIT      (1 << 1)
-#define UART_RX_PORT        ((msp_port_t *)PORT_3)
+#define UART_RX_PORT        (&PORT_3)
 #define UART_RX_PIN         (1 << 5)
-#define UART_TX_PORT        ((msp_port_t *)PORT_3)
+#define UART_TX_PORT        (&PORT_3)
 #define UART_TX_PIN         (1 << 4)
 #define UART_RX_ISR         (USCIAB0RX_VECTOR)
 #define UART_TX_ISR         (USCIAB0TX_VECTOR)
@@ -80,9 +80,9 @@ static const msp430_clock_params_t clock_params = {
 #define SPI_NUMOF           (1U)
 
 /* SPI configuration */
-#define SPI_BASE            (USCI_0_B_SPI)
-#define SPI_IE              (SFR->IE2)
-#define SPI_IF              (SFR->IFG2)
+#define SPI_BASE            (&USCI_B0)
+#define SPI_IE              (IE2)
+#define SPI_IF              (IFG2)
 #define SPI_IE_RX_BIT       (1 << 2)
 #define SPI_IE_TX_BIT       (1 << 3)
 #define SPI_PIN_MISO        GPIO_PIN(P3, 2)