Draft: meson: increase compiler checks

meson.build

@@ -3,7 +3,8 @@
 project('bmr', 'c',
   version: '0.1.0',
   default_options: [
-    'warning_level=3',
+    'warning_level=everything',
+#   'werror=true',
     'c_std=c2x'
   ]
 )

src/capability_cmd.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 #include "pmbus_io.h"
+#include "capability_cmd.h"
 #include "util_json.h"
 
 #include <jansson.h>

src/fault_cmd.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "fault_cmd.h"
 #include "util_json.h"
 
 #include <jansson.h>
@@ -49,6 +50,8 @@ resp_mode_name(uint8_t b) {
       return "disable-and-retry";
     case MODE_DISABLE_UNTIL_CLEAR:
       return "disable-until-clear";
+    default:
+      return "invalid resp mode";
     }
 
   return "unknown";

src/freq_cmd.c

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 #include "pmbus_io.h"
+#include "freq_cmd.h"
 #include "util_json.h"
+
 #include <jansson.h>
 #include <string.h>
 #include <stdio.h>

src/interleave_cmd.c

@@ -1,5 +1,7 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
+
 #include "pmbus_io.h"
+#include "interleave_cmd.h"
 #include "util_json.h"
 
 #include <jansson.h>

src/main.c

@@ -37,7 +37,7 @@
 #include <getopt.h>
 
 static const char *opt_bus = "/dev/i2c-1";
-static int opt_addr = 0x40;
+static uint8_t opt_addr = 0x40;
 static int opt_pretty = 1;
 
 static void
