X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fwm8731.c;h=74a07c4f14ef66102d60df5d86d1cfbb3710e9fa;hb=c00549cc35cb40d68160db6addb24cc82afe052e;hp=2a921792e49e3ed65278a9b4c4bf0d249bfdf61a;hpb=a3c8fd5c3fca6e0bad57e6b554442e6efb88fcdf;p=bertos.git

diff --git a/bertos/drv/wm8731.c b/bertos/drv/wm8731.c
index 2a921792..74a07c4f 100644
--- a/bertos/drv/wm8731.c
+++ b/bertos/drv/wm8731.c
@@ -66,48 +66,33 @@ static void wm8731_write(Wm8731 *ctx, uint8_t reg, uint16_t value)
 
 }
 
+#define RANGECONV(data, y1, y2) (((((int32_t)(data)) * ((y2) - (y1))) / ((1 << 8) - 1)) + (y1))
 void wm8731_setVolume(Wm8731 *ctx, uint16_t device, uint8_t volume)
 {
 	uint16_t value;
 
-	if (device & WM8731_LINE_IN_RX)
+	if (device & WM8731_LINE_IN)
 	{
 		if (!volume)
-			wm8731_write(ctx, WM8731_REG_RIGHT_LINEIN, BV(WM8731_LINMUTE_BIT));
+		{
+			wm8731_write(ctx, WM8731_REG_RIGHT_LINEIN, BV(WM8731_LINMUTE_BIT) | BV(WM8731_RLINBOTH_BIT));
+			wm8731_write(ctx, WM8731_REG_LEFT_LINEIN, BV(WM8731_LINMUTE_BIT) | BV(WM8731_LRINBOTH_BIT));
+		}
 
-		value = DIV_ROUND(volume * WM8731_LINVOL_BITS_MASK, 100) & WM8731_LINVOL_BITS_MASK;
+		value = DIV_ROUND(volume * WM8731_LINVOL_BITS_MASK, 100);
 
-		wm8731_write(ctx, WM8731_REG_RIGHT_LINEIN, ~BV(WM8731_LINMUTE_BIT));
-		wm8731_write(ctx, WM8731_REG_RIGHT_LINEIN, value);
-		LOG_INFO("Set LINE IN Rx vol[%d]%% raw[%d]\n", volume, value);
+		wm8731_write(ctx, WM8731_REG_RIGHT_LINEIN, ~BV(WM8731_LINMUTE_BIT) | value);
+		wm8731_write(ctx, WM8731_REG_LEFT_LINEIN, ~BV(WM8731_RINMUTE_BIT) | value);
+		LOG_INFO("Set LINE IN vol[%d]%% raw[%d]\n", volume, value);
 	}
 
-	if (device & WM8731_LINE_IN_LX)
+	if (device & WM8731_HEADPHONE)
 	{
-		if (!volume)
-			wm8731_write(ctx, WM8731_REG_LEFT_LINEIN, BV(WM8731_LINMUTE_BIT));
-
-		value = DIV_ROUND(volume * WM8731_RINVOL_BITS_MASK, 100) & WM8731_RINVOL_BITS_MASK;
-
-		wm8731_write(ctx, WM8731_REG_LEFT_LINEIN, ~BV(WM8731_LINMUTE_BIT));
-		wm8731_write(ctx, WM8731_REG_LEFT_LINEIN, value);
-		LOG_INFO("Set LINE IN Lx vol[%d]%% raw[%d]\n", volume, value);
-	}
-
-
-	if (device & WM8731_HEADPHONE_RX)
-	{
-		value = DIV_ROUND(volume * WM8731_RHPVOL_BITS_MASK, 100) & WM8731_LHPVOL_BITS_MASK;
-		wm8731_write(ctx, WM8731_REG_RIGHT_HPOUT, value | BV(WM8731_RZCEN_BIT));
-		LOG_INFO("Set HEADPHONE Rx vol[%d]%% raw[%d]\n", volume, value);
-	}
-
+		value = DIV_ROUND(volume * WM8731_RHPVOL_BITS_MASK, 100);
 
-	if (device & WM8731_HEADPHONE_LX)
-	{
-		value = DIV_ROUND(volume * WM8731_LHPVOL_BITS_MASK, 100) & WM8731_LHPVOL_BITS_MASK;
-		wm8731_write(ctx, WM8731_REG_LEFT_HPOUT, value  | BV(WM8731_LZCEN_BIT));
-		LOG_INFO("Set HEADPHONE Lx vol[%d]%% raw[%d]\n", volume, value);
+		wm8731_write(ctx, WM8731_REG_RIGHT_HPOUT, value | BV(WM8731_RZCEN_BIT) | BV(WM8731_RLHPBOTH_BIT));
+		wm8731_write(ctx, WM8731_REG_LEFT_HPOUT, value  | BV(WM8731_LZCEN_BIT) | BV(WM8731_LRHPBOTH_BIT));
+		LOG_INFO("Set HEADPHONE vol[%d]%% raw[%d]\n", volume, value);
 	}
 
 }
@@ -153,14 +138,13 @@ void wm8731_init(Wm8731 *ctx, I2c *i2c, uint8_t codec_addr)
 	/* Configure the codec */
 	wm8731_write(ctx, WM8731_REG_DIGITAL_PATH_CTRL, CONFIG_WM8731_DEEMP | CONFIG_WM8731_DAPC |
 						(CONFIG_WM8731_DACMU << WM8731_DACMU));
-	wm8731_write(ctx, WM8731_REG_ANALOGUE_PATH_CTRL, (CONFIG_WM8731_MICBOOST ? WM8731_MICBOOST : ~WM8731_MICBOOST) |
+	wm8731_write(ctx, WM8731_REG_ANALOGUE_PATH_CTRL, (CONFIG_WM8731_MICBOOST ? BV(WM8731_MICBOOST) : ~BV(WM8731_MICBOOST)) |
 						CONFIG_WM8731_INSEL | CONFIG_WM8731_BYPASS | CONFIG_WM8731_SIDEATT);
-
-	wm8731_write(ctx, WM8731_REG_DA_INTERFACE_FORMAT, 0x2);
-	wm8731_write(ctx, WM8731_REG_SAMPLECTRL, 0x6);
-
-	wm8731_write(ctx, WM8731_REG_ACTIVE_CTRL, 1);
+	wm8731_write(ctx, WM8731_REG_DA_INTERFACE_FORMAT, CONFIG_WM8731_INTERFACE_FORMAT | CONFIG_WM8731_IWL_BITS |
+						(CONFIG_WM8731_MS ? BV(WM8731_MS_BIT) : ~BV(WM8731_MS_BIT)));
+	wm8731_write(ctx, WM8731_REG_SAMPLECTRL, CONFIG_WM8731_SAMPLING_RATES);
 
 	/* By default we turn on all devices and disable only the outclock */
-	wm8731_write(ctx, WM8731_REG_PWDOWN_CTRL, 0x47);
+	wm8731_write(ctx, WM8731_REG_ACTIVE_CTRL, 1);
+	wm8731_write(ctx, WM8731_REG_PWDOWN_CTRL, 0x40);
 }