no Glitches, ReInit hardware

Author: stickbreaker

cores/esp32/esp32-hal-i2c.c

@@ -385,10 +385,10 @@ void i2cReset(i2c_t* i2c){
 
 /* Stickbreaker ISR mode debug support
 */
-#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
 #define INTBUFFMAX 64
-static uint32_t intBuff[INTBUFFMAX][3];
-static uint32_t intPos=0;
+static uint32_t intBuff[INTBUFFMAX][3][2];
+static uint32_t intPos[2]={0,0};
 #endif
 
 /* Stickbreaker ISR mode debug support
@@ -654,13 +654,10 @@ enable txEmpty, filltx fires, but the SM has already sent a bogus byte out the B
    overlap is not an issue, just keep them full/empty the status_reg.xx_fifo_cnt
    tells the truth. And the INT's fire correctly
 */
-bool readEncountered = false;  // 12/01/2017 this needs to be removed
-// it is nolonger necessary, the fifo's are independent. Run thru the dq's
-// until the cmd[] is full or the txFifo is full.
 uint16_t a=i2c->queuePos; // currently executing dq,
 bool full=!(i2c->dev->status_reg.tx_fifo_cnt<31);
 uint8_t cnt;
-while((a < i2c->queueCount)&&!(full || readEncountered)){
+while((a < i2c->queueCount) && !full){
   I2C_DATA_QUEUE_t *tdq = &i2c->dq[a];
   cnt=0; 
 // add to address to fifo ctrl.addr already has R/W bit positioned correctly 
@@ -706,22 +703,19 @@ while((a < i2c->queueCount)&&!(full || readEncountered)){
         }
       }
     }
-//11/23/2017 overlap tx/rx/tx
-//  else readEncountered = true;
-  
-  if(full) readEncountered =false; //tx possibly needs more
 
-#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
 
 // update debug buffer tx counts  
-  cnt += intBuff[intPos][1]>>16;
-  intBuff[intPos][1] = (intBuff[intPos][1]&0xFFFF)|(cnt<<16);
+  cnt += intBuff[intPos[i2c->num]][1][i2c->num]>>16;
+  intBuff[intPos[i2c->num]][1][i2c->num] = (intBuff[intPos[i2c->num]][1][i2c->num]&0xFFFF)|(cnt<<16);
+
 #endif
 
-  if(!(full||readEncountered)) a++; // check next buffer for tx
+  if(!full) a++; // check next buffer for tx
   }
 
-if((!full) || readEncountered || (a >= i2c->queueCount)){// disable IRQ, the next dq will re-enable it
+if(!full || (a >= i2c->queueCount)){// disable IRQ, the next dq will re-enable it
   i2c->dev->int_ena.tx_fifo_empty=0;
   }
 
@@ -755,10 +749,10 @@ if(tdq->ctrl.mode==1) { // read
       moveCnt = (tdq->length - tdq->position);
       }  
     }
-#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
 // update Debug rxCount
