Remove extern variable declarations in the HAL header file

diff --git a/rpp/include/hal/gpio.h b/rpp/include/hal/gpio.h
index fd82c65fa0d9c66be4dc1b8b004afd3942f30ab5..0f5540dc12546fc1a2e2943ed080a75b62775623 100644 (file)
--- a/rpp/include/hal/gpio.h
+++ b/rpp/include/hal/gpio.h
@@ -32,9 +32,9 @@
 
 #include "hal/hal.h"
 
-extern gioPORT_t *port_id_map[MAX_PORT_CNT];
-extern pin_map_element_t pin_map[MAX_PIN_CNT];
+uint8_t hal_gpio_get_pin_cnt();
 
+pin_map_element_t* hal_gpio_get_pin_map();
 
 /**
  * Get port base assigned to port number

diff --git a/rpp/src/hal/gpio.c b/rpp/src/hal/gpio.c
index 0912b8a1686fd84f6beb20304d023c701649ccad..4633ff13e8e679c84c3f959d55f2fc13b69e9703 100644 (file)
--- a/rpp/src/hal/gpio.c
+++ b/rpp/src/hal/gpio.c
@@ -21,6 +21,17 @@
 
 #include "hal/hal.h"
 
+extern gioPORT_t *port_id_map[MAX_PORT_CNT];
+extern pin_map_element_t pin_map[MAX_PIN_CNT];
+
+uint8_t hal_gpio_get_pin_cnt() {
+       return MAX_PIN_CNT;
+}
+
+pin_map_element_t* hal_gpio_get_pin_map() {
+       return pin_map;
+}
+
 gioPORT_t *hal_gpio_get_port_base(uint32_t port_num)
 {
        return port_id_map[port_num];

diff --git a/rpp/src/rpp/gio.c b/rpp/src/rpp/gio.c
index 4c4baad547f2919492606f239afed0d2651cb412..809d4d7ca66c2eace0191bf4e97c11f717d486f1 100644 (file)
--- a/rpp/src/rpp/gio.c
+++ b/rpp/src/rpp/gio.c
@@ -25,8 +25,10 @@ int8_t rpp_gio_init(uint32_t init_ports)
        unsigned pin;
 
        gioREG->GCR0 = 1;   // Bring GIO out of reset
+       pin_map_element_t* pin_map = hal_gpio_get_pin_map();
 
-       for (pin = 0; pin < sizeof(pin_map)/sizeof(*pin_map); pin++) {
+
+       for (pin = 0; pin < hal_gpio_get_pin_cnt(); pin++) {
                int port_num = hal_gpio_pin_get_port_num(pin_map[pin].pin_desc);
                if ((init_ports & (1 << port_num)) &&
                        !(ports_initialized & (1 << port_num)))