Changed PAL driver so that TM4C123x devices GPIO blocks always use AHB.

3 files changed, 6 insertions, 216 deletions

diff --git a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h
index 337e2e1..c484826 100644
--- a/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h
+++ b/demos/TIVA/RT-TM4C123G-LAUNCHPAD/mcuconf.h
@@ -43,12 +43,6 @@
 /*
  * GPIO driver system settings.
  */
-#define TIVA_GPIO_GPIOA_USE_AHB             TRUE
-#define TIVA_GPIO_GPIOB_USE_AHB             TRUE
-#define TIVA_GPIO_GPIOC_USE_AHB             TRUE
-#define TIVA_GPIO_GPIOD_USE_AHB             TRUE
-#define TIVA_GPIO_GPIOE_USE_AHB             TRUE
-#define TIVA_GPIO_GPIOF_USE_AHB             TRUE
 
 /*
  * GPT driver system settings.
diff --git a/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.c b/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.c
index 41fb3cd..0be8d6d 100644
--- a/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.c
+++ b/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.c
@@ -32,196 +32,122 @@
 
 #if TIVA_HAS_GPIOA || defined(__DOXYGEN__)
 #define GPIOA_BIT       (1 << 0)
-#if TIVA_GPIO_GPIOA_USE_AHB && defined(TM4C123x)
-#define GPIOA_AHB_BIT   (1 << 0)
-#else
-#define GPIOA_AHB_BIT   0
-#endif
 #else
 #define GPIOA_BIT       0
-#define GPIOA_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOB || defined(__DOXYGEN__)
 #define GPIOB_BIT       (1 << 1)
-#if TIVA_GPIO_GPIOB_USE_AHB && defined(TM4C123x)
-#define GPIOB_AHB_BIT   (1 << 1)
-#else
-#define GPIOB_AHB_BIT   0
-#endif
 #else
 #define GPIOB_BIT       0
-#define GPIOB_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOC || defined(__DOXYGEN__)
 #define GPIOC_BIT       (1 << 2)
-#if TIVA_GPIO_GPIOC_USE_AHB && defined(TM4C123x)
-#define GPIOC_AHB_BIT   (1 << 2)
-#else
-#define GPIOC_AHB_BIT   0
-#endif
 #else
 #define GPIOC_BIT       0
-#define GPIOC_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOD || defined(__DOXYGEN__)
 #define GPIOD_BIT       (1 << 3)
-#if TIVA_GPIO_GPIOD_USE_AHB && defined(TM4C123x)
-#define GPIOD_AHB_BIT   (1 << 3)
-#else
-#define GPIOD_AHB_BIT   0
-#endif
 #else
 #define GPIOD_BIT       0
-#define GPIOD_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOE || defined(__DOXYGEN__)
 #define GPIOE_BIT       (1 << 4)
-#if TIVA_GPIO_GPIOE_USE_AHB && defined(TM4C123x)
-#define GPIOE_AHB_BIT   (1 << 4)
-#else
-#define GPIOE_AHB_BIT   0
-#endif
 #else
 #define GPIOE_BIT       0
-#define GPIOE_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOF || defined(__DOXYGEN__)
 #define GPIOF_BIT       (1 << 5)
-#if TIVA_GPIO_GPIOF_USE_AHB && defined(TM4C123x)
-#define GPIOF_AHB_BIT   (1 << 5)
-#else
-#define GPIOF_AHB_BIT   0
-#endif
 #else
 #define GPIOF_BIT       0
-#define GPIOF_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOG || defined(__DOXYGEN__)
 #define GPIOG_BIT       (1 << 6)
-#if TIVA_GPIO_GPIOG_USE_AHB && defined(TM4C123x)
-#define GPIOG_AHB_BIT   (1 << 6)
-#else
-#define GPIOG_AHB_BIT   0
-#endif
 #else
 #define GPIOG_BIT       0
-#define GPIOG_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOH || defined(__DOXYGEN__)
 #define GPIOH_BIT       (1 << 7)
-#if TIVA_GPIO_GPIOH_USE_AHB && defined(TM4C123x)
-#define GPIOH_AHB_BIT   (1 << 7)
-#else
-#define GPIOH_AHB_BIT   0
-#endif
 #else
 #define GPIOH_BIT       0
-#define GPIOH_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOJ || defined(__DOXYGEN__)
 #define GPIOJ_BIT       (1 << 8)
-#if TIVA_GPIO_GPIOJ_USE_AHB && defined(TM4C123x)
-#define GPIOJ_AHB_BIT   (1 << 8)
-#else
-#define GPIOJ_AHB_BIT   0
-#endif
 #else
 #define GPIOJ_BIT       0
-#define GPIOJ_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOK || defined(__DOXYGEN__)
 #define GPIOK_BIT       (1 << 9)
-#define GPIOK_AHB_BIT   (1 << 9)
 #else
 #define GPIOK_BIT       0
-#define GPIOK_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOL || defined(__DOXYGEN__)
 #define GPIOL_BIT       (1 << 10)
-#define GPIOL_AHB_BIT   (1 << 10)
 #else
 #define GPIOL_BIT       0
-#define GPIOL_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOM || defined(__DOXYGEN__)
 #define GPIOM_BIT       (1 << 11)
-#define GPIOM_AHB_BIT   (1 << 11)
 #else
 #define GPIOM_BIT       0
-#define GPIOM_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPION || defined(__DOXYGEN__)
 #define GPION_BIT       (1 << 12)
-#define GPION_AHB_BIT   (1 << 12)
 #else
 #define GPION_BIT       0
-#define GPION_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOP || defined(__DOXYGEN__)
 #define GPIOP_BIT       (1 << 13)
-#define GPIOP_AHB_BIT   (1 << 13)
 #else
 #define GPIOP_BIT       0
-#define GPIOP_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOQ || defined(__DOXYGEN__)
 #define GPIOQ_BIT       (1 << 14)
-#define GPIOQ_AHB_BIT   (1 << 14)
 #else
 #define GPIOQ_BIT       0
-#define GPIOQ_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOR || defined(__DOXYGEN__)
 #define GPIOR_BIT       (1 << 15)
-#define GPIOR_AHB_BIT   (1 << 15)
 #else
 #define GPIOR_BIT       0
-#define GPIOR_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOS || defined(__DOXYGEN__)
 #define GPIOS_BIT       (1 << 16)
-#define GPIOS_AHB_BIT   (1 << 16)
 #else
 #define GPIOS_BIT       0
-#define GPIOS_AHB_BIT   0
 #endif
 
 #if TIVA_HAS_GPIOT || defined(__DOXYGEN__)
 #define GPIOT_BIT       (1 << 17)
-#define GPIOT_AHB_BIT   (1 << 17)
 #else
 #define GPIOT_BIT       0
-#define GPIOT_AHB_BIT   0
 #endif
 
 #define RCGCGPIO_MASK   (GPIOA_BIT | GPIOB_BIT | GPIOC_BIT | GPIOD_BIT |      \
                          GPIOE_BIT | GPIOF_BIT | GPIOG_BIT | GPIOH_BIT |      \
                          GPIOJ_BIT | GPIOK_BIT | GPIOL_BIT | GPIOM_BIT |      \
                          GPION_BIT | GPIOP_BIT | GPIOQ_BIT | GPIOR_BIT |      \
-                         GPIOS_BIT | GPIOR_BIT)
-
-#define GPIOHBCTL_MASK  (GPIOA_AHB_BIT | GPIOB_AHB_BIT | GPIOC_AHB_BIT |      \
-                         GPIOD_AHB_BIT | GPIOE_AHB_BIT | GPIOF_AHB_BIT |      \
-                         GPIOG_AHB_BIT | GPIOH_AHB_BIT | GPIOJ_AHB_BIT |      \
-                         GPIOK_AHB_BIT | GPIOL_AHB_BIT | GPIOM_AHB_BIT |      \
-                         GPION_AHB_BIT | GPIOP_AHB_BIT | GPIOQ_AHB_BIT |      \
-                         GPIOR_AHB_BIT | GPIOS_AHB_BIT | GPIOT_AHB_BIT)
+                         GPIOS_BIT | GPIOT_BIT)
+
+#define GPIOHBCTL_MASK  (GPIO_MASK &                                          \
+                        (GPIOA_BIT | GPIOB_BIT | GPIOC_BIT | GPIOD_BIT |      \
+                         GPIOE_BIT | GPIOF_BIT | GPIOG_BIT | GPIOH_BIT |      \
+                         GPIOJ_BIT))
 
 #define GPIOC_JTAG_MASK     (0x0F)
 #define GPIOD_NMI_MASK      (0x80)
diff --git a/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h b/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h
index cf14bfb..d4b634d 100644
--- a/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h
+++ b/os/hal/ports/TIVA/LLD/GPIO/hal_pal_lld.h
@@ -337,149 +337,19 @@ typedef uint32_t ioportid_t;
 /* Driver pre-compile time settings.                                         */
 /*===========================================================================*/
 
