Change rmode_t to uint64_t and remove unneeded casts

Author: mdblack98

dummy/netrigctl.c

@@ -116,7 +116,7 @@ static int netrigctl_open(RIG *rig)
 	ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%"SCNXll"%d%d%x%x",
 		&rs->rx_range_list[i].start,
 		&rs->rx_range_list[i].end,
-		(uint64_t*)&rs->rx_range_list[i].modes,
+		&rs->rx_range_list[i].modes,
 		&rs->rx_range_list[i].low_power,
 		&rs->rx_range_list[i].high_power,
 		&rs->rx_range_list[i].vfo,
@@ -135,7 +135,7 @@ static int netrigctl_open(RIG *rig)
 	ret = num_sscanf(buf, "%"SCNfreq"%"SCNfreq"%"SCNXll"%d%d%x%x",
 		&rs->tx_range_list[i].start,
 		&rs->tx_range_list[i].end,
-		(uint64_t*)&rs->tx_range_list[i].modes,
+		&rs->tx_range_list[i].modes,
 		&rs->tx_range_list[i].low_power,
 		&rs->tx_range_list[i].high_power,
 		&rs->tx_range_list[i].vfo,
@@ -152,7 +152,7 @@ static int netrigctl_open(RIG *rig)
 		return (ret < 0) ? ret : -RIG_EPROTO;
 
 	ret = sscanf(buf, "%"SCNXll"%ld",
-                                (uint64_t*)&rs->tuning_steps[i].modes,
+                                &rs->tuning_steps[i].modes,
                                 &rs->tuning_steps[i].ts);
 	if (ret != 2)
 		return -RIG_EPROTO;
@@ -166,7 +166,7 @@ static int netrigctl_open(RIG *rig)
 		return (ret < 0) ? ret : -RIG_EPROTO;
 
 	ret = sscanf(buf, "%"SCNXll"%ld",
-                                (uint64_t*)&rs->filters[i].modes,
+                                &rs->filters[i].modes,
                                 &rs->filters[i].width);
 	if (ret != 2)
 		return -RIG_EPROTO;

include/hamlib/rig.h

@@ -26,6 +26,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <inttypes.h>
 
 /* Rig list is in a separate file so as not to mess up w/ this one */
 #include <hamlib/riglist.h>
@@ -760,7 +761,7 @@ enum rig_parm_e {
  * This can be a func, a level or a parm.
  * Each bit designates one of them.
  */
-typedef unsigned long long setting_t;
+typedef uint64_t setting_t;
 
 /**
  * \brief Tranceive mode
@@ -877,8 +878,9 @@ typedef unsigned long long setting_t;
  * \sa rig_parse_mode(), rig_strrmode()
  * TODO: Add new 8600 modes to rig2icom_mode() and icom2rig_mode() in frame.c
  */
-#define ULL (unsigned long long)
-typedef unsigned long long rmode_t;
+#define ULL (uint64_t)
+typedef uint64_t rmode_t;
+
 #define    RIG_MODE_NONE      0             /*!< '' -- None */
 #define    RIG_MODE_AM        (1ULL << 0)   /*!< \c AM -- Amplitude Modulation */
 #define    RIG_MODE_CW        (1ULL << 1)   /*!< \c CW -- CW "normal" sideband */

tests/memcsv.c

@@ -669,7 +669,7 @@ int dump_csv_chan(RIG *rig,
 
     if (mem_caps->funcs)
     {
-        fprintf(f, "%"PRXll"%c", (uint64_t)chan.funcs, csv_sep);
+        fprintf(f, "%"PRXll"%c", chan.funcs, csv_sep);
     }
 
     if (mem_caps->ctcss_tone)
@@ -940,7 +940,7 @@ int set_channel_data(RIG *rig,
 
         if (i >= 0)
         {
-            sscanf(line_data_list[i], "%"SCNXll, (uint64_t*)&chan->funcs);
+            sscanf(line_data_list[i], "%"SCNXll, &chan->funcs);
         }
     }
 

tests/rigctl_parse.c

@@ -3791,7 +3791,7 @@ declare_proto_rig(dump_state)
                 "%"FREQFMT" %"FREQFMT" 0x%"PRXll" %d %d 0x%x 0x%x\n",
                 rs->rx_range_list[i].start,
                 rs->rx_range_list[i].end,
-                (uint64_t)rs->rx_range_list[i].modes,
+                rs->rx_range_list[i].modes,
                 rs->rx_range_list[i].low_power,
                 rs->rx_range_list[i].high_power,
                 rs->rx_range_list[i].vfo,
@@ -3806,7 +3806,7 @@ declare_proto_rig(dump_state)
                 "%"FREQFMT" %"FREQFMT" 0x%"PRXll" %d %d 0x%x 0x%x\n",
                 rs->tx_range_list[i].start,
                 rs->tx_range_list[i].end,
-                (uint64_t)rs->tx_range_list[i].modes,
+                rs->tx_range_list[i].modes,
                 rs->tx_range_list[i].low_power,
                 rs->tx_range_list[i].high_power,
                 rs->tx_range_list[i].vfo,
@@ -3819,7 +3819,7 @@ declare_proto_rig(dump_state)
     {
         fprintf(fout,
                 "0x%"PRXll" %ld\n",
-                (uint64_t)rs->tuning_steps[i].modes,
+                rs->tuning_steps[i].modes,
                 rs->tuning_steps[i].ts);
     }
 
@@ -3829,7 +3829,7 @@ declare_proto_rig(dump_state)
     {
         fprintf(fout,
                 "0x%"PRXll" %ld\n",
-                (uint64_t)rs->filters[i].modes,
+                rs->filters[i].modes,
                 rs->filters[i].width);
     }
 
@@ -3858,12 +3858,12 @@ declare_proto_rig(dump_state)
 
     fprintf(fout, "\n");
 
-    fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_get_func);
-    fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_set_func);
-    fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_get_level);
-    fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_set_level);
-    fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_get_parm);
-    fprintf(fout, "0x%"PRXll"\n", (uint64_t)rs->has_set_parm);
+    fprintf(fout, "0x%"PRXll"\n", rs->has_get_func);
+    fprintf(fout, "0x%"PRXll"\n", rs->has_set_func);
+    fprintf(fout, "0x%"PRXll"\n", rs->has_get_level);
+    fprintf(fout, "0x%"PRXll"\n", rs->has_set_level);
+    fprintf(fout, "0x%"PRXll"\n", rs->has_get_parm);
+    fprintf(fout, "0x%"PRXll"\n", rs->has_set_parm);
 
 #if 0
     gran_t level_gran[RIG_SETTING_MAX];   /*!< level granularity */