diff options
Diffstat (limited to 'libqcdm/tests')
-rw-r--r-- | libqcdm/tests/ipv6pref.c | 7 | ||||
-rw-r--r-- | libqcdm/tests/modepref.c | 21 | ||||
-rw-r--r-- | libqcdm/tests/reset.c | 4 | ||||
-rw-r--r-- | libqcdm/tests/test-qcdm-com.c | 21 | ||||
-rw-r--r-- | libqcdm/tests/test-qcdm-result.c | 5 |
5 files changed, 27 insertions, 31 deletions
diff --git a/libqcdm/tests/ipv6pref.c b/libqcdm/tests/ipv6pref.c index ba777d88..ffb7a7e9 100644 --- a/libqcdm/tests/ipv6pref.c +++ b/libqcdm/tests/ipv6pref.c @@ -39,7 +39,7 @@ print_buf (const char *detail, const char *buf, size_t len) int i = 0, z; qcdmbool newline = FALSE; char tmp[500]; - u_int32_t flen; + uint32_t flen; flen = snprintf (tmp, sizeof (tmp) - 1, "%s (%zu) ", detail, len); fprintf (stdout, "%s", tmp); @@ -173,7 +173,7 @@ qcdm_wait_reply (int fd, char *buf, size_t len) } static int -qcdm_set_ipv6_enabled (int fd, u_int8_t ipv6pref) +qcdm_set_ipv6_enabled (int fd, uint8_t ipv6pref) { int err; char buf[512]; @@ -216,7 +216,7 @@ qcdm_get_ipv6_enabled (int fd) size_t len; QcdmResult *result; size_t reply_len; - u_int8_t mode; + uint8_t mode; len = qcdm_cmd_nv_get_ipv6_enabled_new (buf, sizeof (buf)); assert (len); @@ -313,4 +313,3 @@ main (int argc, char *argv[]) return 0; } - diff --git a/libqcdm/tests/modepref.c b/libqcdm/tests/modepref.c index 43272411..cf6e73b4 100644 --- a/libqcdm/tests/modepref.c +++ b/libqcdm/tests/modepref.c @@ -39,7 +39,7 @@ print_buf (const char *detail, const char *buf, size_t len) int i = 0, z; qcdmbool newline = FALSE; char tmp[500]; - u_int32_t flen; + uint32_t flen; flen = snprintf (tmp, sizeof (tmp) - 1, "%s (%zu) ", detail, len); fprintf (stdout, "%s", tmp); @@ -173,7 +173,7 @@ qcdm_wait_reply (int fd, char *buf, size_t len) } static int -qcdm_set_mode_pref (int fd, u_int8_t modepref) +qcdm_set_mode_pref (int fd, uint8_t modepref) { int err; char buf[512]; @@ -217,7 +217,7 @@ qcdm_get_mode_pref (int fd) QcdmResult *result; size_t reply_len; const char *smode = NULL; - u_int8_t mode = 0; + uint8_t mode = 0; len = qcdm_cmd_nv_get_mode_pref_new (buf, sizeof (buf), 0); assert (len); @@ -291,7 +291,7 @@ qcdm_get_mode_pref (int fd) } static int -qcdm_set_hdr_pref (int fd, u_int8_t hdrpref) +qcdm_set_hdr_pref (int fd, uint8_t hdrpref) { int err; char buf[512]; @@ -334,7 +334,7 @@ qcdm_get_hdr_pref (int fd) size_t len; QcdmResult *result = NULL; size_t reply_len; - u_int8_t pref; + uint8_t pref; const char *spref = NULL; len = qcdm_cmd_nv_get_hdr_rev_pref_new (buf, sizeof (buf)); @@ -385,7 +385,7 @@ error: } static int -qcdm_set_mode (int fd, u_int8_t mode) +qcdm_set_mode (int fd, uint8_t mode) { int err; char buf[512]; @@ -435,8 +435,8 @@ usage (const char *prog) static qcdmbool parse_mode (const char *s, - u_int8_t *out_mode, - u_int8_t *out_hdrpref, + uint8_t *out_mode, + uint8_t *out_hdrpref, qcdmbool *out_set_evdo) { if (strcasecmp (s, "lte") == 0) { @@ -506,8 +506,8 @@ parse_mode (const char *s, int main (int argc, char *argv[]) { - u_int8_t mode = QCDM_CMD_NV_MODE_PREF_ITEM_MODE_PREF_AUTO; - u_int8_t hdrpref = QCDM_CMD_NV_HDR_REV_PREF_ITEM_REV_PREF_EHRPD; + uint8_t mode = QCDM_CMD_NV_MODE_PREF_ITEM_MODE_PREF_AUTO; + uint8_t hdrpref = QCDM_CMD_NV_HDR_REV_PREF_ITEM_REV_PREF_EHRPD; const char *dmport = argv[1]; const char *smode = argv[2]; const char *msg; @@ -570,4 +570,3 @@ main (int argc, char *argv[]) return 0; } - diff --git a/libqcdm/tests/reset.c b/libqcdm/tests/reset.c index 10fd1bc0..4a009871 100644 --- a/libqcdm/tests/reset.c +++ b/libqcdm/tests/reset.c @@ -40,7 +40,7 @@ print_buf (const char *detail, const char *buf, size_t len) int i = 0, z; qcdmbool newline = FALSE; char tmp[500]; - u_int32_t flen; + uint32_t flen; flen = snprintf (tmp, sizeof (tmp) - 1, "%s (%zu) ", detail, len); fprintf (stdout, "%s", tmp); @@ -174,7 +174,7 @@ qcdm_wait_reply (int fd, char *buf, size_t len) } static int -qcdm_set_mode (int fd, u_int8_t mode) +qcdm_set_mode (int fd, uint8_t mode) { int err; char buf[512]; diff --git a/libqcdm/tests/test-qcdm-com.c b/libqcdm/tests/test-qcdm-com.c index 86152846..81f127e6 100644 --- a/libqcdm/tests/test-qcdm-com.c +++ b/libqcdm/tests/test-qcdm-com.c @@ -156,7 +156,7 @@ status_snapshot_state_to_string (guint8 state) } static const char * -cm_call_state_to_string (u_int32_t state) +cm_call_state_to_string (uint32_t state) { switch (state) { case QCDM_CMD_CM_SUBSYS_STATE_INFO_CALL_STATE_IDLE: @@ -176,7 +176,7 @@ cm_call_state_to_string (u_int32_t state) } static const char * -cm_system_mode_to_string (u_int32_t mode) +cm_system_mode_to_string (uint32_t mode) { switch (mode) { case QCDM_CMD_CM_SUBSYS_STATE_INFO_SYSTEM_MODE_NO_SERVICE: @@ -1480,7 +1480,7 @@ test_com_ext_logmask (void *f, void *data) gint len; QcdmResult *result; gsize reply_len; - u_int32_t items[] = { 0x002C, 0x002E, 0 }; + uint32_t items[] = { 0x002C, 0x002E, 0 }; guint32 maxlog = 0; /* First get # of items the device supports */ @@ -1505,7 +1505,7 @@ test_com_ext_logmask (void *f, void *data) qcdm_result_unref (result); /* Now enable some log items */ - len = qcdm_cmd_ext_logmask_new (buf, sizeof (buf), items, (u_int16_t) maxlog); + len = qcdm_cmd_ext_logmask_new (buf, sizeof (buf), items, (uint16_t) maxlog); /* Send the command */ success = send_command (d, buf, len); @@ -1581,11 +1581,11 @@ test_com_log_config (void *f, void *data) gint len; QcdmResult *result; gsize reply_len; - u_int32_t num_items = 0; - const u_int16_t *items = NULL, *reread_items; + uint32_t num_items = 0; + const uint16_t *items = NULL, *reread_items; size_t items_len = 0, reread_len; - u_int32_t i; - u_int16_t test_items[] = { 0x1004, 0x1005, 0x1006, 0x1007, 0x1008, 0x102C, 0x102E, 0 }; + uint32_t i; + uint16_t test_items[] = { 0x1004, 0x1005, 0x1006, 0x1007, 0x1008, 0x102C, 0x102E, 0 }; /* Get existing mask for CDMA/EVDO equip ID */ len = qcdm_cmd_log_config_get_mask_new (buf, sizeof (buf), 0x01); @@ -1916,8 +1916,8 @@ test_com_gsm_subsys_state_info (void *f, void *data) QcdmResult *result; gsize reply_len; const char *str; - u_int32_t num; - u_int8_t u8; + uint32_t num; + uint8_t u8; len = qcdm_cmd_gsm_subsys_state_info_new (buf, sizeof (buf)); g_assert (len == 7); @@ -1978,4 +1978,3 @@ test_com_gsm_subsys_state_info (void *f, void *data) qcdm_result_unref (result); } - diff --git a/libqcdm/tests/test-qcdm-result.c b/libqcdm/tests/test-qcdm-result.c index 1c9c74f0..f0e097af 100644 --- a/libqcdm/tests/test-qcdm-result.c +++ b/libqcdm/tests/test-qcdm-result.c @@ -76,8 +76,8 @@ test_result_uint8 (void *f, void *data) void test_result_uint8_array (void *f, void *data) { - u_int8_t array[] = { 0, 1, 255, 32, 128, 127 }; - const u_int8_t *tmp = NULL; + uint8_t array[] = { 0, 1, 255, 32, 128, 127 }; + const uint8_t *tmp = NULL; size_t tmp_len = 0; QcdmResult *result; @@ -90,4 +90,3 @@ test_result_uint8_array (void *f, void *data) qcdm_result_unref (result); } - |