Changed some peripheral register structures in tm4c123x.h and tm4c129x.h to reduce the amount of duplicated text.

Updated gpt_lld, i2c_lld, pal_lld, pwm_lld, serial_lld, hal_lld register access to the changed peripheral register structures.
Replaced old interrupt numbers from tm4c123x.h and tm4c129x.h in serial_lld.c with the new interrupt number defines from tiva_isr.h.

5 files changed, 81 insertions, 81 deletions

diff --git a/os/hal/ports/TIVA/LLD/gpt_lld.c b/os/hal/ports/TIVA/LLD/gpt_lld.c
index c160687..0a61914 100644
--- a/os/hal/ports/TIVA/LLD/gpt_lld.c
+++ b/os/hal/ports/TIVA/LLD/gpt_lld.c
@@ -461,84 +461,84 @@ void gpt_lld_start(GPTDriver *gptp)
     /* Clock activation.*/
 #if TIVA_GPT_USE_GPT0
     if (&GPTD1 == gptp) {
-      SYSCTL->RCGCTIMER |= (1 << 0);
+      SYSCTL->RCGC.TIMER |= (1 << 0);
       nvicEnableVector(TIVA_GPT0A_NUMBER, TIVA_GPT_GPT0A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT1
     if (&GPTD2 == gptp) {
-      SYSCTL->RCGCTIMER |= (1 << 1);
+      SYSCTL->RCGC.TIMER |= (1 << 1);
       nvicEnableVector(TIVA_GPT1A_NUMBER, TIVA_GPT_GPT1A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT2
     if (&GPTD3 == gptp) {
-      SYSCTL->RCGCTIMER |= (1 << 2);
+      SYSCTL->RCGC.TIMER |= (1 << 2);
       nvicEnableVector(TIVA_GPT2A_NUMBER, TIVA_GPT_GPT2A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT3
     if (&GPTD4 == gptp) {
-      SYSCTL->RCGCTIMER |= (1 << 3);
+      SYSCTL->RCGC.TIMER |= (1 << 3);
       nvicEnableVector(TIVA_GPT3A_NUMBER, TIVA_GPT_GPT3A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT4
     if (&GPTD5 == gptp) {
-      SYSCTL->RCGCTIMER |= (1 << 4);
+      SYSCTL->RCGC.TIMER |= (1 << 4);
       nvicEnableVector(TIVA_GPT4A_NUMBER, TIVA_GPT_GPT4A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT5
     if (&GPTD6 == gptp) {
-      SYSCTL->RCGCTIMER |= (1 << 5);
+      SYSCTL->RCGC.TIMER |= (1 << 5);
       nvicEnableVector(TIVA_GPT5A_NUMBER, TIVA_GPT_GPT5A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT0
     if (&GPTD7 == gptp) {
-      SYSCTL->RCGCWTIMER |= (1 << 0);
+      SYSCTL->RCGC.WTIMER |= (1 << 0);
       nvicEnableVector(TIVA_WGPT0A_NUMBER, TIVA_GPT_WGPT0A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT1
     if (&GPTD8 == gptp) {
-      SYSCTL->RCGCWTIMER |= (1 << 1);
+      SYSCTL->RCGC.WTIMER |= (1 << 1);
       nvicEnableVector(TIVA_WGPT1A_NUMBER, TIVA_GPT_WGPT1A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT2
     if (&GPTD9 == gptp) {
-      SYSCTL->RCGCWTIMER |= (1 << 2);
+      SYSCTL->RCGC.WTIMER |= (1 << 2);
       nvicEnableVector(TIVA_WGPT2A_NUMBER, TIVA_GPT_WGPT2A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT3
     if (&GPTD10 == gptp) {
-      SYSCTL->RCGCWTIMER |= (1 << 3);
+      SYSCTL->RCGC.WTIMER |= (1 << 3);
       nvicEnableVector(TIVA_WGPT3A_NUMBER, TIVA_GPT_WGPT3A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT4
     if (&GPTD11 == gptp) {
-      SYSCTL->RCGCWTIMER |= (1 << 4);
+      SYSCTL->RCGC.WTIMER |= (1 << 4);
       nvicEnableVector(TIVA_WGPT4A_NUMBER, TIVA_GPT_WGPT4A_IRQ_PRIORITY);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT5
     if (&GPTD12 == gptp) {
-      SYSCTL->RCGCWTIMER |= (1 << 5);
+      SYSCTL->RCGC.WTIMER |= (1 << 5);
       nvicEnableVector(TIVA_WGPT5A_NUMBER, TIVA_GPT_WGPT5A_IRQ_PRIORITY);
     }
 #endif
@@ -567,84 +567,84 @@ void gpt_lld_stop(GPTDriver *gptp)
 #if TIVA_GPT_USE_GPT0
     if (&GPTD1 == gptp) {
       nvicDisableVector(TIVA_GPT0A_NUMBER);
-      SYSCTL->RCGCTIMER &= ~(1 << 0);
+      SYSCTL->RCGC.TIMER &= ~(1 << 0);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT1
     if (&GPTD2 == gptp) {
       nvicDisableVector(TIVA_GPT1A_NUMBER);
-      SYSCTL->RCGCTIMER &= ~(1 << 1);
+      SYSCTL->RCGC.TIMER &= ~(1 << 1);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT2
     if (&GPTD3 == gptp) {
       nvicDisableVector(TIVA_GPT2A_NUMBER);
-      SYSCTL->RCGCTIMER &= ~(1 << 2);
+      SYSCTL->RCGC.TIMER &= ~(1 << 2);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT3
     if (&GPTD4 == gptp) {
       nvicDisableVector(TIVA_GPT3A_NUMBER);
-      SYSCTL->RCGCTIMER &= ~(1 << 3);
+      SYSCTL->RCGC.TIMER &= ~(1 << 3);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT4
     if (&GPTD5 == gptp) {
       nvicDisableVector(TIVA_GPT4A_NUMBER);
-      SYSCTL->RCGCTIMER &= ~(1 << 4);
+      SYSCTL->RCGC.TIMER &= ~(1 << 4);
     }
 #endif
 
 #if TIVA_GPT_USE_GPT5
     if (&GPTD6 == gptp) {
       nvicDisableVector(TIVA_GPT5A_NUMBER);
-      SYSCTL->RCGCTIMER &= ~(1 << 5);
+      SYSCTL->RCGC.TIMER &= ~(1 << 5);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT0
     if (&GPTD7 == gptp) {
       nvicDisableVector(TIVA_WGPT0A_NUMBER);
-      SYSCTL->RCGCWTIMER &= ~(1 << 0);
+      SYSCTL->RCGC.WTIMER &= ~(1 << 0);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT1
     if (&GPTD8 == gptp) {
       nvicDisableVector(TIVA_WGPT1A_NUMBER);
-      SYSCTL->RCGCWTIMER &= ~(1 << 1);
+      SYSCTL->RCGC.WTIMER &= ~(1 << 1);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT2
     if (&GPTD9 == gptp) {
       nvicDisableVector(TIVA_WGPT2A_NUMBER);
-      SYSCTL->RCGCWTIMER &= ~(1 << 2);
+      SYSCTL->RCGC.WTIMER &= ~(1 << 2);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT3
     if (&GPTD10 == gptp) {
       nvicDisableVector(TIVA_WGPT3A_NUMBER);
-      SYSCTL->RCGCWTIMER &= ~(1 << 3);
+      SYSCTL->RCGC.WTIMER &= ~(1 << 3);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT4
     if (&GPTD11 == gptp) {
       nvicDisableVector(TIVA_WGPT4A_NUMBER);
-      SYSCTL->RCGCWTIMER &= ~(1 << 4);
+      SYSCTL->RCGC.WTIMER &= ~(1 << 4);
     }
 #endif
 
 #if TIVA_GPT_USE_WGPT5
     if (&GPTD12 == gptp) {
       nvicDisableVector(TIVA_WGPT5A_NUMBER);
-      SYSCTL->RCGCWTIMER &= ~(1 << 5);
+      SYSCTL->RCGC.WTIMER &= ~(1 << 5);
     }
 #endif
   }
diff --git a/os/hal/ports/TIVA/LLD/i2c_lld.c b/os/hal/ports/TIVA/LLD/i2c_lld.c
index 4019a3b..ecd2a47 100644
--- a/os/hal/ports/TIVA/LLD/i2c_lld.c
+++ b/os/hal/ports/TIVA/LLD/i2c_lld.c
@@ -503,70 +503,70 @@ void i2c_lld_start(I2CDriver *i2cp)
   if (i2cp->state == I2C_STOP) {
 #if TIVA_I2C_USE_I2C0
     if (&I2CD1 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 0);
+      SYSCTL->RCGC.I2C |= (1 << 0);
       nvicEnableVector(TIVA_I2C0_NUMBER, TIVA_I2C_I2C0_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C0 */
 
 #if TIVA_I2C_USE_I2C1
     if (&I2CD2 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 1);
+      SYSCTL->RCGC.I2C |= (1 << 1);
       nvicEnableVector(TIVA_I2C1_NUMBER, TIVA_I2C_I2C1_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C1 */
 
 #if TIVA_I2C_USE_I2C2
     if (&I2CD3 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 2);
+      SYSCTL->RCGC.I2C |= (1 << 2);
       nvicEnableVector(TIVA_I2C2_NUMBER, TIVA_I2C_I2C2_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C2 */
 
 #if TIVA_I2C_USE_I2C3
     if (&I2CD4 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 3);
+      SYSCTL->RCGC.I2C |= (1 << 3);
       nvicEnableVector(TIVA_I2C3_NUMBER, TIVA_I2C_I2C3_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C3 */
 
 #if TIVA_I2C_USE_I2C4
     if (&I2CD5 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 4);
+      SYSCTL->RCGC.I2C |= (1 << 4);
       nvicEnableVector(TIVA_I2C4_NUMBER, TIVA_I2C_I2C4_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C4 */
 
 #if TIVA_I2C_USE_I2C5
     if (&I2CD6 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 5);
+      SYSCTL->RCGC.I2C |= (1 << 5);
       nvicEnableVector(TIVA_I2C5_NUMBER, TIVA_I2C_I2C5_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C5 */
 
 #if TIVA_I2C_USE_I2C6
     if (&I2CD7 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 6);
+      SYSCTL->RCGC.I2C |= (1 << 6);
       nvicEnableVector(TIVA_I2C6_NUMBER, TIVA_I2C_I2C6_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C6 */
 
 #if TIVA_I2C_USE_I2C7
     if (&I2CD8 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 7);
+      SYSCTL->RCGC.I2C |= (1 << 7);
       nvicEnableVector(TIVA_I2C7_NUMBER, TIVA_I2C_I2C7_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C7 */
 
 #if TIVA_I2C_USE_I2C8
     if (&I2CD9 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 8);
+      SYSCTL->RCGC.I2C |= (1 << 8);
       nvicEnableVector(TIVA_I2C8_NUMBER, TIVA_I2C_I2C8_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C7 */
 
 #if TIVA_I2C_USE_I2C9
     if (&I2CD10 == i2cp) {
-      SYSCTL->RCGCI2C |= (1 << 9);
+      SYSCTL->RCGC.I2C |= (1 << 9);
       nvicEnableVector(TIVA_I2C9_NUMBER, TIVA_I2C_I2C9_IRQ_PRIORITY);
     }
 #endif /* TIVA_I2C_USE_I2C7 */
@@ -595,70 +595,70 @@ void i2c_lld_stop(I2CDriver *i2cp)
 
 #if TIVA_I2C_USE_I2C0
     if (&I2CD1 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 0);
+      SYSCTL->RCGC.I2C &= ~(1 << 0);
       nvicDisableVector(TIVA_I2C0_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C0 */
 
 #if TIVA_I2C_USE_I2C1
     if (&I2CD2 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 1);
+      SYSCTL->RCGC.I2C &= ~(1 << 1);
       nvicDisableVector(TIVA_I2C1_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C1 */
 
 #if TIVA_I2C_USE_I2C2
     if (&I2CD3 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 2);
+      SYSCTL->RCGC.I2C &= ~(1 << 2);
       nvicDisableVector(TIVA_I2C2_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C2 */
 
 #if TIVA_I2C_USE_I2C3
     if (&I2CD4 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 3);
+      SYSCTL->RCGC.I2C &= ~(1 << 3);
       nvicDisableVector(TIVA_I2C3_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C3 */
 
 #if TIVA_I2C_USE_I2C4
     if (&I2CD5 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 4);
+      SYSCTL->RCGC.I2C &= ~(1 << 4);
       nvicDisableVector(TIVA_I2C4_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C4 */
 
 #if TIVA_I2C_USE_I2C5
     if (&I2CD6 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 5);
+      SYSCTL->RCGC.I2C &= ~(1 << 5);
       nvicDisableVector(TIVA_I2C5_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C5 */
 
 #if TIVA_I2C_USE_I2C6
     if (&I2CD7 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 6);
+      SYSCTL->RCGC.I2C &= ~(1 << 6);
       nvicDisableVector(TIVA_I2C6_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C6 */
 
 #if TIVA_I2C_USE_I2C7
     if (&I2CD8 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 7);
+      SYSCTL->RCGC.I2C &= ~(1 << 7);
       nvicDisableVector(TIVA_I2C7_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C7 */
 
 #if TIVA_I2C_USE_I2C8
     if (&I2CD9 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 8);
+      SYSCTL->RCGC.I2C &= ~(1 << 8);
       nvicDisableVector(TIVA_I2C8_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C8 */
 
 #if TIVA_I2C_USE_I2C9
     if (&I2CD10 == i2cp) {
-      SYSCTL->RCGCI2C &= ~(1 << 9);
+      SYSCTL->RCGC.I2C &= ~(1 << 9);
       nvicDisableVector(TIVA_I2C9_NUMBER);
     }
 #endif /* TIVA_I2C_USE_I2C9 */
diff --git a/os/hal/ports/TIVA/LLD/pal_lld.c b/os/hal/ports/TIVA/LLD/pal_lld.c
index 657f982..9939331 100644
--- a/os/hal/ports/TIVA/LLD/pal_lld.c
+++ b/os/hal/ports/TIVA/LLD/pal_lld.c
@@ -165,7 +165,7 @@ void gpio_init (GPIO_TypeDef *gpiop, const tiva_gpio_setup_t *config)
  */
 void _pal_lld_init(const PALConfig *config)
 {
-  SYSCTL->RCGCGPIO = RCGCGPIO_VALUE;
+  SYSCTL->RCGC.GPIO = RCGCGPIO_VALUE;
 
   __NOP();
   __NOP();
diff --git a/os/hal/ports/TIVA/LLD/pwm_lld.c b/os/hal/ports/TIVA/LLD/pwm_lld.c
index c0ee9d7..f4635ab 100644
--- a/os/hal/ports/TIVA/LLD/pwm_lld.c
+++ b/os/hal/ports/TIVA/LLD/pwm_lld.c
@@ -340,7 +340,7 @@ void pwm_lld_start(PWMDriver *pwmp)
     /* Clock activation.*/
 #if TIVA_PWM_USE_PWM0
     if (&PWMD1 == pwmp) {
-      SYSCTL->RCGCPWM = (1 << 0);
+      SYSCTL->RCGC.PWM |= (1 << 0);
       nvicEnableVector(TIVA_PWM0FAULT_NUMBER,
                        TIVA_PWM_PWM0_FAULT_IRQ_PRIORITY);
       nvicEnableVector(TIVA_PWM0GEN0_NUMBER, TIVA_PWM_PWM0_0_IRQ_PRIORITY);
@@ -352,7 +352,7 @@ void pwm_lld_start(PWMDriver *pwmp)
 
 #if TIVA_PWM_USE_PWM1
     if (&PWMD2 == pwmp) {
-      SYSCTL->RCGCPWM = (1 << 1);
+      SYSCTL->RCGC.PWM |= (1 << 1);
       nvicEnableVector(TIVA_PWM1FAULT_NUMBER,
                        TIVA_PWM_PWM1_FAULT_IRQ_PRIORITY);
       nvicEnableVector(TIVA_PWM1GEN0_NUMBER, TIVA_PWM_PWM1_0_IRQ_PRIORITY);
@@ -427,7 +427,7 @@ void pwm_lld_stop(PWMDriver *pwmp)
       nvicDisableVector(TIVA_PWM0GEN1_NUMBER);
       nvicDisableVector(TIVA_PWM0GEN2_NUMBER);
       nvicDisableVector(TIVA_PWM0GEN3_NUMBER);
-      SYSCTL->RCGCPWM &= ~(1 << 0);
+      SYSCTL->RCGC.PWM &= ~(1 << 0);
     }
 #endif
 
@@ -438,7 +438,7 @@ void pwm_lld_stop(PWMDriver *pwmp)
       nvicDisableVector(TIVA_PWM1GEN1_NUMBER);
       nvicDisableVector(TIVA_PWM1GEN2_NUMBER);
       nvicDisableVector(TIVA_PWM1GEN3_NUMBER);
-      SYSCTL->RCGCPWM &= ~(1 << 1);
+      SYSCTL->RCGC.PWM &= ~(1 << 1);
     }
 #endif
   }
diff --git a/os/hal/ports/TIVA/LLD/serial_lld.c b/os/hal/ports/TIVA/LLD/serial_lld.c
index 6874e5e..9238942 100644
--- a/os/hal/ports/TIVA/LLD/serial_lld.c
+++ b/os/hal/ports/TIVA/LLD/serial_lld.c
@@ -507,50 +507,50 @@ void sd_lld_start(SerialDriver *sdp, const SerialConfig *config)
   if (sdp->state == SD_STOP) {
 #if TIVA_SERIAL_USE_UART0
     if (&SD1 == sdp) {
-      SYSCTL->RCGCUART |= (1 << 0);
-      nvicEnableVector(UART0_IRQn, TIVA_SERIAL_UART0_PRIORITY);
+      SYSCTL->RCGC.UART |= (1 << 0);
+      nvicEnableVector(TIVA_UART0_NUMBER, TIVA_SERIAL_UART0_PRIORITY);
     }
 #endif
 #if TIVA_SERIAL_USE_UART1
     if (&SD2 == sdp) {
-      SYSCTL->RCGCUART |= (1 << 1);
-      nvicEnableVector(UART1_IRQn, TIVA_SERIAL_UART1_PRIORITY);
+      SYSCTL->RCGC.UART |= (1 << 1);
+      nvicEnableVector(TIVA_UART1_NUMBER, TIVA_SERIAL_UART1_PRIORITY);
     }
 #endif
 #if TIVA_SERIAL_USE_UART2
     if (&SD3 == sdp) {
-      SYSCTL->RCGCUART |= (1 << 2);  /* enable UART2 module */
-      nvicEnableVector(UART2_IRQn, TIVA_SERIAL_UART2_PRIORITY);
+      SYSCTL->RCGC.UART |= (1 << 2);  /* enable UART2 module */
+      nvicEnableVector(TIVA_UART2_NUMBER, TIVA_SERIAL_UART2_PRIORITY);
     }
 #endif
 #if TIVA_SERIAL_USE_UART3
     if (&SD4 == sdp) {
-      SYSCTL->RCGCUART |= (1 << 3);  /* enable UART3 module */
-      nvicEnableVector(UART3_IRQn, TIVA_SERIAL_UART3_PRIORITY);
+      SYSCTL->RCGC.UART |= (1 << 3);  /* enable UART3 module */
+      nvicEnableVector(TIVA_UART3_NUMBER, TIVA_SERIAL_UART3_PRIORITY);
     }
 #endif
 #if TIVA_SERIAL_USE_UART4
     if (&SD5 == sdp) {
-      SYSCTL->RCGCUART |= (1 << 4);  /* enable UART4 module */
-      nvicEnableVector(UART4_IRQn, TIVA_SERIAL_UART4_PRIORITY);
+      SYSCTL->RCGC.UART |= (1 << 4);  /* enable UART4 module */
+      nvicEnableVector(TIVA_UART4_NUMBER, TIVA_SERIAL_UART4_PRIORITY);
     }
 #endif
 #if TIVA_SERIAL_USE_UART5
     if (&SD6 == sdp) {
-      SYSCTL->RCGCUART |= (1 << 5);  /* enable UART5 module */
-      nvicEnableVector(UART5_IRQn, TIVA_SERIAL_UART5_PRIORITY);
+      SYSCTL->RCGC.UART |= (1 << 5);  /* enable UART5 module */
+      nvicEnableVector(TIVA_UART5_NUMBER, TIVA_SERIAL_UART5_PRIORITY);
     }
 #endif
 #if TIVA_SERIAL_USE_UART6
     if (&SD7 == sdp) {
-      SYSCTL->RCGCUART |= (1 << 6);  /* enable UART6 module */
-      nvicEnableVector(UART6_IRQn, TIVA_SERIAL_UART6_PRIORITY);
+      SYSCTL->RCGC.UART |= (1 << 6);  /* enable UART6 module */
+      nvicEnableVector(TIVA_UART6_NUMBER, TIVA_SERIAL_UART6_PRIORITY);
     }
 #endif
 #if TIVA_SERIAL_USE_UART7
     if (&SD8 == sdp) {
-      SYSCTL->RCGCUART |= (1 << 7);  /* enable UART7 module */
-      nvicEnableVector(UART7_IRQn, TIVA_SERIAL_UART7_PRIORITY);
+      SYSCTL->RCGC.UART |= (1 << 7);  /* enable UART7 module */
+      nvicEnableVector(TIVA_UART7_NUMBER, TIVA_SERIAL_UART7_PRIORITY);
     }
 #endif
   }
@@ -570,57 +570,57 @@ void sd_lld_stop(SerialDriver *sdp)
     uart_deinit(sdp->uart);
 #if TIVA_SERIAL_USE_UART0
     if (&SD1 == sdp) {
-      SYSCTL->RCGCUART &= ~(1 << 0);  /* disable UART0 module */
-      nvicDisableVector(UART0_IRQn);
+      SYSCTL->RCGC.UART &= ~(1 << 0);  /* disable UART0 module */
+      nvicDisableVector(TIVA_UART0_NUMBER);
       return;
     }
 #endif
 #if TIVA_SERIAL_USE_UART1
     if (&SD2 == sdp) {
-      SYSCTL->RCGCUART &= ~(1 << 1);  /* disable UART1 module */
-      nvicDisableVector(UART1_IRQn);
+      SYSCTL->RCGC.UART &= ~(1 << 1);  /* disable UART1 module */
+      nvicDisableVector(TIVA_UART1_NUMBER);
       return;
     }
 #endif
 #if TIVA_SERIAL_USE_UART2
     if (&SD3 == sdp) {
-      SYSCTL->RCGCUART &= ~(1 << 2);  /* disable UART2 module */
-      nvicDisableVector(UART2_IRQn);
+      SYSCTL->RCGC.UART &= ~(1 << 2);  /* disable UART2 module */
+      nvicDisableVector(TIVA_UART2_NUMBER);
       return;
     }
 #endif
 #if TIVA_SERIAL_USE_UART3
     if (&SD4 == sdp) {
-      SYSCTL->RCGCUART &= ~(1 << 3);  /* disable UART3 module */
-      nvicDisableVector(UART3_IRQn);
+      SYSCTL->RCGC.UART &= ~(1 << 3);  /* disable UART3 module */
+      nvicDisableVector(TIVA_UART3_NUMBER);
       return;
     }
 #endif
 #if TIVA_SERIAL_USE_UART4
     if (&SD5 == sdp) {
-      SYSCTL->RCGCUART &= ~(1 << 4);  /* disable UART4 module */
-      nvicDisableVector(UART4_IRQn);
+      SYSCTL->RCGC.UART &= ~(1 << 4);  /* disable UART4 module */
+      nvicDisableVector(TIVA_UART4_NUMBER);
       return;
     }
 #endif
 #if TIVA_SERIAL_USE_UART5
     if (&SD6 == sdp) {
-      SYSCTL->RCGCUART &= ~(1 << 5);  /* disable UART5 module */
-      nvicDisableVector(UART5_IRQn);
+      SYSCTL->RCGC.UART &= ~(1 << 5);  /* disable UART5 module */
+      nvicDisableVector(TIVA_UART5_NUMBER);
       return;
     }
 #endif
 #if TIVA_SERIAL_USE_UART6
     if (&SD7 == sdp) {
-      SYSCTL->RCGCUART &= ~(1 << 6);  /* disable UART6 module */
-      nvicDisableVector(UART6_IRQn);
+      SYSCTL->RCGC.UART &= ~(1 << 6);  /* disable UART6 module */
+      nvicDisableVector(TIVA_UART6_NUMBER);
       return;
     }
 #endif
 #if TIVA_SERIAL_USE_UART7
     if (&SD8 == sdp) {
-      SYSCTL->RCGCUART &= ~(1 << 7);  /* disable UART7 module */
-      nvicDisableVector(UART7_IRQn);
+      SYSCTL->RCGC.UART &= ~(1 << 7);  /* disable UART7 module */
+      nvicDisableVector(TIVA_UART7_NUMBER);
       return;
     }
 #endif