Cleanup in PAL driver.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12559 110e8d01-0319-4d1e-a829-52ad28d1bb01

9 files changed, 23 insertions, 11 deletions

diff --git a/os/hal/include/hal_pal.h b/os/hal/include/hal_pal.h
index 251cf01ae..62a213142 100644
--- a/os/hal/include/hal_pal.h
+++ b/os/hal/include/hal_pal.h
@@ -147,6 +147,7 @@
  */

 typedef void (*palcallback_t)(void *arg);

 

+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE) || defined(__DOXYGEN__)

 /**

  * @brief   Type of a PAL event record.

  */

@@ -168,6 +169,7 @@ typedef struct {
   void                  *arg;

 #endif

 } palevent_t;

+#endif

 

 #include "hal_pal_lld.h"

 

diff --git a/os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.c b/os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.c
index 6c12b97b5..99106bce7 100644
--- a/os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.c
+++ b/os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.c
@@ -49,10 +49,12 @@
 /* Driver exported variables.                                                */

 /*===========================================================================*/

 

+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE) || defined(__DOXYGEN__)

 /**

  * @brief   Event records for the 16 GPIO EXTI channels.

  */

 palevent_t _pal_events[16];

+#endif

 

 /*===========================================================================*/

 /* Driver local variables and types.                                         */

diff --git a/os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.h b/os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.h
index d7d26942e..63bc006d4 100644
--- a/os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.h
+++ b/os/hal/ports/STM32/LLD/GPIOv1/hal_pal_lld.h
@@ -430,8 +430,10 @@ typedef uint32_t iopadid_t;
 

 #if !defined(__DOXYGEN__)

 extern const PALConfig pal_default_config;

+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE)

 extern palevent_t _pal_events[16];

 #endif

+#endif

 

 #ifdef __cplusplus

 extern "C" {

diff --git a/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c b/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c
index 574d3c164..a8ce78f87 100644
--- a/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c
+++ b/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.c
@@ -34,10 +34,12 @@
 /* Driver exported variables.                                                */

 /*===========================================================================*/

 

+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE) || defined(__DOXYGEN__)

 /**

  * @brief   Event records for the 16 GPIO EXTI channels.

  */

 palevent_t _pal_events[16];

+#endif

 

 /*===========================================================================*/

 /* Driver local variables and types.                                         */

diff --git a/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.h b/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.h
index d6dd4df72..ce981ecb6 100644
--- a/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.h
+++ b/os/hal/ports/STM32/LLD/GPIOv2/hal_pal_lld.h
@@ -487,8 +487,10 @@ typedef uint32_t iopadid_t;
   (bool)((EXTI->IMR & (1U << (uint32_t)pad)) != 0U)

 

 #if !defined(__DOXYGEN__)

+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE)

 extern palevent_t _pal_events[16];

 #endif

+#endif

 

 #ifdef __cplusplus

 extern "C" {

diff --git a/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c b/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c
index e1f63d3fd..9ca51f5b9 100644
--- a/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c
+++ b/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.c
@@ -43,10 +43,12 @@
 /* Driver exported variables.                                                */

 /*===========================================================================*/

 

+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE) || defined(__DOXYGEN__)

 /**

  * @brief   Event records for the 16 GPIO EXTI channels.

  */

 palevent_t _pal_events[16];

+#endif

 

 /*===========================================================================*/

 /* Driver local variables and types.                                         */

diff --git a/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.h b/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.h
index 0348744a0..d1a5f1235 100644
--- a/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.h
+++ b/os/hal/ports/STM32/LLD/GPIOv3/hal_pal_lld.h
@@ -527,8 +527,10 @@ typedef uint32_t iopadid_t;
   (bool)((EXTI->IMR & (1U << (uint32_t)pad)) != 0U)

 

 #if !defined(__DOXYGEN__)

+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE)

 extern palevent_t _pal_events[16];

 #endif

+#endif

 

 #ifdef __cplusplus

 extern "C" {

diff --git a/os/hal/templates/hal_pal_lld.c b/os/hal/templates/hal_pal_lld.c
index 9d7df5286..6cf21942c 100644
--- a/os/hal/templates/hal_pal_lld.c
+++ b/os/hal/templates/hal_pal_lld.c
@@ -52,15 +52,10 @@
 

 /**

  * @brief   STM32 I/O ports configuration.

- * @details Ports A-D(E, F, G, H) clocks enabled.

- *

- * @param[in] config    the STM32 ports configuration

  *

  * @notapi

  */

-void _pal_lld_init(const PALConfig *config) {

-

-  (void)config;

+void _pal_lld_init(void) {

 

 }

 

diff --git a/os/hal/templates/hal_pal_lld.h b/os/hal/templates/hal_pal_lld.h
index 51752e07f..5934e8a83 100644
--- a/os/hal/templates/hal_pal_lld.h
+++ b/os/hal/templates/hal_pal_lld.h
@@ -31,6 +31,10 @@
 /* Unsupported modes and specific modes                                      */

 /*===========================================================================*/

 

+/* Specifies palInit() without parameter, required until all platforms will

+   be updated to the new style.*/

+#define PAL_NEW_INIT

+

 /*===========================================================================*/

 /* I/O Ports Types and constants.                                            */

 /*===========================================================================*/

@@ -141,11 +145,9 @@ typedef uint32_t iopadid_t;
 /**

  * @brief   Low level PAL subsystem initialization.

  *

- * @param[in] config    architecture-dependent ports configuration

- *

  * @notapi

  */

-#define pal_lld_init(config) _pal_lld_init(config)

+#define pal_lld_init() _pal_lld_init()

 

 /**

  * @brief   Reads the physical I/O port states.

@@ -426,14 +428,15 @@ typedef uint32_t iopadid_t;
   &_pal_events[0]; (void)line

 

 #if !defined(__DOXYGEN__)

-extern const PALConfig pal_default_config;

+#if (PAL_USE_WAIT == TRUE) || (PAL_USE_CALLBACKS == TRUE)

 extern palevent_t _pal_events[1];

 #endif

+#endif

 

 #ifdef __cplusplus

 extern "C" {

 #endif

-  void _pal_lld_init(const PALConfig *config);

+  void _pal_lld_init(void);

   void _pal_lld_setgroupmode(ioportid_t port,

                              ioportmask_t mask,

                              iomode_t mode);