santiago: port getPinCfg from H33

Former-commit-id: b1ad94f

Author: facchinm

variants/SANTIAGO/variant.cpp

@@ -7,66 +7,61 @@ uint16_t getPinCfg(const uint16_t *cfg, PinCfgReq_t req, bool prefer_sci /*= fal
   }
   bool thats_all = false;
   uint8_t index = 0;
-  while(!thats_all) {
-
-    /* usually not SCI peripheral have higher priority (they came
-       first in the table) but it is possible to prefer SCI peripheral */
-    if(prefer_sci && !IS_SCI(*(cfg + index))) {
-      if(IS_LAST_ITEM(*(cfg + index))) {
-        thats_all = true;
-      }
-      else {
-        index++;
-      }
-      continue;
-    }
 
-    if(!prefer_sci && IS_SCI(*(cfg + index))) {
-      if(IS_LAST_ITEM(*(cfg + index))) {
-        thats_all = true;
-      }
-      else {
-        index++;
-      }
-      continue;
-    }
+  uint16_t config = 0;
+  uint16_t config_sci = 0;
 
+  while(!thats_all) {
 
     if(PIN_CFG_REQ_UART_TX == req && IS_PIN_UART_TX(*(cfg + index))) {
-      return *(cfg + index);
+      config = *(cfg + index);
     }
     else if(PIN_CFG_REQ_UART_RX == req && IS_PIN_UART_RX(*(cfg + index))) {
-      return *(cfg + index);
+      config = *(cfg + index);
     }
     else if(PIN_CFG_REQ_SCL == req && IS_PIN_SCL(*(cfg + index))) {
-      return *(cfg + index);
+      if (IS_SCI(*(cfg + index))) {
+        config_sci = *(cfg + index);
+      } else {
+        config = *(cfg + index);
+      }
     }
     else if(PIN_CFG_REQ_SDA == req && IS_PIN_SDA(*(cfg + index))) {
-      return *(cfg + index);
+      if (IS_SCI(*(cfg + index))) {
+        config_sci = *(cfg + index);
+      } else {
+        config = *(cfg + index);
+      }
     }
     else if(PIN_CFG_REQ_MISO == req && IS_PIN_MISO(*(cfg + index))) {
-      return *(cfg + index);
+      if (IS_SCI(*(cfg + index))) {
+        config_sci = *(cfg + index);
+      } else {
+        config = *(cfg + index);
+      }
     }
     else if(PIN_CFG_REQ_MOSI == req && IS_PIN_MOSI(*(cfg + index))) {
-      return *(cfg + index);
+      if (IS_SCI(*(cfg + index))) {
+        config_sci = *(cfg + index);
+      } else {
+        config = *(cfg + index);
+      }
     }
     else if(PIN_CFG_REQ_SCK == req && IS_PIN_SCK(*(cfg + index))) {
-      return *(cfg + index);
+      if (IS_SCI(*(cfg + index))) {
+        config_sci = *(cfg + index);
+      } else {
+        config = *(cfg + index);
+      }
     }
     else if(PIN_CFG_REQ_PWM == req && IS_PIN_PWM(*(cfg + index))) {
-      return *(cfg + index);
+      config = *(cfg + index);
     }
     else if(PIN_CFG_REQ_INTERRUPT == req && IS_PIN_INTERRUPT(*(cfg + index))) {
-      return *(cfg + index);
+      config = *(cfg + index);
     }
     else if(PIN_CFG_REQ_ADC == req && IS_PIN_ANALOG(*(cfg + index))) {
-      return *(cfg + index);
-    }
-    else if(PIN_CFG_REQ_CAN_RX == req && IS_PIN_CAN_RX(*(cfg + index))) {
-      return *(cfg + index);
-    }
-    else if(PIN_CFG_REQ_CAN_TX == req && IS_PIN_CAN_TX(*(cfg + index))) {
-      return *(cfg + index);
+      config = *(cfg + index);
     }
 
     if(IS_LAST_ITEM(*(cfg + index))) {
@@ -76,10 +71,11 @@ uint16_t getPinCfg(const uint16_t *cfg, PinCfgReq_t req, bool prefer_sci /*= fal
       index++;
     }
   }
-  return 0;
-} 
-
-
+  if (config_sci != 0 && (prefer_sci || config == 0)) {
+    config = config_sci;
+  }
+  return config;
+}
 
 extern "C" const PinMuxCfg_t g_pin_cfg[] = { 
   { BSP_IO_PORT_03_PIN_01,    P301   }, /* (0) D0  -------------------------  DIGITAL  */