colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcdm: complete mode preference implementation

Browse Source
This commit is contained in:
Dan Williams
2010-03-20 00:09:38 -07:00
parent 26c1402aae
commit c4a1a78c43
6 changed files with 194 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
libqcdm/src/commands.c
View File

@@ -499,6 +499,108 @@ qcdm_cmd_nv_set_roam_pref_result (const char *buf, gsize len, GError **error)
/**********************************************************************/
static gboolean
mode_pref_validate (guint8 dm)
{
if ( dm == DIAG_NV_MODE_PREF_1X_ONLY
|| dm == DIAG_NV_MODE_PREF_HDR_ONLY
|| dm == DIAG_NV_MODE_PREF_AUTO)
return TRUE;
return FALSE;
}
gsize
qcdm_cmd_nv_get_mode_pref_new (char *buf, gsize len, guint8 profile, GError **error)
{
char cmdbuf[sizeof (DMCmdNVReadWrite) + 2];
DMCmdNVReadWrite *cmd = (DMCmdNVReadWrite *) &cmdbuf[0];
DMNVItemModePref *req;
g_return_val_if_fail (buf != NULL, 0);
g_return_val_if_fail (len >= sizeof (*cmd) + DIAG_TRAILER_LEN, 0);
memset (cmd, 0, sizeof (*cmd));
cmd->code = DIAG_CMD_NV_READ;
cmd->nv_item = GUINT16_TO_LE (DIAG_NV_MODE_PREF);
req = (DMNVItemModePref *) &cmd->data[0];
req->profile = profile;
return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);
}
QCDMResult *
qcdm_cmd_nv_get_mode_pref_result (const char *buf, gsize len, GError **error)
{
QCDMResult *result = NULL;
DMCmdNVReadWrite *rsp = (DMCmdNVReadWrite *) buf;
DMNVItemModePref *mode;
g_return_val_if_fail (buf != NULL, NULL);
if (!check_command (buf, len, DIAG_CMD_NV_READ, sizeof (DMCmdNVReadWrite), error))
return NULL;
mode = (DMNVItemModePref *) &rsp->data[0];
if (!mode_pref_validate (mode->mode_pref)) {
g_set_error (error, QCDM_COMMAND_ERROR, QCDM_COMMAND_BAD_PARAMETER,
"Unknown mode preference 0x%X",
mode->mode_pref);
return NULL;
}
result = qcdm_result_new ();
qcdm_result_add_uint8 (result, QCDM_CMD_NV_GET_MODE_PREF_ITEM_PROFILE, mode->profile);
qcdm_result_add_uint8 (result, QCDM_CMD_NV_GET_MODE_PREF_ITEM_MODE_PREF, mode->mode_pref);
return result;
}
gsize
qcdm_cmd_nv_set_mode_pref_new (char *buf,
gsize len,
guint8 profile,
guint8 mode_pref,
GError **error)
{
char cmdbuf[sizeof (DMCmdNVReadWrite) + 2];
DMCmdNVReadWrite *cmd = (DMCmdNVReadWrite *) &cmdbuf[0];
DMNVItemModePref *req;
g_return_val_if_fail (buf != NULL, 0);
g_return_val_if_fail (len >= sizeof (*cmd) + DIAG_TRAILER_LEN, 0);
if (!mode_pref_validate (mode_pref)) {
g_set_error (error, QCDM_COMMAND_ERROR, QCDM_COMMAND_BAD_PARAMETER,
"Invalid mode preference %d", mode_pref);
return 0;
}
memset (cmd, 0, sizeof (*cmd));
cmd->code = DIAG_CMD_NV_WRITE;
cmd->nv_item = GUINT16_TO_LE (DIAG_NV_MODE_PREF);
req = (DMNVItemModePref *) &cmd->data[0];
req->profile = profile;
req->mode_pref = mode_pref;
return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);
}
QCDMResult *
qcdm_cmd_nv_set_mode_pref_result (const char *buf, gsize len, GError **error)
{
g_return_val_if_fail (buf != NULL, NULL);
if (!check_command (buf, len, DIAG_CMD_NV_WRITE, sizeof (DMCmdNVReadWrite), error))
return NULL;
return qcdm_result_new ();
}
/**********************************************************************/
gsize
qcdm_cmd_cm_subsys_state_info_new (char *buf, gsize len, GError **error)
{

33
libqcdm/src/commands.h
View File

@@ -143,6 +143,37 @@ QCDMResult *qcdm_cmd_nv_set_roam_pref_result (const char *buf,
/**********************************************************************/
/* Values for QCDM_CMD_NV_GET_MODE_PREF_ITEM_MODE_PREF */
enum {
QCDM_CMD_NV_MODE_PREF_ITEM_MODE_PREF_AUTO = 0x04,
QCDM_CMD_NV_MODE_PREF_ITEM_MODE_PREF_1X_ONLY = 0x09,
QCDM_CMD_NV_MODE_PREF_ITEM_MODE_PREF_HDR_ONLY = 0x0A,
};
#define QCDM_CMD_NV_GET_MODE_PREF_ITEM_PROFILE "profile"
#define QCDM_CMD_NV_GET_MODE_PREF_ITEM_MODE_PREF "mode-pref"
gsize qcdm_cmd_nv_get_mode_pref_new (char *buf,
gsize len,
guint8 profile,
GError **error);
QCDMResult *qcdm_cmd_nv_get_mode_pref_result (const char *buf,
gsize len,
GError **error);
gsize qcdm_cmd_nv_set_mode_pref_new (char *buf,
gsize len,
guint8 profile,
guint8 mode_pref,
GError **error);
QCDMResult *qcdm_cmd_nv_set_mode_pref_result (const char *buf,
gsize len,
GError **error);
/**********************************************************************/
/* Values for QCDM_CMD_CM_SUBSYS_STATE_INFO_ITEM_OPERATING_MODE */
enum {
QCDM_CMD_CM_SUBSYS_STATE_INFO_OPERATING_MODE_ONLINE = 5
@@ -167,6 +198,8 @@ enum {
/* Values for QCDM_CMD_CM_SUBSYS_STATE_INFO_ITEM_MODE_PREF */
enum {
QCDM_CMD_CM_SUBSYS_STATE_INFO_MODE_PREF_AUTO = 0x02,
QCDM_CMD_CM_SUBSYS_STATE_INFO_MODE_PREF_1X_ONLY = 0x09,
QCDM_CMD_CM_SUBSYS_STATE_INFO_MODE_PREF_HDR_ONLY = 0x0A,
};
#define QCDM_CMD_CM_SUBSYS_STATE_INFO_ITEM_CALL_STATE "call-state"

1
libqcdm/src/nv-items.h
View File

@@ -35,7 +35,6 @@ enum {
/* DIAG_NV_MODE_PREF */
struct DMNVItemModePref {
guint8 profile;
guint8 _unknown1;
guint8 mode_pref;
} __attribute__ ((packed));
typedef struct DMNVItemModePref DMNVItemModePref;

56
libqcdm/tests/test-qcdm-com.c
View File

@@ -386,6 +386,56 @@ test_com_read_roam_pref (void *f, void *data)
qcdm_result_unref (result);
}
void
test_com_read_mode_pref (void *f, void *data)
{
TestComData *d = data;
gboolean success;
GError *error = NULL;
char buf[512];
guint8 pref;
const char *msg;
gint len;
QCDMResult *result;
gsize reply_len;
len = qcdm_cmd_nv_get_mode_pref_new (buf, sizeof (buf), 0, NULL);
g_assert (len > 0);
/* Send the command */
success = send_command (d, buf, len);
g_assert (success);
/* Get a response */
reply_len = wait_reply (d, buf, sizeof (buf));
/* Parse the response into a result structure */
result = qcdm_cmd_nv_get_mode_pref_result (buf, reply_len, &error);
g_assert (result);
g_print ("\n");
success = qcdm_result_get_uint8 (result, QCDM_CMD_NV_GET_MODE_PREF_ITEM_MODE_PREF, &pref);
g_assert (success);
switch (pref) {
case QCDM_CMD_NV_MODE_PREF_ITEM_MODE_PREF_1X_ONLY:
msg = "1X only";
break;
case QCDM_CMD_NV_MODE_PREF_ITEM_MODE_PREF_HDR_ONLY:
msg = "HDR only";
break;
case QCDM_CMD_NV_MODE_PREF_ITEM_MODE_PREF_AUTO:
msg = "Automatic";
break;
default:
g_assert_not_reached ();
}
g_message ("%s: Mode preference: %s", __func__, msg);
qcdm_result_unref (result);
}
void
test_com_status (void *f, void *data)
{
@@ -573,6 +623,12 @@ test_com_cm_subsys_state_info (void *f, void *data)
case QCDM_CMD_CM_SUBSYS_STATE_INFO_MODE_PREF_AUTO:
detail = "Automatic";
break;
case QCDM_CMD_CM_SUBSYS_STATE_INFO_MODE_PREF_1X_ONLY:
detail = "1X only";
break;
case QCDM_CMD_CM_SUBSYS_STATE_INFO_MODE_PREF_HDR_ONLY:
detail = "EVDO only";
break;
default:
g_assert_not_reached ();
}

2
libqcdm/tests/test-qcdm-com.h
View File

@@ -31,6 +31,8 @@ void test_com_mdn (void *f, void *data);
void test_com_read_roam_pref (void *f, void *data);
void test_com_read_mode_pref (void *f, void *data);
void test_com_status (void *f, void *data);
void test_com_sw_version (void *f, void *data);

1
libqcdm/tests/test-qcdm.c
View File

@@ -93,6 +93,7 @@ int main (int argc, char **argv)
g_test_suite_add (suite, TESTCASE (test_com_esn, data->com_data));
g_test_suite_add (suite, TESTCASE (test_com_mdn, data->com_data));
g_test_suite_add (suite, TESTCASE (test_com_read_roam_pref, data->com_data));
g_test_suite_add (suite, TESTCASE (test_com_read_mode_pref, data->com_data));
g_test_suite_add (suite, TESTCASE (test_com_status, data->com_data));
g_test_suite_add (suite, TESTCASE (test_com_sw_version, data->com_data));
g_test_suite_add (suite, TESTCASE (test_com_cm_subsys_state_info, data->com_data));