-  cnt += (intBuff[intPos][1])&&0xffFF;
-  intBuff[intPos][1] = (intBuff[intPos][1]&0xFFFF0000)|cnt;
+  cnt += (intBuff[intPos[i2c->num]][1][i2c->num])&&0xffFF;
+  intBuff[intPos[i2c->num]][1][i2c->num] = (intBuff[intPos[i2c->num]][1][i2c->num]&0xFFFF0000)|cnt;
 #endif
   }
 else {
@@ -822,23 +816,22 @@ if(p_i2c->stage==I2C_DONE){ //get Out
   log_e("eject int=%p, ena=%p",activeInt,p_i2c->dev->int_ena.val);
   p_i2c->dev->int_ena.val = 0;
   p_i2c->dev->int_clr.val = activeInt; //0x1FFF;
-//  i2cDumpI2c(p_i2c);
-//  i2cDumpInts();
   return;
   }
 while (activeInt != 0) { // Ordering of 'if(activeInt)' statements is important, don't change
-#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
-  if(activeInt==(intBuff[intPos][0]&0x1fff)){
-    intBuff[intPos][0] = (((intBuff[intPos][0]>>16)+1)<<16)|activeInt;
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
+  if(activeInt==(intBuff[intPos[p_i2c->num]][0][p_i2c->num]&0x1fff)){
+    intBuff[intPos[p_i2c->num]][0][p_i2c->num] = (((intBuff[intPos[p_i2c->num]][0][p_i2c->num]>>16)+1)<<16)|activeInt;
     }
   else{
-    intPos++;
-    intPos %= INTBUFFMAX;
-    intBuff[intPos][0]=(1<<16)|activeInt;
-    intBuff[intPos][1] = 0;
+    intPos[p_i2c->num]++;
+    intPos[p_i2c->num] %= INTBUFFMAX;
+    intBuff[intPos[p_i2c->num]][0][p_i2c->num] = (1<<16) | activeInt;
+    intBuff[intPos[p_i2c->num]][1][p_i2c->num] = 0;
     }
 
-  intBuff[intPos][2] = xTaskGetTickCountFromISR(); // when IRQ fired
+  intBuff[intPos[p_i2c->num]][2][p_i2c->num] = xTaskGetTickCountFromISR(); // when IRQ fired
+ 
 #endif
   uint32_t oldInt =activeInt;
 
@@ -949,13 +942,13 @@ while (activeInt != 0) { // Ordering of 'if(activeInt)' statements is important,
   }
 }
 
-void i2cDumpInts(){
-#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
+void i2cDumpInts(uint8_t num){
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
 uint32_t b;
-log_e("row  count   INTR    TX     RX");
+log_e("%u row  count   INTR    TX     RX",num);
 for(uint32_t a=1;a<=INTBUFFMAX;a++){
-  b=(a+intPos)%INTBUFFMAX;
-  if(intBuff[b][0]!=0) log_e("[%02d] 0x%04x 0x%04x 0x%04x 0x%04x 0x%08x",b,((intBuff[b][0]>>16)&0xFFFF),(intBuff[b][0]&0xFFFF),((intBuff[b][1]>>16)&0xFFFF),(intBuff[b][1]&0xFFFF),intBuff[b][2]);
+  b=(a+intPos[num])%INTBUFFMAX;
+  if(intBuff[b][0][num]!=0) log_e("[%02d] 0x%04x 0x%04x 0x%04x 0x%04x 0x%08x",b,((intBuff[b][0][num]>>16)&0xFFFF),(intBuff[b][0][num]&0xFFFF),((intBuff[b][1][num]>>16)&0xFFFF),(intBuff[b][1][num]&0xFFFF),intBuff[b][2][num]);
   }
 #else
 log_n("enable Core Debug Level \"Error\"");
@@ -986,9 +979,13 @@ I2C_MUTEX_LOCK();
 */
 i2c->stage = I2C_DONE; // until ready
 
-#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
-memset(intBuff,0,sizeof(intBuff));
-intPos=0;
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
+for(uint16_t i=0;i<INTBUFFMAX;i++){
+  intBuff[i][0][i2c->num] = 0;
+  intBuff[i][1][i2c->num] = 0;
+  intBuff[i][2][i2c->num] = 0;
+  }
+intPos[i2c->num] = 0;
 #endif
 // EventGroup is used to signal transmisison completion from ISR
 // not always reliable. Sometimes, the FreeRTOS scheduler is maxed out and refuses request
@@ -1075,9 +1072,19 @@ i2c->dev->int_ena.val =
   I2C_TXFIFO_EMPTY_INT_ENA | // (BIT(1))    triggers fillTxFifo()
   I2C_RXFIFO_FULL_INT_ENA;  // (BIT(0))     trigger emptyRxFifo()
 
-if(!i2c->intr_handle){ // create ISR I2C_0 only, 
-//  log_e("create ISR");
-  uint32_t ret = esp_intr_alloc(ETS_I2C_EXT0_INTR_SOURCE, 0, &i2c_isr_handler_default, i2c, &i2c->intr_handle);
+if(!i2c->intr_handle){ // create ISR for either peripheral 
+  log_i("create ISR");
+  uint32_t ret;
+  switch(i2c->num){
+    case 0:
+      ret = esp_intr_alloc(ETS_I2C_EXT0_INTR_SOURCE, 0, &i2c_isr_handler_default, i2c, &i2c->intr_handle);
+      break;
+    case 1:
+      ret = esp_intr_alloc(ETS_I2C_EXT1_INTR_SOURCE, 0, &i2c_isr_handler_default, i2c, &i2c->intr_handle);
+      break;
+    default :;
+    }
+
   if(ret!=ESP_OK){
     log_e("install interrupt handler Failed=%d",ret);
     I2C_MUTEX_UNLOCK();
@@ -1113,11 +1120,11 @@ if(i2c->exitCode!=eBits){ // try to recover from O/S failure
   }
 
 if(!(eBits==EVENT_DONE)&&(eBits&~(EVENT_ERROR_NAK|EVENT_ERROR_DATA_NAK|EVENT_ERROR|EVENT_DONE))){ // not only Done, therefore error, exclude ADDR NAK, DATA_NAK
-#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
   i2cDumpI2c(i2c);
-  i2cDumpInts();
+  i2cDumpInts(i2c->num);
 #else
-  log_n("I2C exitCode=%u",eBits);
+  log_n("I2C exitCode=0x%x",eBits);
 #endif
   }
 
@@ -1128,7 +1135,7 @@ if(eBits&EVENT_DONE){ // no gross timeout
     // expected can be zero due to small packets
     log_e("TimeoutRecovery: expected=%ums, actual=%ums",expected,(tAfter-tBefore));
     i2cDumpI2c(i2c);
-    i2cDumpInts();
+    i2cDumpInts(i2c->num);
     }
 #endif
   switch(i2c->error){
@@ -1164,7 +1171,7 @@ else { // GROSS timeout, shutdown ISR , report Timeout
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
   log_e(" Busy Timeout start=0x%x, end=0x%x, =%d, max=%d error=%d",tBefore,tAfter,(tAfter-tBefore),ticksTimeOut,i2c->error);
   i2cDumpI2c(i2c);
-  i2cDumpInts();
+  i2cDumpInts(i2c->num);
 #endif
     }
   else { // just a timeout, some data made it out or in.
@@ -1174,7 +1181,7 @@ else { // GROSS timeout, shutdown ISR , report Timeout
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_ERROR
   log_e(" Gross Timeout Dead start=0x%x, end=0x%x, =%d, max=%d error=%d",tBefore,tAfter,(tAfter-tBefore),ticksTimeOut,i2c->error);
   i2cDumpI2c(i2c);
-  i2cDumpInts();
+  i2cDumpInts(i2c->num);
 #endif
     }
   }

cores/esp32/esp32-hal-i2c.h

@@ -169,7 +169,7 @@ i2c_err_t i2cAddQueueRead(i2c_t *i2c, uint16_t i2cDeviceAddr, uint8_t *dataPtr,
 i2c_err_t i2cFreeQueue(i2c_t *i2c);
 i2c_err_t i2cReleaseISR(i2c_t *i2c);
 //stickbreaker debug support
-void i2cDumpInts();
+void i2cDumpInts(uint8_t num);
 void i2cDumpI2c(i2c_t *i2c);
 
 #ifdef __cplusplus