From 27535ce04a9dac610023effb4e9d1682709410db Mon Sep 17 00:00:00 2001
From: Chris Johnson <plasticchris@gmail.com>
Date: Fri, 27 Jan 2017 13:57:46 -0700
Subject: [PATCH] restart if speaker driver is disabled for any reason (#732)

* six db

* watchdog: add check for codec overcurrent

* fixup: check only top bits

* more debug data, always reset

* restart if speaker driver is disabled for any reason
---
 kitsune/i2c_cmd.c | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/kitsune/i2c_cmd.c b/kitsune/i2c_cmd.c
index fc618c29..3f9d06d3 100644
--- a/kitsune/i2c_cmd.c
+++ b/kitsune/i2c_cmd.c
@@ -725,6 +725,7 @@ int32_t set_volume(int v, unsigned int dly) {
 static bool codec_muted = true;
 void codec_watchdog() {
 	unsigned char cmd[2];
+	bool overcurrent, spkr_off;
 	if( !codec_muted && xSemaphoreTakeRecursive(i2c_smphr, 0)) {
 
 		codec_set_book(0);
@@ -735,22 +736,31 @@ void codec_watchdog() {
 		I2C_IF_Write(Codec_addr, cmd, 1, 1);
 		I2C_IF_Read(Codec_addr, &cmd[1], 1);
 
-		if( cmd[1] ) {
-			LOGE("B0_P0_R44 %x\n",cmd[1]);
+		uint8_t b0p0r44 = cmd[1];
+		if( b0p0r44 ) {
+			LOGW("B0_P0_R44 %x\n",b0p0r44);
 		}
+		overcurrent = b0p0r44 & 0xC0;
 
-		if( cmd[1] & 0xC0 ) {
-			LOGE("overcurrent\n",cmd[1]);
-
-			codec_set_book(0);
-			codec_set_page(1);
+		codec_set_book(0);
+		codec_set_page(1);
 
-			cmd[0] = 45;
-			cmd[1] = 0;
-			I2C_IF_Write(Codec_addr, cmd, 1, 1);
-			I2C_IF_Read(Codec_addr, &cmd[1], 1);
-			LOGE("B0_P1_R45 %x\n",cmd[1]);
+		cmd[0] = 45;
+		cmd[1] = 0;
+		I2C_IF_Write(Codec_addr, cmd, 1, 1);
+		I2C_IF_Read(Codec_addr, &cmd[1], 1);
+		uint8_t b0p1r45 = cmd[1];
+		spkr_off = b0p1r45 == 4;
 
+		if( overcurrent ) {
+			LOGE("overcurrent\n");
+		}
+		if( spkr_off ) {
+			LOGE("spkrdisabled\n");
+			LOGW("B0_P1_R45 %x\n",b0p1r45);
+		}
+		if( overcurrent || spkr_off ) {
+			LOGW("restart codec\n");
 			cmd[0] = 45;
 			cmd[1] = 6;
 			I2C_IF_Write(Codec_addr, cmd, 2, 1);