I2S_CHANS_PER_FRAME and I2S_WIRES_xxx tidy

module_usb_audio/devicedefines.h

@@ -74,40 +74,6 @@
     #define DSD_CHANS_DAC        0
 #endif
 
-/**
- * @brief Number of IS2 channesl to DAC/CODEC. Must be a multiple of 2.
- *
- * Default: NONE (Must be defined by app)
- */
-#ifndef I2S_CHANS_DAC
-    #error I2S_CHANS_DAC not defined
-    #define I2S_CHANS_DAC 2          /* Define anyway for doxygen */
-#else
-
-#ifdef I2S_MODE_TDM
-#define I2S_WIRES_DAC            (I2S_CHANS_DAC >> 3)
-#else
-#define I2S_WIRES_DAC            (I2S_CHANS_DAC >> 1)
-#endif
-#endif
-
-/**
- * @brief Number of I2S channels from ADC/CODEC. Must be a multiple of 2.
- *
- * Default: NONE (Must be defined by app)
- */
-#ifndef I2S_CHANS_ADC
-    #error I2S_CHANS_ADC not defined
-    #define I2S_CHANS_ADC 2      /* Define anyway for doxygen */
-#else
-
-#ifdef I2S_MODE_TDM
-#define I2S_WIRES_ADC            (I2S_CHANS_ADC >> 3)
-#else
-#define I2S_WIRES_ADC            (I2S_CHANS_ADC >> 1)
-#endif
-#endif
-
 /**
  * @brief Channels per I2S frame. *
  *
@@ -122,6 +88,33 @@
     #endif
 #endif
 
+
+/**
+ * @brief Number of IS2 channesl to DAC/CODEC. Must be a multiple of 2.
+ *
+ * Default: NONE (Must be defined by app)
+ */
+#ifndef I2S_CHANS_DAC
+    #error I2S_CHANS_DAC not defined
+    #define I2S_CHANS_DAC 2          /* Define anyway for doxygen */
+#else
+#define I2S_WIRES_DAC            (I2S_CHANS_DAC / I2S_CHANS_PER_FRAME)
+#endif
+
+
+/**
+ * @brief Number of I2S channels from ADC/CODEC. Must be a multiple of 2.
+ *
+ * Default: NONE (Must be defined by app)
+ */
+#ifndef I2S_CHANS_ADC
+    #error I2S_CHANS_ADC not defined
+    #define I2S_CHANS_ADC 2      /* Define anyway for doxygen */
+#else
+#define I2S_WIRES_ADC            (I2S_CHANS_ADC / I2S_CHANS_PER_FRAME)
+#endif
+
+
 /**
  * @brief Max supported sample frequency for device (Hz). Default: 192000
  */