fix types for sdm_send() invocations

Author: realchonk

lib/libsdm/sdm.c

@@ -166,7 +166,7 @@ int sdm_send(sdm_session_t *ss, int cmd_code, ...)
     va_list ap;
     int n;
     char *data;
-    int data_len = 0;
+    uint32_t data_len = 0;
     char *cmd_raw;
     sdm_pkt_t *cmd;
 
@@ -178,19 +178,18 @@ int sdm_send(sdm_session_t *ss, int cmd_code, ...)
     cmd->magic = SDM_PKG_MAGIC;
     cmd->cmd = cmd_code;
 
+    va_start (ap, cmd_code);
     switch (cmd_code) {
         case SDM_CMD_STOP:
         case SDM_CMD_SYSTIME:
             break;
         case SDM_CMD_CONFIG: {
             uint16_t preamp_gain;
 
-            va_start(ap, cmd_code);
-            cmd->threshold        = va_arg(ap, int);
-            cmd->gain_and_srclvl  = va_arg(ap, int) << 7;
-            cmd->gain_and_srclvl |= va_arg(ap, int);
-            preamp_gain = (va_arg(ap, int) & 0xf) << 12;
-            va_end(ap);
+            cmd->threshold        = va_arg(ap, unsigned);
+            cmd->gain_and_srclvl  = va_arg(ap, unsigned) << 7;
+            cmd->gain_and_srclvl |= va_arg(ap, unsigned);
+            preamp_gain = (va_arg(ap, unsigned) & 0xf) << 12;
             data_len = cmd->data_len = 1;
             cmd_raw = realloc(cmd_raw, SDM_PKT_T_SIZE + cmd->data_len * 2);
             memcpy(&cmd_raw[SDM_PKT_T_OFFSET_DATA], &preamp_gain, 2);
@@ -201,12 +200,10 @@ int sdm_send(sdm_session_t *ss, int cmd_code, ...)
             uint32_t delay, samples;
             uint32_t gain, sample_rate;
 
-            va_start(ap, cmd_code);
-            delay = va_arg(ap, int);
-            samples = va_arg(ap, int);
-            gain = va_arg(ap, int);
-            sample_rate = va_arg(ap, int);
-            va_end(ap);
+            delay = va_arg(ap, unsigned);
+            samples = va_arg(ap, unsigned);
+            gain = va_arg(ap, unsigned);
+            sample_rate = va_arg(ap, unsigned);
 
             cmd->rx_len = (gain << 4) + (sample_rate << 1);
 
@@ -218,64 +215,50 @@ int sdm_send(sdm_session_t *ss, int cmd_code, ...)
             break;
         }
         case SDM_CMD_TX_CONTINUE:
-            va_start(ap, cmd_code);
             va_arg(ap, unsigned);
             data = va_arg(ap, char *);
             data_len = va_arg(ap, int);
-            va_end(ap);
             break;
         case SDM_CMD_TX:
         {
             char *d;
 
-            va_start(ap, cmd_code);
-
             cmd->data_len = va_arg(ap, unsigned);
             d             = va_arg(ap, char *);
-            data_len      = va_arg(ap, int);
+            data_len      = va_arg(ap, unsigned);
 
             /* FIXME: quick fix. Padding up to 1024 samples here */
             cmd->data_len = ((cmd->data_len + 1023) / 1024) * 1024;
             cmd_raw = realloc(cmd_raw, SDM_PKT_T_SIZE + data_len * 2);
             memcpy(&cmd_raw[SDM_PKT_T_OFFSET_DATA], d, data_len * 2);
-
-            va_end(ap);
             break;
         }
         case SDM_CMD_REF:
         {
             char *d;
 
-            va_start(ap, cmd_code);
-
             d             = va_arg(ap, char *);
-            data_len      = va_arg(ap, int);
+            data_len      = va_arg(ap, unsigned);
             cmd->data_len = data_len;
 
             cmd_raw = realloc(cmd_raw, SDM_PKT_T_SIZE + data_len * 2);
             memset(&cmd_raw[SDM_PKT_T_OFFSET_DATA], 0, data_len * 2);
             memcpy(&cmd_raw[SDM_PKT_T_OFFSET_DATA], d, data_len * 2);
-
-            va_end(ap);
             break;
         }
         case SDM_CMD_RX:
         case SDM_CMD_RX_JANUS:
         {
-            va_start(ap, cmd_code);
-            cmd->rx_len = va_arg(ap, int) & 0xffffff;
-            va_end(ap);
+            cmd->rx_len = va_arg(ap, unsigned long) & 0xffffff;
             break;
         }
         case SDM_CMD_USBL_RX:
         {
             uint8_t channel;
             uint16_t samples;
 
-            va_start(ap, cmd_code);
-            channel = va_arg(ap, int);
-            samples = va_arg(ap, int);
-            va_end(ap);
+            channel = va_arg(ap, unsigned);
+            samples = va_arg(ap, unsigned);
 
             cmd->rx_len = samples + (channel << 21);
             break;
@@ -286,6 +269,8 @@ int sdm_send(sdm_session_t *ss, int cmd_code, ...)
             return -1;
     }
 
+    va_end (ap);
+
     if (cmd_code == SDM_CMD_TX_CONTINUE) {
         if (data_len) {
             logger(TRACE_LOG, "tx cmd continue: %d samples              \n", data_len);

sdmsh_commands.c

@@ -82,7 +82,7 @@ int sdmsh_cmd_config(struct shell_config *sc, char *argv[], int argc)
     if (argc == 5) {
         SDM_CHECK_STR_ARG_LONG("config: preamp gain", argv[4], preamp_gain, arg >= 0 && arg <= 13);
     }
-    sdm_send(ss, SDM_CMD_CONFIG, threshold, gain, srclvl, preamp_gain);
+    sdm_send(ss, SDM_CMD_CONFIG, (unsigned)threshold, (unsigned)gain, (unsigned)srclvl, (unsigned)preamp_gain);
     sdm_set_idle_state(ss);
 
     return 0;
@@ -100,7 +100,7 @@ int sdmsh_cmd_usbl_config(struct shell_config *sc, char *argv[], int argc)
     SDM_CHECK_STR_ARG_LONG("usbl_config: gain", argv[3], gain, arg >= 0 && arg <= 13);
     SDM_CHECK_STR_ARG_LONG("usbl_config: sample_rate", argv[4], sample_rate, arg >= 0 && arg <= 6);
 
-    sdm_send(ss, SDM_CMD_USBL_CONFIG, delay, samples, gain, sample_rate);
+    sdm_send(ss, SDM_CMD_USBL_CONFIG, (unsigned)delay, (unsigned)samples, (unsigned)gain, (unsigned)sample_rate);
     sdm_set_idle_state(ss);
 
     return 0;
@@ -162,7 +162,7 @@ int sdmsh_cmd_ref(struct shell_config *sc, char *argv[], int argc)
         }
 
         /* DUMP2LOG(ERR_LOG, (char *)data, len*2); */
-        rc = sdm_send(ss, SDM_CMD_REF, data, len);
+        rc = sdm_send(ss, SDM_CMD_REF, data, (unsigned)len);
     }
 
     stream_close(stream);
@@ -235,11 +235,11 @@ int sdmsh_cmd_tx(struct shell_config *sc, char *argv[], int argc)
         logger(DATA_LOG, "tx data %d / %d / %d samples  \r", nsamples, len, passed);
 
         if (cnt == len && nsamples >= 1024) {
-            rc = sdm_send(ss, cmd, nsamples, data, len);
+            rc = sdm_send(ss, cmd, (unsigned)nsamples, data, (unsigned)len);
             passed += len;
         } else if (cnt > 0) {
             memset(&data[cnt], 0, (len - cnt) * 2);
-            rc = sdm_send(ss, cmd, nsamples, data, 1024 * ((cnt + 1023) / 1024));
+            rc = sdm_send(ss, cmd, (unsigned)nsamples, data, (unsigned)(1024 * ((cnt + 1023) / 1024)));
             passed += 1024 * ((cnt + 1023) / 1024);
         } else {
             rc = -1;
@@ -301,7 +301,7 @@ int sdmsh_cmd_rx_helper(struct shell_config *sc, char *argv[], int argc, int cod
         return -1;
     }
 
-    sdm_send(ss, code, nsamples);
+    sdm_send(ss, code, (unsigned long)nsamples);
     /* rl_message("Waiting for receiving %ld samples to file %s\n", nsamples, ss->filename); */
 
     return 0;
@@ -340,7 +340,7 @@ int sdmsh_cmd_usbl_rx(struct shell_config *sc, char *argv[], int argc)
             logger(ERR_LOG, "usbl_rx: error %s\n", stream_strerror(stream));
         return -1;
     }
-    sdm_send(ss, SDM_CMD_USBL_RX, channel, samples);
+    sdm_send(ss, SDM_CMD_USBL_RX, (unsigned)channel, (unsigned)samples);
 
     return 0;
 }