Merge pull request #100 from marcoveeneman/tiva-improvements

Tiva improvements

6 files changed, 44 insertions, 43 deletions

diff --git a/testhal/TIVA/TM4C123x/EXT/main.c b/testhal/TIVA/TM4C123x/EXT/main.c
index 4370794..6da2ef9 100644
--- a/testhal/TIVA/TM4C123x/EXT/main.c
+++ b/testhal/TIVA/TM4C123x/EXT/main.c
@@ -22,7 +22,7 @@ static void extcb1(EXTDriver *extp, expchannel_t channel)
   (void)extp;
   (void)channel;
 
-  palTogglePad(GPIOF, GPIOF_LED_RED);
+  palToggleLine(LINE_LED_RED);
 }
 
 static void extcb2(EXTDriver *extp, expchannel_t channel)
@@ -30,7 +30,7 @@ static void extcb2(EXTDriver *extp, expchannel_t channel)
   (void)extp;
   (void)channel;
 
-  palTogglePad(GPIOF, GPIOF_LED_GREEN);
+  palToggleLine(LINE_LED_GREEN);
 }
 
 static const EXTConfig extcfg =
@@ -108,10 +108,10 @@ int main(void)
   halInit();
   chSysInit();
 
-  palSetPadMode(GPIOF, GPIOF_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
-  palSetPadMode(GPIOF, GPIOF_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL);
-  palSetPadMode(GPIOF, GPIOF_SW1, PAL_MODE_INPUT_PULLUP);
-  palSetPadMode(GPIOF, GPIOF_SW2, PAL_MODE_INPUT_PULLUP);
+  palSetLineMode(LINE_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_SW1, PAL_MODE_INPUT_PULLUP);
+  palSetLineMode(LINE_SW2, PAL_MODE_INPUT_PULLUP);
 
   extStart(&EXTD1, &extcfg);
 
diff --git a/testhal/TIVA/TM4C123x/GPT/main.c b/testhal/TIVA/TM4C123x/GPT/main.c
index 4e19b14..f92b13b 100644
--- a/testhal/TIVA/TM4C123x/GPT/main.c
+++ b/testhal/TIVA/TM4C123x/GPT/main.c
@@ -23,7 +23,7 @@
 static void gpt1cb(GPTDriver *gptp)
 {
   (void)gptp;
-  palClearPad(GPIOF, GPIOF_LED_RED);
+  palClearLine(LINE_LED_RED);
 }
 
 /*
@@ -32,7 +32,7 @@ static void gpt1cb(GPTDriver *gptp)
 static void gpt7cb(GPTDriver *gptp)
 {
   (void)gptp;
-  palSetPad(GPIOF, GPIOF_LED_RED);
+  palSetLine(LINE_LED_RED);
   chSysLockFromISR();
   gptStartOneShotI(&GPTD1, 31250);  /* 0.1 second pulse.*/
   chSysUnlockFromISR();
@@ -71,7 +71,7 @@ int main(void)
   halInit();
   chSysInit();
 
-  palSetPadMode(GPIOF, GPIOF_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
 
   /*
    * Start the gpt drivers with the custom configurations.
diff --git a/testhal/TIVA/TM4C123x/I2C/main.c b/testhal/TIVA/TM4C123x/I2C/main.c
index 5f58176..5c5e704 100644
--- a/testhal/TIVA/TM4C123x/I2C/main.c
+++ b/testhal/TIVA/TM4C123x/I2C/main.c
@@ -70,8 +70,8 @@ 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.
@@ -79,8 +79,8 @@ int main(void)
   sdStart(&SD1, NULL);
 
   /* Configure SCK and SCL pins for I2C0.*/
-  palSetPadMode(GPIOB, GPIOB_I2C0_SCL, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(3));
-  palSetPadMode(GPIOB, GPIOB_I2C0_SDA, PAL_MODE_OUTPUT_OPENDRAIN | PAL_MODE_ALTERNATE(3));
+  palSetLineMode(LINE_I2C0_SCL, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(3));
+  palSetLineMode(LINE_I2C0_SDA, PAL_MODE_OUTPUT_OPENDRAIN | PAL_MODE_ALTERNATE(3));
 
   /*
    * Start the i2c driver with the custom configuration.
diff --git a/testhal/TIVA/TM4C123x/PWM/main.c b/testhal/TIVA/TM4C123x/PWM/main.c
index 4772e6c..14fd967 100644
--- a/testhal/TIVA/TM4C123x/PWM/main.c
+++ b/testhal/TIVA/TM4C123x/PWM/main.c
@@ -20,27 +20,27 @@
 static void pwmpcb(PWMDriver *pwmp)
 {
   (void)pwmp;
-  palClearPad(GPIOF, GPIOF_LED_RED);
-  palClearPad(GPIOF, GPIOF_LED_GREEN);
-  palClearPad(GPIOF, GPIOF_LED_BLUE);
+  palClearLine(LINE_LED_RED);
+  palClearLine(LINE_LED_GREEN);
+  palClearLine(LINE_LED_BLUE);
 }
 
 static void pwmc1cb0(PWMDriver *pwmp)
 {
   (void)pwmp;
-  palSetPad(GPIOF, GPIOF_LED_RED);
+  palSetLine(LINE_LED_RED);
 }
 
 static void pwmc1cb1(PWMDriver *pwmp)
 {
   (void)pwmp;
-  palSetPad(GPIOF, GPIOF_LED_GREEN);
+  palSetLine(LINE_LED_GREEN);
 }
 
 static void pwmc1cb2(PWMDriver *pwmp)
 {
   (void)pwmp;
-  palSetPad(GPIOF, GPIOF_LED_BLUE);
+  palSetLine(LINE_LED_BLUE);
 }
 
 static PWMConfig pwmcfg = {
@@ -74,9 +74,9 @@ int main(void)
   halInit();
   chSysInit();
 
-  palSetPadMode(GPIOF, GPIOF_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
-  palSetPadMode(GPIOF, GPIOF_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL);
-  palSetPadMode(GPIOF, GPIOF_LED_BLUE, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_LED_BLUE, PAL_MODE_OUTPUT_PUSHPULL);
 
   /*
    * Start PWM driver
diff --git a/testhal/TIVA/TM4C123x/SPI/main.c b/testhal/TIVA/TM4C123x/SPI/main.c
index 7fa05ee..d4bbad2 100644
--- a/testhal/TIVA/TM4C123x/SPI/main.c
+++ b/testhal/TIVA/TM4C123x/SPI/main.c
@@ -104,15 +104,11 @@ int main(void)
   halInit();
   chSysInit();
 
-  palSetPadMode(GPIOA, GPIOA_SSI0_CLK,  PAL_MODE_OUTPUT_PUSHPULL |
-                                        PAL_MODE_ALTERNATE(2));
-  palSetPadMode(GPIOA, GPIOA_SSI0_RX,   PAL_MODE_OUTPUT_PUSHPULL |
-                                        PAL_MODE_ALTERNATE(2));
-  palSetPadMode(GPIOA, GPIOA_SSI0_TX,   PAL_MODE_OUTPUT_PUSHPULL |
-                                        PAL_MODE_ALTERNATE(2));
-  palSetPadMode(GPIOA, GPIOA_PIN3,      PAL_MODE_OUTPUT_PUSHPULL);
-
-  palSetPadMode(GPIOF, GPIOF_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_SSI0_CLK, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(2));
+  palSetLineMode(LINE_SSI0_RX, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(2));
+  palSetLineMode(LINE_SSI0_TX, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(2));
+  palSetLineMode(LINE_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetPadMode(GPIOA, GPIOA_PIN3, PAL_MODE_OUTPUT_PUSHPULL);
 
   /*
    * Prepare transmit pattern.
@@ -124,10 +120,16 @@ int main(void)
   /*
    * Starting the transmitter and receiver threads.
    */
-  chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa),
-                    NORMALPRIO + 1, spi_thread_1, NULL);
-  chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa),
-                    NORMALPRIO + 1, spi_thread_2, NULL);
+  chThdCreateStatic(spi_thread_1_wa,
+                    sizeof(spi_thread_1_wa),
+                    NORMALPRIO + 1,
+                    spi_thread_1,
+                    NULL);
+  chThdCreateStatic(spi_thread_2_wa,
+                    sizeof(spi_thread_2_wa),
+                    NORMALPRIO + 1,
+                    spi_thread_2,
+                    NULL);
 
   /*
    * Normal main() thread activity
diff --git a/testhal/TIVA/TM4C123x/WDG/main.c b/testhal/TIVA/TM4C123x/WDG/main.c
index d5fa9e6..63f76f5 100644
--- a/testhal/TIVA/TM4C123x/WDG/main.c
+++ b/testhal/TIVA/TM4C123x/WDG/main.c
@@ -21,7 +21,7 @@ static bool watchdog_timeout(WDGDriver *wdgp)
 {
   (void)wdgp;
 
-  palSetPad(GPIOF, GPIOF_LED_RED);
+  palSetLine(LINE_LED_RED);
 
   /* Return true to prevent a reset on the next timeout.*/
   return true;