@@ -121,7 +121,7 @@ main(int argc, char *const *argv) {
         opt_bus = optarg;
         break;
       case 'a':
-        opt_addr = (int)strtol(optarg, NULL, 0);
+        opt_addr = (uint8_t)strtol(optarg, NULL, 0);
         break;
       case 'P':
         opt_pretty = 0;

src/mfr_addr_offset.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 #include "pmbus_io.h"
+#include "mfr_addr_offset.h"
 #include "util_json.h"
 
 #include <jansson.h>

src/mfr_fwdata.c

@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "mfr_fwdata.h"
 #include "util_json.h"
+
 #include <jansson.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,8 +24,8 @@ cmd_fwdata(int fd, int pretty) {
 
   /* Extract printable runs >= 3 */
   json_t *runs = json_array();
-  int run = 0, start = 0;
-  for (int i = 0; i < n; i++) {
+  size_t run = 0, start = 0;
+  for (size_t i = 0; i < (size_t)n; i++) {
     if (b[i] >= 32 && b[i] <= 126) {
       if (run == 0)
         start = i;

src/mfr_hrr.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 #include "pmbus_io.h"
+#include "mfr_hrr.h"
 #include "util_json.h"
 
 #include <jansson.h>
@@ -15,6 +16,10 @@
 #define BIT_ARTDLC  (1u<<3)     /* Adaptive Ramp-up Time / Dynamic Loop Compensation enable */
 #define BIT_DBV     (1u<<2)     /* Dynamic Bus Voltage enable */
 
+#define FLAG_SET8(v, flag)  ((v) |= (uint8_t)(flag))
+#define FLAG_CLEAR8(v, flag) ((v) &= (uint8_t)~(uint8_t)(flag))
+#define FLAG_ISSET8(val, flag) (!!(((uint8_t)(val)) & (uint8_t)(flag)))
+
 static void
 usage_hrr_short(void) {
   fprintf(stderr,
@@ -110,11 +115,11 @@ cmd_hrr(int fd, int argc, char *const *argv, int pretty) {
 
     json_t *o = json_object();
     json_object_set_new(o, "MFR_SPECIAL_OPTIONS_raw", json_integer((unsigned) (uint8_t) v));
-    json_object_set_new(o, "require_pec", json_boolean(!!((uint8_t) v & BIT_PEC)));
-    json_object_set_new(o, "hrr_enabled", json_boolean(!!((uint8_t) v & BIT_HRR)));
-    json_object_set_new(o, "dls_mode", json_string(((uint8_t) v & BIT_DLS) ? "nonlinear" : "linear"));
-    json_object_set_new(o, "artdlc_enabled", json_boolean(!!((uint8_t) v & BIT_ARTDLC)));
-    json_object_set_new(o, "dbv_enabled", json_boolean(!!((uint8_t) v & BIT_DBV)));
+    json_object_set_new(o, "require_pec", json_boolean(FLAG_ISSET8(v, BIT_PEC)));
+    json_object_set_new(o, "hrr_enabled", json_boolean(FLAG_ISSET8(v, BIT_HRR)));
+    json_object_set_new(o, "dls_mode", json_string(FLAG_ISSET8(v, BIT_DLS) ? "nonlinear" : "linear"));
+    json_object_set_new(o, "artdlc_enabled", json_boolean(FLAG_ISSET8(v, BIT_ARTDLC)));
+    json_object_set_new(o, "dbv_enabled", json_boolean(FLAG_ISSET8(v, BIT_DBV)));
 
     json_print_or_pretty(o, pretty);
 
@@ -164,22 +169,22 @@ cmd_hrr(int fd, int argc, char *const *argv, int pretty) {
       int v;
       if ((v = parse_onoff(pec_s)) >= 0) {
         if (v)
-          nv |= BIT_PEC;
+          FLAG_SET8(nv, BIT_PEC);
         else
-          nv &= ~BIT_PEC;
+          FLAG_CLEAR8(nv, BIT_PEC);
       }
       if ((v = parse_onoff(hrr_s)) >= 0) {
         if (v)
-          nv |= BIT_HRR;
+          FLAG_SET8(nv, BIT_HRR);
         else
-          nv &= ~BIT_HRR;
+          FLAG_CLEAR8(nv, BIT_HRR);
       }
 
       if (dls_s) {
         if (!strcmp(dls_s, "linear"))
-          nv &= ~BIT_DLS;
+          FLAG_CLEAR8(nv, BIT_DLS);
         else if (!strcmp(dls_s, "nonlinear"))
-          nv |= BIT_DLS;
+          FLAG_SET8(nv, BIT_DLS);
         else {
           fprintf(stderr, "--dls linear|nonlinear\n");
           return 2;
@@ -188,15 +193,15 @@ cmd_hrr(int fd, int argc, char *const *argv, int pretty) {
 
       if ((v = parse_onoff(art_s)) >= 0) {
         if (v)
-          nv |= BIT_ARTDLC;
+          FLAG_SET8(nv, BIT_ARTDLC);
         else
-          nv &= ~BIT_ARTDLC;
+          FLAG_CLEAR8(nv, BIT_ARTDLC);
       }
       if ((v = parse_onoff(dbv_s)) >= 0) {
         if (v)
-          nv |= BIT_DBV;
+          FLAG_SET8(nv, BIT_DBV);
         else
-          nv &= ~BIT_DBV;
+          FLAG_CLEAR8(nv, BIT_DBV);
       }
     }
 
@@ -216,11 +221,11 @@ cmd_hrr(int fd, int argc, char *const *argv, int pretty) {
     json_t *o = json_object();
     json_object_set_new(o, "changed", json_boolean(nv != (uint8_t) cur));
     json_object_set_new(o, "MFR_SPECIAL_OPTIONS_raw", json_integer((unsigned) (uint8_t) rb));
-    json_object_set_new(o, "require_pec", json_boolean(!!((uint8_t) rb & BIT_PEC)));
-    json_object_set_new(o, "hrr_enabled", json_boolean(!!((uint8_t) rb & BIT_HRR)));
-    json_object_set_new(o, "dls_mode", json_string(((uint8_t) rb & BIT_DLS) ? "nonlinear" : "linear"));
-    json_object_set_new(o, "artdlc_enabled", json_boolean(!!((uint8_t) rb & BIT_ARTDLC)));
-    json_object_set_new(o, "dbv_enabled", json_boolean(!!((uint8_t) rb & BIT_DBV)));
+    json_object_set_new(o, "require_pec", json_boolean(FLAG_ISSET8(rb,BIT_PEC)));
+    json_object_set_new(o, "hrr_enabled", json_boolean(FLAG_ISSET8(rb, BIT_HRR)));
+    json_object_set_new(o, "dls_mode", json_string(FLAG_ISSET8(rb, BIT_DLS) ? "nonlinear" : "linear"));
+    json_object_set_new(o, "artdlc_enabled", json_boolean(FLAG_ISSET8(rb, BIT_ARTDLC)));
+    json_object_set_new(o, "dbv_enabled", json_boolean(FLAG_ISSET8(rb, BIT_DBV)));
 
     json_print_or_pretty(o, pretty);
 

src/mfr_id.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "mfr_id.h"
 #include "util_json.h"
 #include <jansson.h>
 #include <stdint.h>

src/mfr_multipin.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "mfr_multipin.h"
 #include "util_json.h"
 
 #include <jansson.h>

src/mfr_ramp_data.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 #include "pmbus_io.h"
+#include "mfr_ramp_data.h"
 #include "util_json.h"
 
 #include <jansson.h>

src/mfr_restart.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "mfr_restart.h"
 #include <stdio.h>
 
 int

src/mfr_save_restore.c

@@ -1,6 +1,8 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "mfr_save_restore.h"
+
 #include <stdio.h>
 #include <string.h>
 

src/mfr_snapshot.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "mfr_snapshot.h"
 #include "decoders.h"
 #include "util_json.h"
 

src/mfr_status_data.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 #include "pmbus_io.h"
+#include "mfr_status_data.h"
 #include "util_json.h"
 
 #include <jansson.h>

src/mfr_user_data.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "mfr_user_data.h"
 #include "util_json.h"
 
 #include <jansson.h>
@@ -27,7 +28,7 @@ cmd_user_data(int fd, int argc, char *const *argv, int pretty) {
 
     json_t *o = json_object();
     json_object_set_new(o, "len", json_integer(n));
-    json_object_set_new(o, "ascii", json_stringn((char *) b, n));
+    json_object_set_new(o, "ascii", json_stringn((char *) b, (size_t)n));
     json_add_hex_ascii(o, "hex", b, (size_t)n);
 
     json_print_or_pretty(o, pretty);
@@ -45,7 +46,7 @@ cmd_user_data(int fd, int argc, char *const *argv, int pretty) {
         ascii = argv[++i];
     }
 
-    int n = 0;
+    size_t n = 0;
 
     if (hex) {
       size_t L = strlen(hex);
@@ -62,9 +63,9 @@ cmd_user_data(int fd, int argc, char *const *argv, int pretty) {
         sscanf(hex + 2 * i, "%2x", &v);
         b[i] = (uint8_t) v;
       }
-      n = (int) (L / 2);
+      n = L / 2;
     } else if (ascii) {
-      n = (int) strlen(ascii);
+      n = strlen(ascii);
       if (n > 32)
         n = 32;
       memcpy(b, ascii, n);
@@ -74,7 +75,11 @@ cmd_user_data(int fd, int argc, char *const *argv, int pretty) {
       return 2;
     }
 
-    if (pmbus_wr_block(fd, MFR_USER_DATA_00, b, n) < 0) {
+    if (n > 255) {
+      fprintf(stderr, "USER_DATA_00 write: len %zu > 255", n);
+      return 1;
+    }
+    if (pmbus_wr_block(fd, MFR_USER_DATA_00, b, (uint8_t)n) < 0) {
       perror("USER_DATA_00 write");
 
       return 1;

src/onoff_cmd.c

@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "onoff_cmd.h"
 #include "util_json.h"
 
 #include <jansson.h>

src/operation_cmd.c

@@ -1,7 +1,9 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 
 #include "pmbus_io.h"
+#include "operation_cmd.h"
 #include "util_json.h"
+
 #include <jansson.h>
 #include <string.h>
 #include <stdio.h>
@@ -162,6 +164,9 @@ cmd_operation(int fd, int argc, char *const *argv, int pretty) {
       case 3:
         m = "reserved";
         break;
+      default:
+        fprintf(stderr, "invalid pmbus operation\n");
+	return 2;
       }
 
       json_object_set_new(delta, "margin", json_string(m));

src/pgood_cmd.c

@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: AGPL-3.0-or-later */
 #include "pmbus_io.h"
+#include "pgood_cmd.h"
 #include "util_json.h"
 #include "util_lin.h"
 

src/pmbus_io.c

@@ -63,7 +63,7 @@ pmbus_wr_word(int fd, uint8_t cmd, uint16_t val) {
 }
 
 int
-pmbus_wr_block(int fd, uint8_t cmd, const uint8_t *buf, int len) {
+pmbus_wr_block(int fd, uint8_t cmd, const uint8_t *buf, uint8_t len) {
   return i2c_smbus_write_block_data(fd, cmd, len, buf);
 }
 
@@ -111,14 +111,16 @@ pmbus_lin16u_to_double(uint16_t raw, int exp5) {
 }
 
 uint16_t
-le16(const uint8_t *p) {
-  return (uint16_t) p[0]
-      | ((uint16_t) p[1] << 8)
-      ;
+BMR_PURE le16(const uint8_t *p) {
+  return (uint16_t)(
+        (uint16_t)p[0]
+      | ((uint16_t)p[1] << 8)
+      );
+
 }
 
 uint32_t
-le32(const uint8_t *p) {
+BMR_PURE le32(const uint8_t *p) {
   return (uint32_t)  p[0]
        | ((uint32_t) p[1] << 8)
        | ((uint32_t) p[2] << 16)

src/pmbus_io.h

@@ -5,6 +5,15 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#define D(xf) (double)((xf))
+
+#if defined(__GNUC__) || defined(__clang__)
+#  define BMR_PURE __attribute__((pure))
+#else
+#  define BMR_PURE
+#endif
+
+/* TODO: align with PMBus-Specification-Rev-1-3-1-Part-II-20150313.pdf */
 /*
  * PMBus standard (generic):
  *   - Control:            0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x15, 0x16, 0x19
@@ -177,7 +186,7 @@ int pmbus_rd_word(int fd, uint8_t cmd);
 int pmbus_rd_block(int fd, uint8_t cmd, uint8_t * buf, int max);
 int pmbus_wr_byte(int fd, uint8_t cmd, uint8_t val);
 int pmbus_wr_word(int fd, uint8_t cmd, uint16_t val);
-int pmbus_wr_block(int fd, uint8_t cmd, const uint8_t * buf, int len);
+int pmbus_wr_block(int fd, uint8_t cmd, const uint8_t * buf, uint8_t len);
 int pmbus_send_byte(int fd, uint8_t cmd);
 
 /* returns 0 if linear mode */