-#if defined(TM4C123x)
-
-/**
- * @brief   GPIOA AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOA. When set
- *          to @p FALSE the APB bus is used to access GPIOA.
- */
-#if !defined(TIVA_GPIO_GPIOA_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOA_USE_AHB             TRUE
-#endif
-
-/**
- * @brief   GPIOB AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOB. When set
- *          to @p FALSE the APB bus is used to access GPIOB.
- */
-#if !defined(TIVA_GPIO_GPIOB_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOB_USE_AHB             TRUE
-#endif
-
-/**
- * @brief   GPIOC AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOC. When set
- *          to @p FALSE the APB bus is used to access GPIOC.
- */
-#if !defined(TIVA_GPIO_GPIOC_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOC_USE_AHB             TRUE
-#endif
-
-/**
- * @brief   GPIOD AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOD. When set
- *          to @p FALSE the APB bus is used to access GPIOD.
- */
-#if !defined(TIVA_GPIO_GPIOD_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOD_USE_AHB             TRUE
-#endif
-
-/**
- * @brief   GPIOE AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOE. When set
- *          to @p FALSE the APB bus is used to access GPIOE.
- */
-#if !defined(TIVA_GPIO_GPIOE_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOE_USE_AHB             TRUE
-#endif
-
-/**
- * @brief   GPIOF AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOF. When set
- *          to @p FALSE the APB bus is used to access GPIOF.
- */
-#if !defined(TIVA_GPIO_GPIOF_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOF_USE_AHB             TRUE
-#endif
-
-/**
- * @brief   GPIOG AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOG. When set
- *          to @p FALSE the APB bus is used to access GPIOG.
- */
-#if !defined(TIVA_GPIO_GPIOG_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOG_USE_AHB             TRUE
-#endif
-
-/**
- * @brief   GPIOH AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOH. When set
- *          to @p FALSE the APB bus is used to access GPIOH.
- */
-#if !defined(TIVA_GPIO_GPIOH_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOH_USE_AHB             TRUE
-#endif
-
-/**
- * @brief   GPIOJ AHB enable switch.
- * @details When set to @p TRUE the AHB bus is used to access GPIOJ. When set
- *          to @p FALSE the APB bus is used to access GPIOJ.
- */
-#if !defined(TIVA_GPIO_GPIOJ_USE_AHB) || defined(__DOXYGEN__)
-#define TIVA_GPIO_GPIOJ_USE_AHB             TRUE
-#endif
-
-#endif
-
 /*===========================================================================*/
 /* Derived constants and error checks.                                       */
 /*===========================================================================*/
 
