Merge pull request #107 from facchinm/restore_pincount

Restore and use PINCOUNT_fn() wrapper

Author: facchinm

cores/arduino/Arduino.h

@@ -61,7 +61,6 @@ ioport_peripheral_t getPinConfig(bsp_io_port_pin_t pin);
 extern "C" {
 #endif
 extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
 #if defined(__cplusplus)
 }
 #endif

cores/arduino/Interrupts.cpp

@@ -24,7 +24,6 @@
 #if EXT_INTERRUPTS_HOWMANY > 0
 
 extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
 
 #define MAX_IRQ_CHANNEL (15)
 
@@ -76,7 +75,7 @@ pin_size_t digitalPinToInterrupt(pin_size_t pin) { return pin; }
 static int pin2IrqChannel(int pin) {
 /* -------------------------------------------------------------------------- */  
   /* verify index are good */
-  if(pin < 0 || pin >= (int)(g_pin_cfg_size / sizeof(g_pin_cfg[0]))) {
+  if(pin < 0 || pin >= PINS_COUNT) {
     return -1;
   }
   /* getting configuration from table */

cores/arduino/Serial.cpp

@@ -194,7 +194,7 @@ bool  UART::cfg_pins(int max_index) {
 /* -------------------------------------------------------------------------- */
 void UART::begin(unsigned long baudrate, uint16_t config) {
 /* -------------------------------------------------------------------------- */  
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
 
   init_ok = cfg_pins(max_index);
 

cores/arduino/pwm.cpp

@@ -2,9 +2,6 @@
 #include "pwm.h"
 #include "bsp_api.h"
 
-extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
-
 PwmOut::PwmOut(int pinNumber) :
   _pin(pinNumber),
   _enabled(false)
@@ -43,7 +40,7 @@ bool PwmOut::cfg_pin(int max_index) {
 /* default begin function, starts the timers with default pwm configuration (490Hz and 50%) */
 bool PwmOut::begin() {
   bool rv = true;
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
   rv &= cfg_pin(max_index);
 
   if(rv) {
@@ -67,7 +64,7 @@ bool PwmOut::begin() {
 bool PwmOut::begin(uint32_t period_width, uint32_t pulse_width, bool raw /*= false */, timer_source_div_t sd /*= TIMER_SOURCE_DIV_1*/) {
 /* -------------------------------------------------------------------------- */
   _enabled = true;
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
   _enabled &= cfg_pin(max_index);
 
   if(_enabled) {

cores/arduino/variant_helper.cpp

@@ -1,13 +1,10 @@
 #include "Arduino.h"
 #include "variant.h"
 
-extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
-
 std::array<uint16_t, 3> getPinCfgs(const pin_size_t pin, PinCfgReq_t req) {
 
   std::array<uint16_t, 3> ret = {0 , 0, 0};
-  if (pin > g_pin_cfg_size) {
+  if (pin > PINS_COUNT) {
     return ret;
   }
 

libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp

@@ -142,7 +142,7 @@ bool R7FA4M1_CAN::begin(CanBitRate const can_bitrate)
 
   /* Configure the pins for CAN.
    */
-  int const max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int const max_index = PINS_COUNT;
   init_ok &= cfg_pins(max_index, _can_tx_pin, _can_rx_pin);
 
   /* Configure the interrupts.

libraries/Arduino_CAN/src/R7FA6M5_CAN.cpp

@@ -105,7 +105,7 @@ bool R7FA6M5_CAN::begin(CanBitRate const can_bitrate)
 
   /* Configure the pins for CAN.
    */
-  int const max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int const max_index = PINS_COUNT;
   auto [cfg_init_ok, cfg_channel] = cfg_pins(max_index, _can_tx_pin, _can_rx_pin);
   init_ok &= cfg_init_ok;
   _canfd_cfg.channel = cfg_channel;

libraries/SPI/SPI.cpp

@@ -25,13 +25,6 @@
 
 using namespace arduino;
 
-/**************************************************************************************
- * EXTERN GLOBAL CONSTANTS
- **************************************************************************************/
-
-extern const PinMuxCfg_t g_pin_cfg[];
-extern const size_t g_pin_cfg_size;
-
 /**************************************************************************************
  * GLOBAL MEMBER VARIABLES
  **************************************************************************************/
@@ -73,7 +66,7 @@ void ArduinoSPI::begin()
   /* Configure the pins and auto-determine channel and
    * whether or not we are using a SCI.
    */
-  int const max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int const max_index = PINS_COUNT;
   auto [cfg_pins_ok, cfg_channel, cfg_is_sci] = cfg_pins(max_index, _miso_pin, _mosi_pin, _sck_pin, _periph_mode);
   init_ok &= cfg_pins_ok;
   _channel = cfg_channel;

libraries/Wire/Wire.cpp

@@ -275,7 +275,7 @@ bool TwoWire::cfg_pins(int max_index) {
 void TwoWire::begin(void) {
 /* -------------------------------------------------------------------------- */  
   init_ok = true;
-  int max_index = g_pin_cfg_size / sizeof(g_pin_cfg[0]);
+  int max_index = PINS_COUNT;
 
   init_ok &= cfg_pins(max_index);
 

variants/MINIMA/pins_arduino.h

@@ -4,6 +4,9 @@
 
 // Pin count
 // ----
+#ifdef __cplusplus
+extern "C" unsigned int PINCOUNT_fn();
+#endif
 #define PINS_COUNT           (PINCOUNT_fn())
 #define NUM_DIGITAL_PINS     (22u)
 #define NUM_ANALOG_INPUTS    (6u)