Improvement on sem_ctl + psreg

projects/cm_mcu/Semaphore.c

@@ -26,3 +26,50 @@ void initSemaphores(void)
   i2c5_sem = xSemaphoreCreateMutex();
   i2c6_sem = xSemaphoreCreateMutex();
 }
+
+SemaphoreHandle_t getSemaphore(int number)
+{
+  SemaphoreHandle_t s;
+  switch (number) {
+    case 1:
+      s = i2c1_sem;
+      break;
+    case 2:
+      s = i2c2_sem;
+      break;
+    case 3:
+      s = i2c3_sem;
+      break;
+    case 4:
+      s = i2c4_sem;
+      break;
+    case 5:
+      s = i2c5_sem;
+      break;
+    case 6:
+      s = i2c6_sem;
+      break;
+    default:
+      s = 0;
+      break;
+  }
+  return s;
+}
+
+#define MAX_TRIES 50
+int acquireI2CSemaphore(SemaphoreHandle_t s)
+{
+  int retval = pdTRUE;
+  if (s == NULL) {
+    return pdFAIL;
+  }
+  int tries = 0;
+  while (xSemaphoreTake(s, (TickType_t)10) == pdFALSE) {
+    ++tries;
+    if (tries > MAX_TRIES) {
+      retval = pdFAIL;
+      break;
+    }
+  }
+  return retval;
+}

projects/cm_mcu/Semaphore.h

@@ -23,4 +23,8 @@ extern SemaphoreHandle_t i2c6_sem;
 
 void initSemaphores(void);
 
+SemaphoreHandle_t getSemaphore(int number);
+
+int acquireI2CSemaphore(SemaphoreHandle_t s);
+
 #endif /* PROJECTS_CM_MCU_SEMAPHORE_H_ */

projects/cm_mcu/commands/I2CCommands.c

@@ -11,52 +11,6 @@
 #include "Semaphore.h"
 #include "projdefs.h"
 
-SemaphoreHandle_t getSemaphore(int number)
-{
-  SemaphoreHandle_t s;
-  switch (number) {
-    case 1:
-      s = i2c1_sem;
-      break;
-    case 2:
-      s = i2c2_sem;
-      break;
-    case 3:
-      s = i2c3_sem;
-      break;
-    case 4:
-      s = i2c4_sem;
-      break;
-    case 5:
-      s = i2c5_sem;
-      break;
-    case 6:
-      s = i2c6_sem;
-      break;
-    default:
-      s = 0;
-      break;
-  }
-  return s;
-}
-#define MAX_TRIES 10
-static int acquireI2CSemaphore(SemaphoreHandle_t s)
-{
-  int retval = pdTRUE;
-  if (s == NULL) {
-    return pdFAIL;
-  }
-  int tries = 0;
-  while (xSemaphoreTake(s, (TickType_t)10) == pdFALSE) {
-    ++tries;
-    if (tries > MAX_TRIES) {
-      retval = pdFAIL;
-      break;
-    }
-  }
-  return retval;
-}
-
 static bool isValidDevice(int device)
 {
 #ifdef REV1

projects/cm_mcu/commands/SensorControl.c

@@ -1197,8 +1197,10 @@ BaseType_t psmon_reg(int argc, char **argv, char *m)
                      page, pm_addrs_dcdc[which].name, regAddress);
 
   // acquire the semaphore
-  while (xSemaphoreTake(dcdc_args.xSem, (TickType_t)10) == pdFALSE)
-    ;
+  if (acquireI2CSemaphore(dcdc_args.xSem) == pdFAIL) {
+    snprintf(m, SCRATCH_SIZE, "%s: could not get semaphore in time\r\n", argv[0]);
+    return pdFALSE;
+  }
   uint8_t ui8page = page;
   // page register
   int r = apollo_pmbus_rw(&g_sMaster1, &eStatus1, false, &pm_addrs_dcdc[which], &extra_cmds[0], &ui8page);
@@ -1217,6 +1219,8 @@ BaseType_t psmon_reg(int argc, char **argv, char *m)
                      argv[0], vv);
 
   // release the semaphore
-  xSemaphoreGive(dcdc_args.xSem);
+  if (xSemaphoreGetMutexHolder(dcdc_args.xSem) == xTaskGetCurrentTaskHandle()) {
+    xSemaphoreGive(dcdc_args.xSem);
+  }
   return pdFALSE;
 }

projects/cm_mcu/commands/SoftwareCommands.c

@@ -403,7 +403,7 @@ BaseType_t sem_ctl(int argc, char **argv, char *m)
     }
     else if (strncmp(argv[2], "take", 4) == 0) {
       // try to acquire the semaphore. Wait a finite amount of time.
-      if (xSemaphoreTake(s, pdMS_TO_TICKS(500)) == pdTRUE) {
+      if (xSemaphoreTake(s, pdMS_TO_TICKS(5000)) == pdTRUE) {
         snprintf(m, SCRATCH_SIZE, "%s: taking semaphore %d\r\n", argv[0], number);
         sem_status |= 0x1U << number;
       }