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

qcdm: add HDR revision preference

Browse Source 
Not sure if that's exactly what the NV item is, but the UML290 uses
it for Rev0, RevA, and eHRPD preference.
This commit is contained in:
Dan Williams
2011-01-06 22:01:45 -06:00
parent d19e55bb8f
commit 7a2031613a
6 changed files with 205 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libqcdm/src/commands.c
+101
View File
@@ -873,6 +873,107 @@ qcdm_cmd_nv_set_mode_pref_result (const char *buf, gsize len, GError **error)
/**********************************************************************/
static gboolean
hdr_rev_pref_validate (guint8 dm)
{
if ( dm == DIAG_NV_HDR_REV_PREF_0
|| dm == DIAG_NV_HDR_REV_PREF_A
|| dm == DIAG_NV_HDR_REV_PREF_EHRPD)
return TRUE;
return FALSE;
}
gsize
qcdm_cmd_nv_get_hdr_rev_pref_new (char *buf, gsize len, GError **error)
{
char cmdbuf[sizeof (DMCmdNVReadWrite) + 2];
DMCmdNVReadWrite *cmd = (DMCmdNVReadWrite *) &cmdbuf[0];
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_HDR_REV_PREF);
return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);
}
QCDMResult *
qcdm_cmd_nv_get_hdr_rev_pref_result (const char *buf, gsize len, GError **error)
{
QCDMResult *result = NULL;
DMCmdNVReadWrite *rsp = (DMCmdNVReadWrite *) buf;
DMNVItemHdrRevPref *rev;
g_return_val_if_fail (buf != NULL, NULL);
if (!check_command (buf, len, DIAG_CMD_NV_READ, sizeof (DMCmdNVReadWrite), error))
return NULL;
if (!check_nv_cmd (rsp, DIAG_NV_HDR_REV_PREF, error))
return NULL;
rev = (DMNVItemHdrRevPref *) &rsp->data[0];
if (!hdr_rev_pref_validate (rev->rev_pref)) {
g_set_error (error, QCDM_COMMAND_ERROR, QCDM_COMMAND_BAD_PARAMETER,
"Unknown HDR revision preference 0x%X",
rev->rev_pref);
return NULL;
}
result = qcdm_result_new ();
qcdm_result_add_uint8 (result, QCDM_CMD_NV_GET_HDR_REV_PREF_ITEM_REV_PREF, rev->rev_pref);
return result;
}
gsize
qcdm_cmd_nv_set_hdr_rev_pref_new (char *buf,
gsize len,
guint8 rev_pref,
GError **error)
{
char cmdbuf[sizeof (DMCmdNVReadWrite) + 2];
DMCmdNVReadWrite *cmd = (DMCmdNVReadWrite *) &cmdbuf[0];
DMNVItemHdrRevPref *req;
g_return_val_if_fail (buf != NULL, 0);
g_return_val_if_fail (len >= sizeof (*cmd) + DIAG_TRAILER_LEN, 0);
if (!hdr_rev_pref_validate (rev_pref)) {
g_set_error (error, QCDM_COMMAND_ERROR, QCDM_COMMAND_BAD_PARAMETER,
"Invalid HDR revision preference %d", rev_pref);
return 0;
}
memset (cmd, 0, sizeof (*cmd));
cmd->code = DIAG_CMD_NV_WRITE;
cmd->nv_item = GUINT16_TO_LE (DIAG_NV_HDR_REV_PREF);
req = (DMNVItemHdrRevPref *) &cmd->data[0];
req->rev_pref = rev_pref;
return dm_encapsulate_buffer (cmdbuf, sizeof (*cmd), sizeof (cmdbuf), buf, len);
}
QCDMResult *
qcdm_cmd_nv_set_hdr_rev_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;
if (!check_nv_cmd ((DMCmdNVReadWrite *) buf, DIAG_NV_HDR_REV_PREF, error))
return NULL;
return qcdm_result_new ();
}
/**********************************************************************/
gsize
qcdm_cmd_cm_subsys_state_info_new (char *buf, gsize len, GError **error)
{
libqcdm/src/commands.h
+28
View File
@@ -300,6 +300,34 @@ QCDMResult *qcdm_cmd_nv_set_mode_pref_result (const char *buf,
/**********************************************************************/
/* Values for QCDM_CMD_NV_GET_HDR_REV_PREF_ITEM_REV_PREF */
enum {
QCDM_CMD_NV_HDR_REV_PREF_ITEM_REV_PREF_0 = 0x00,
QCDM_CMD_NV_HDR_REV_PREF_ITEM_REV_PREF_A = 0x01,
QCDM_CMD_NV_HDR_REV_PREF_ITEM_REV_PREF_EHRPD = 0x04,
};
#define QCDM_CMD_NV_GET_HDR_REV_PREF_ITEM_REV_PREF "rev-pref"
gsize qcdm_cmd_nv_get_hdr_rev_pref_new (char *buf,
gsize len,
GError **error);
QCDMResult *qcdm_cmd_nv_get_hdr_rev_pref_result (const char *buf,
gsize len,
GError **error);
gsize qcdm_cmd_nv_set_hdr_rev_pref_new (char *buf,
gsize len,
guint8 rev_pref,
GError **error);
QCDMResult *qcdm_cmd_nv_set_hdr_rev_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
libqcdm/src/nv-items.h
+17 -3
View File
@@ -19,9 +19,10 @@
#define LIBQCDM_NV_ITEMS_H
enum {
DIAG_NV_MODE_PREF = 10, /* Mode preference: 1x, HDR, auto */
DIAG_NV_DIR_NUMBER = 178, /* Mobile Directory Number (MDN) */
DIAG_NV_ROAM_PREF = 442, /* Roaming preference */
DIAG_NV_MODE_PREF = 10, /* Mode preference: 1x, HDR, auto */
DIAG_NV_DIR_NUMBER = 178, /* Mobile Directory Number (MDN) */
DIAG_NV_ROAM_PREF = 442, /* Roaming preference */
DIAG_NV_HDR_REV_PREF = 4964, /* HDR mode preference(?): rev0, revA, eHRPD */
};
@@ -63,5 +64,18 @@ struct DMNVItemRoamPref {
} __attribute__ ((packed));
typedef struct DMNVItemRoamPref DMNVItemRoamPref;
/* HDR Revision preference values (?) */
enum {
DIAG_NV_HDR_REV_PREF_0 = 0x00,
DIAG_NV_HDR_REV_PREF_A = 0x01,
DIAG_NV_HDR_REV_PREF_EHRPD = 0x04,
};
/* DIAG_NV_HDR_REV_PREF */
struct DMNVItemHdrRevPref {
guint8 rev_pref;
} __attribute__ ((packed));
typedef struct DMNVItemHdrRevPref DMNVItemHdrRevPref;
#endif /* LIBQCDM_NV_ITEMS_H */
libqcdm/tests/test-qcdm-com.c
+56
View File
@@ -574,6 +574,62 @@ test_com_read_mode_pref (void *f, void *data)
qcdm_result_unref (result);
}
void
test_com_read_hdr_rev_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_hdr_rev_pref_new (buf, sizeof (buf), 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_hdr_rev_pref_result (buf, reply_len, &error);
if (!result) {
g_assert (error);
g_assert (error->domain == QCDM_COMMAND_ERROR);
g_assert (error->code == QCDM_COMMAND_NVCMD_FAILED || error->code == QCDM_COMMAND_BAD_PARAMETER);
return;
}
g_print ("\n");
success = qcdm_result_get_uint8 (result, QCDM_CMD_NV_GET_HDR_REV_PREF_ITEM_REV_PREF, &pref);
g_assert (success);
switch (pref) {
case QCDM_CMD_NV_HDR_REV_PREF_ITEM_REV_PREF_0:
msg = "rev0";
break;
case QCDM_CMD_NV_HDR_REV_PREF_ITEM_REV_PREF_A:
msg = "revA";
break;
case QCDM_CMD_NV_HDR_REV_PREF_ITEM_REV_PREF_EHRPD:
msg = "eHRPD";
break;
default:
msg = "unknown";
break;
}
g_message ("%s: HDR rev preference: 0x%02X (%s)", __func__, pref, msg);
qcdm_result_unref (result);
}
void
test_com_status (void *f, void *data)
{
libqcdm/tests/test-qcdm-com.h
+2
View File
@@ -33,6 +33,8 @@ void test_com_read_roam_pref (void *f, void *data);
void test_com_read_mode_pref (void *f, void *data);
void test_com_read_hdr_rev_pref (void *f, void *data);
void test_com_status (void *f, void *data);
void test_com_sw_version (void *f, void *data);
libqcdm/tests/test-qcdm.c
+1
View File
@@ -102,6 +102,7 @@ int main (int argc, char **argv)
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_read_hdr_rev_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_status_snapshot, data->com_data));