Merge pull request #100 from marcoveeneman/tiva-improvements

Tiva improvements

2 files changed, 50 insertions, 38 deletions

diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
index 6723c62..5b7e12c 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/main.c
@@ -20,9 +20,8 @@
 
 typedef struct led_config
 {
-  ioportid_t port;
+  ioline_t line;
   uint32_t sleep;
-  uint8_t  pin;
 } led_config_t;
 
 /*
@@ -36,11 +35,11 @@ static THD_FUNCTION(blinkLed, arg) {
 
   chRegSetThreadName("Blinker");
 
-  palSetPadMode(ledConfig->port, ledConfig->pin, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(ledConfig->line, PAL_MODE_OUTPUT_PUSHPULL);
 
   while (TRUE) {
     chThdSleepMilliseconds(ledConfig->sleep);
-    palTogglePad(ledConfig->port, ledConfig->pin);
+    palToggleLine(ledConfig->line);
   }
 }
 
@@ -62,37 +61,43 @@ int main(void)
   chSysInit();
 
   /* Configure RX and TX pins for UART0.*/
-  palSetPadMode(GPIOA, GPIOA_UART0_RX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
-  palSetPadMode(GPIOA, GPIOA_UART0_TX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
+  palSetLineMode(LINE_UART0_RX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
+  palSetLineMode(LINE_UART0_TX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
 
   /* Start the serial driver with the default configuration.*/
   sdStart(&SD1, NULL);
 
-  if (!palReadPad(GPIOF, GPIOF_SW2)) {
+  if (!palReadLine(LINE_SW2)) {
     test_execute((BaseSequentialStream *)&SD1);
   }
 
-  ledRed.port    = GPIOF;
-  ledRed.pin     = GPIOF_LED_RED;
+  ledRed.line    = LINE_LED_RED;
   ledRed.sleep   = 100;
 
-  ledGreen.port  = GPIOF;
-  ledGreen.pin   = GPIOF_LED_GREEN;
+  ledGreen.line  = LINE_LED_GREEN;
   ledGreen.sleep = 101;
 
-  ledBlue.port   = GPIOF;
-  ledBlue.pin    = GPIOF_LED_BLUE;
+  ledBlue.line   = LINE_LED_BLUE;
   ledBlue.sleep  = 102;
 
   /* Creating the blinker threads.*/
-  chThdCreateStatic(waBlinkLedRed, sizeof(waBlinkLedRed), NORMALPRIO, blinkLed,
+  chThdCreateStatic(waBlinkLedRed,
+                    sizeof(waBlinkLedRed),
+                    NORMALPRIO,
+                    blinkLed,
                     &ledRed);
 
-  chThdCreateStatic(waBlinkLedGreen, sizeof(waBlinkLedGreen), NORMALPRIO,
-                    blinkLed, &ledGreen);
-
-  chThdCreateStatic(waBlinkLedBlue, sizeof(waBlinkLedBlue), NORMALPRIO,
-                    blinkLed, &ledBlue);
+  chThdCreateStatic(waBlinkLedGreen,
+                    sizeof(waBlinkLedGreen),
+                    NORMALPRIO,
+                    blinkLed,
+                    &ledGreen);
+
+  chThdCreateStatic(waBlinkLedBlue,
+                    sizeof(waBlinkLedBlue),
+                    NORMALPRIO,
+                    blinkLed,
+                    &ledBlue);
 
   /* Normal main() thread activity.*/
   while (TRUE) {
diff --git a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
index 5184e3e..ef3957f 100644
--- a/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
+++ b/demos/TIVA/RT-TM4C1294-LAUNCHPAD/main.c
@@ -20,9 +20,8 @@
 
 typedef struct led_config
 {
-  ioportid_t port;
+  ioline_t line;
   uint32_t sleep;
-  uint8_t  pin;
 } led_config_t;
 
 /*
@@ -38,11 +37,11 @@ static THD_FUNCTION(blinkLed, arg) {
   chRegSetThreadName("Blinker");
 
   /* Configure pin as push-pull output.*/
-  palSetPadMode(ledConfig->port, ledConfig->pin, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(ledConfig->line, PAL_MODE_OUTPUT_PUSHPULL);
 
   while (TRUE) {
     chThdSleepMilliseconds(ledConfig->sleep);
-    palTogglePad(ledConfig->port, ledConfig->pin);
+    palToggleLine(ledConfig->line);
   }
 }
 
@@ -64,43 +63,51 @@ int main(void)
   chSysInit();
 
   /* Configure RX and TX pins for UART0.*/
-  palSetPadMode(GPIOA, GPIOA_UART0_RX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
-  palSetPadMode(GPIOA, GPIOA_UART0_TX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
+  palSetLineMode(LINE_UART0_RX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
+  palSetLineMode(LINE_UART0_TX, PAL_MODE_INPUT | PAL_MODE_ALTERNATE(1));
 
   /* Start the serial driver with the default configuration.*/
   sdStart(&SD1, NULL);
 
-  if (!palReadPad(GPIOJ, GPIOJ_SW1)) {
+  if (!palReadLine(LINE_SW1)) {
     test_execute((BaseSequentialStream *)&SD1);
   }
 
-  led1.port  = GPIOF;
-  led1.pin   = GPIOF_LED0;
+  led1.line  = LINE_LED0;
   led1.sleep = 100;
 
-  led2.port  = GPIOF;
-  led2.pin   = GPIOF_LED1;
+  led2.line  = LINE_LED1;
   led2.sleep = 101;
 
-  led3.port  = GPION;
-  led3.pin   = GPION_LED2;
+  led3.line  = LINE_LED2;
   led3.sleep = 102;
 
-  led4.port  = GPION;
-  led4.pin   = GPION_LED3;
+  led4.line  = LINE_LED3;
   led4.sleep = 103;
 
   /* Creating the blinker threads.*/
-  chThdCreateStatic(waBlinkLed1, sizeof(waBlinkLed1), NORMALPRIO, blinkLed,
+  chThdCreateStatic(waBlinkLed1,
+                    sizeof(waBlinkLed1),
+                    NORMALPRIO,
+                    blinkLed,
                     &led1);
 
-  chThdCreateStatic(waBlinkLed2, sizeof(waBlinkLed2), NORMALPRIO, blinkLed,
+  chThdCreateStatic(waBlinkLed2,
+                    sizeof(waBlinkLed2),
+                    NORMALPRIO,
+                    blinkLed,
                     &led2);
 
-  chThdCreateStatic(waBlinkLed3, sizeof(waBlinkLed3), NORMALPRIO, blinkLed,
+  chThdCreateStatic(waBlinkLed3,
+                    sizeof(waBlinkLed3),
+                    NORMALPRIO,
+                    blinkLed,
                     &led3);
 
-  chThdCreateStatic(waBlinkLed4, sizeof(waBlinkLed4), NORMALPRIO, blinkLed,
+  chThdCreateStatic(waBlinkLed4,
+                    sizeof(waBlinkLed4),
+                    NORMALPRIO,
+                    blinkLed,
                     &led4);
 
   /*