Rewrite all units and other logic to better use return values and added TRY() helper

units/digital_out/unit_dout.c

@@ -48,7 +48,7 @@ static void DO_writeBinary(Unit *unit, PayloadBuilder *pb)
 // ------------------------------------------------------------------------
 
 /** Parse a key-value pair from the INI file */
-static bool DO_loadIni(Unit *unit, const char *key, const char *value)
+static error_t DO_loadIni(Unit *unit, const char *key, const char *value)
 {
     bool suc = true;
     struct priv *priv = unit->data;
@@ -66,10 +66,11 @@ static bool DO_loadIni(Unit *unit, const char *key, const char *value)
         priv->open_drain = parse_pinmask(value, &suc);
     }
     else {
-        return false;
+        return E_BAD_KEY;
     }
 
-    return suc;
+    if (!suc) return E_BAD_VALUE;
+    return E_SUCCESS;
 }
 
 /** Generate INI file section for the unit */
@@ -93,11 +94,11 @@ static void DO_writeIni(Unit *unit, IniWriter *iw)
 // ------------------------------------------------------------------------
 
 /** Allocate data structure and set defaults */
-static bool DO_preInit(Unit *unit)
+static error_t DO_preInit(Unit *unit)
 {
     bool suc = true;
     struct priv *priv = unit->data = calloc_ck(1, sizeof(struct priv), &suc);
-    CHECK_SUC();
+    if (!suc) return E_OUT_OF_MEM;
 
     // some defaults
     priv->port_name = 'A';
@@ -105,11 +106,11 @@ static bool DO_preInit(Unit *unit)
     priv->open_drain = 0x0000;
     priv->initial = 0x0000;
 
-    return true;
+    return E_SUCCESS;
 }
 
 /** Finalize unit set-up */
-static bool DO_init(Unit *unit)
+static error_t DO_init(Unit *unit)
 {
     bool suc = true;
     struct priv *priv = unit->data;
@@ -119,14 +120,10 @@ static bool DO_init(Unit *unit)
 
     // --- Parse config ---
     priv->port = port2periph(priv->port_name, &suc);
-    if (!suc) {
-        unit->status = E_BAD_CONFIG;
-        return false;
-    }
+    if (!suc) return E_BAD_CONFIG;
 
     // Claim all needed pins
-    suc = rsc_claim_gpios(unit, priv->port_name, priv->pins);
-    CHECK_SUC();
+    TRY(rsc_claim_gpios(unit, priv->port_name, priv->pins));
 
     uint16_t mask = 1;
     for (int i = 0; i < 16; i++, mask <<= 1) {
@@ -148,7 +145,7 @@ static bool DO_init(Unit *unit)
     priv->port->ODR &= ~priv->pins;
     priv->port->ODR |= priv->initial;
 
-    return true;
+    return E_SUCCESS;
 }
 
 /** Tear down the unit */
@@ -190,10 +187,8 @@ enum PinCmd_ {
 };
 
 /** Handle a request message */
-static bool DO_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, PayloadParser *pp)
+static error_t DO_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, PayloadParser *pp)
 {
-    (void)pp;
-
     struct priv *priv = unit->data;
 
     uint16_t packed = pp_u16(pp);
@@ -208,29 +203,26 @@ static bool DO_handleRequest(Unit *unit, TF_ID frame_id, uint8_t command, Payloa
             set = spread;
             reset = (~spread) & mask;
             priv->port->BSRR = set | (reset<<16);
-            break;
+            return E_SUCCESS;
 
         case CMD_SET:
             priv->port->BSRR = spread;
-            break;
+            return E_SUCCESS;
 
         case CMD_CLEAR:
             priv->port->BSRR = (spread<<16);
-            break;
+            return E_SUCCESS;
 
         case CMD_TOGGLE:;
             spread = (uint16_t) (~priv->port->ODR) & mask;
             set = spread;
             reset = (~spread) & mask;
             priv->port->BSRR = set | (reset<<16);
-            break;
+            return E_SUCCESS;
 
         default:
-            com_respond_bad_cmd(frame_id);
-            return false;
+            return E_UNKNOWN_COMMAND;
     }
-
-    return true;
 }
 
 // ------------------------------------------------------------------------