@@ -54,11 +54,10 @@ int main(void) {
   halInit();
   chSysInit();
 
-  palSetPadMode(GPIOF, GPIOF_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
-  palSetPadMode(GPIOF, GPIOF_LED_BLUE, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_LED_RED, PAL_MODE_OUTPUT_PUSHPULL);
+  palSetLineMode(LINE_LED_BLUE, PAL_MODE_OUTPUT_PUSHPULL);
 
-  palSetPadMode(GPIOF, GPIOF_SW1, PAL_MODE_INPUT_PULLUP);
-  palSetPadMode(GPIOF, GPIOF_SW2, PAL_MODE_INPUT_PULLUP);
+  palSetLineMode(LINE_SW1, PAL_MODE_INPUT_PULLUP);
 
   /*
    * Starting the watchdog driver.
@@ -69,13 +68,13 @@ int main(void) {
    * Normal main() thread activity, it resets the watchdog.
    */
   while (true) {
-    if (palReadPad(GPIOF, GPIOF_SW1)) {
+    if (palReadLine(LINE_SW1)) {
       /* Only reset the watchdog if the button is not pressed */
       wdgReset(&WDGD1);
-      palClearPad(GPIOF, GPIOF_LED_RED);
+      palClearLine(LINE_LED_RED);
     }
 
-    palTogglePad(GPIOF, GPIOF_LED_BLUE);
+    palToggleLine(LINE_LED_BLUE);
 
     chThdSleepMilliseconds(500);
   }