chore(analog): cleanup befor HALv2

- remove unused analogOutputInit function
- reorder functions per features

Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

Author: fpistm

cores/arduino/wiring.h

@@ -54,7 +54,6 @@ extern void analogWriteResolution(int res);
  * \param freq
  */
 extern void analogWriteFrequency(uint32_t freq);
-extern void analogOutputInit(void) ;
 
 /* wiring_constants */
 #define DEFAULT 1

cores/arduino/wiring_analog.c

@@ -23,12 +23,24 @@
 extern "C" {
 #endif
 
+/* DAC/PWM */
 #if (defined(HAL_DAC_MODULE_ENABLED) && !defined(HAL_DAC_MODULE_ONLY)) ||\
     (defined(HAL_TIM_MODULE_ENABLED) && !defined(HAL_TIM_MODULE_ONLY))
 //This is the list of the IOs configured
 uint32_t g_anOutputPinConfigured[MAX_NB_PORT] = {0};
 #endif
+#define MAX_PWM_RESOLUTION 16
+static int _writeResolution = PWM_RESOLUTION;
+static int _internalWriteResolution =
+#if PWM_RESOLUTION > MAX_PWM_RESOLUTION
+  MAX_PWM_RESOLUTION
+#else
+  PWM_RESOLUTION
+#endif
+  ;
+static uint32_t _writeFreq = PWM_FREQUENCY;
 
+/* ADC */
 #if defined(ADC_RESOLUTION_16B) || defined(ADC_DS_DATA_WIDTH_16_BIT)
 #define MAX_ADC_RESOLUTION 16
 #elif defined(ADC_DS_DATA_WIDTH_15_BIT)
@@ -40,7 +52,6 @@ uint32_t g_anOutputPinConfigured[MAX_NB_PORT] = {0};
 #else
 #define MAX_ADC_RESOLUTION 12
 #endif
-#define MAX_PWM_RESOLUTION 16
 
 static int _readResolution = ADC_RESOLUTION;
 static int _internalReadResolution =
@@ -71,17 +82,22 @@ static int _internalReadResolution =
 #endif /* ADC_RESOLUTION > MAX_ADC_RESOLUTION */
   ;
 
-static int _writeResolution = PWM_RESOLUTION;
-static int _internalWriteResolution =
-#if PWM_RESOLUTION > MAX_PWM_RESOLUTION
-  MAX_PWM_RESOLUTION
-#else
-  PWM_RESOLUTION
-#endif
-  ;
-
-static uint32_t _writeFreq = PWM_FREQUENCY;
+/* Common utility function to map a value from one resolution to another */
+static inline uint32_t mapResolution(uint32_t value, uint32_t from, uint32_t to)
+{
+  if (from != to) {
+    if (from > to) {
+      value = (value < (uint32_t)(1 << (from - to))) ? 0 : ((value + 1) >> (from - to)) - 1;
+    } else {
+      if (value != 0) {
+        value = ((value + 1) << (to - from)) - 1;
+      }
+    }
+  }
+  return value;
+}
 
+/* ADC */
 void analogReadResolution(int res)
 {
   if ((res > 0) && (res <= 32)) {
@@ -144,39 +160,6 @@ void analogReadResolution(int res)
   }
 }
 
-void analogWriteResolution(int res)
-{
-  if ((res > 0) && (res <= 32)) {
-    _writeResolution = res;
-    if (_writeResolution > MAX_PWM_RESOLUTION) {
-      _internalWriteResolution = MAX_PWM_RESOLUTION;
-    } else {
-      _internalWriteResolution = _writeResolution;
-    }
-  } else {
-    Error_Handler();
-  }
-}
-
-void analogWriteFrequency(uint32_t freq)
-{
-  _writeFreq = freq;
-}
-
-static inline uint32_t mapResolution(uint32_t value, uint32_t from, uint32_t to)
-{
-  if (from != to) {
-    if (from > to) {
-      value = (value < (uint32_t)(1 << (from - to))) ? 0 : ((value + 1) >> (from - to)) - 1;
-    } else {
-      if (value != 0) {
-        value = ((value + 1) << (to - from)) - 1;
-      }
-    }
-  }
-  return value;
-}
-
 void analogReference(uint8_t mode)
 {
   (void)mode;
@@ -199,15 +182,28 @@ int analogRead(pin_size_t pinNumber)
   return value;
 }
 
+/* DAC/PWM */
+void analogWriteResolution(int res)
+{
+  if ((res > 0) && (res <= 32)) {
+    _writeResolution = res;
+    if (_writeResolution > MAX_PWM_RESOLUTION) {
+      _internalWriteResolution = MAX_PWM_RESOLUTION;
+    } else {
+      _internalWriteResolution = _writeResolution;
+    }
+  } else {
+    Error_Handler();
+  }
+}
 
-void analogOutputInit(void)
+void analogWriteFrequency(uint32_t freq)
 {
+  _writeFreq = freq;
 }
 
-// Right now, PWM output only works on the pins with
-// hardware support.  These are defined in the appropriate
-// variant.cpp file.  For the rest of the pins, we default
-// to digital output.
+// Output only works on the pins with Hardware Timer (PWM) or DAC support.
+// For the other pins, default to digital output.
 void analogWrite(pin_size_t pinNumber, int value)
 {
 #if defined(HAL_DAC_MODULE_ENABLED) && !defined(HAL_DAC_MODULE_ONLY)