-#if TIVA_GPIO_GPIOA_USE_AHB && defined(TM4C123x)
 #define GPIOA                               GPIO_PORTA_AHB_BASE
-#else
-#define GPIOA                               GPIO_PORTA_BASE
-#endif
-
-#if TIVA_GPIO_GPIOB_USE_AHB && defined(TM4C123x)
 #define GPIOB                               GPIO_PORTB_AHB_BASE
-#else
-#define GPIOB                               GPIO_PORTB_BASE
-#endif
-
-#if TIVA_GPIO_GPIOC_USE_AHB && defined(TM4C123x)
 #define GPIOC                               GPIO_PORTC_AHB_BASE
-#else
-#define GPIOC                               GPIO_PORTC_BASE
-#endif
-
-#if TIVA_GPIO_GPIOD_USE_AHB && defined(TM4C123x)
 #define GPIOD                               GPIO_PORTD_AHB_BASE
-#else
-#define GPIOD                               GPIO_PORTD_BASE
-#endif
-
-#if TIVA_GPIO_GPIOE_USE_AHB && defined(TM4C123x)
 #define GPIOE                               GPIO_PORTE_AHB_BASE
-#else
-#define GPIOE                               GPIO_PORTE_BASE
-#endif
-
-#if TIVA_GPIO_GPIOF_USE_AHB && defined(TM4C123x)
 #define GPIOF                               GPIO_PORTF_AHB_BASE
-#else
-#define GPIOF                               GPIO_PORTF_BASE
-#endif
-
-#if TIVA_GPIO_GPIOG_USE_AHB && defined(TM4C123x)
 #define GPIOG                               GPIO_PORTG_AHB_BASE
-#else
-#define GPIOG                               GPIO_PORTG_BASE
-#endif
-
-#if TIVA_GPIO_GPIOH_USE_AHB && defined(TM4C123x)
 #define GPIOH                               GPIO_PORTH_AHB_BASE
-#else
-#define GPIOH                               GPIO_PORTH_BASE
-#endif
-
-#if TIVA_GPIO_GPIOJ_USE_AHB && defined(TM4C123x)
 #define GPIOJ                               GPIO_PORTJ_AHB_BASE
-#else
-#define GPIOJ                               GPIO_PORTJ_BASE
-#endif
-
 #define GPIOK                               GPIO_PORTK_BASE
 #define GPIOL                               GPIO_PORTL_BASE
 #define GPIOM                               GPIO_PORTM_BASE