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

libqcdm: fix WCDMA L1 Manager states

Browse Source 
The enum was wrong.  There isn't actually an L1M_INIT state; the
enum should start with L1M_IDLE.  There should also be a
L1M_PCH_SLEEP state between DEACTIVATE and DEEP_SLEEP.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=100000
This commit is contained in:
Dan Williams
2017-02-28 13:30:56 -06:00
parent 21f315f6d5
commit cec01fdaf6
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libqcdm/src/commands.h
View File

@@ -692,18 +692,20 @@ QcdmResult *qcdm_cmd_nw_subsys_eri_result (const char *buf,
/* Values for QCDM_CMD_WCDMA_SUBSYS_STATE_INFO_ITEM_L1_STATE */ /* Values for QCDM_CMD_WCDMA_SUBSYS_STATE_INFO_ITEM_L1_STATE */
enum { enum {
QCDM_WCDMA_L1_STATE_INIT = 0, QCDM_WCDMA_L1_STATE_IDLE = 0,
QCDM_WCDMA_L1_STATE_IDLE = 1, QCDM_WCDMA_L1_STATE_FS = 1,
QCDM_WCDMA_L1_STATE_FS = 2, QCDM_WCDMA_L1_STATE_ACQ = 2,
QCDM_WCDMA_L1_STATE_ACQ = 3, QCDM_WCDMA_L1_STATE_BCH = 3,
QCDM_WCDMA_L1_STATE_BCH = 4, QCDM_WCDMA_L1_STATE_PCH = 4,
QCDM_WCDMA_L1_STATE_PCH = 5, QCDM_WCDMA_L1_STATE_FACH = 5,
QCDM_WCDMA_L1_STATE_FACH = 6, QCDM_WCDMA_L1_STATE_DCH = 6,
QCDM_WCDMA_L1_STATE_DCH = 7, QCDM_WCDMA_L1_STATE_DEACTIVATE = 7,
QCDM_WCDMA_L1_STATE_DEACTIVATE = 8, QCDM_WCDMA_L1_STATE_PCH_SLEEP = 8,
QCDM_WCDMA_L1_STATE_DEEP_SLEEP = 9, QCDM_WCDMA_L1_STATE_DEEP_SLEEP = 9,
QCDM_WCDMA_L1_STATE_STOPPED = 10, QCDM_WCDMA_L1_STATE_STOPPED = 10,
QCDM_WCDMA_L1_STATE_SUSPENDED = 11, QCDM_WCDMA_L1_STATE_SUSPENDED = 11,
QCDM_WCDMA_L1_STATE_PCH_BPLMN = 12,
QCDM_WCDMA_L1_STATE_WAIT_TRM_STOP = 13,
}; };
/* One of QCDM_WCDMA_L1_STATE_* */ /* One of QCDM_WCDMA_L1_STATE_* */

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

@@ -1861,9 +1861,6 @@ test_com_wcdma_subsys_state_info (void *f, void *data)
str = "unknown"; str = "unknown";
qcdm_result_get_u8 (result, QCDM_CMD_WCDMA_SUBSYS_STATE_INFO_ITEM_L1_STATE, &num8); qcdm_result_get_u8 (result, QCDM_CMD_WCDMA_SUBSYS_STATE_INFO_ITEM_L1_STATE, &num8);
switch (num8) { switch (num8) {
case QCDM_WCDMA_L1_STATE_INIT:
str = "Init";
break;
case QCDM_WCDMA_L1_STATE_IDLE: case QCDM_WCDMA_L1_STATE_IDLE:
str = "Idle"; str = "Idle";
break; break;
@@ -1888,6 +1885,9 @@ test_com_wcdma_subsys_state_info (void *f, void *data)
case QCDM_WCDMA_L1_STATE_DEACTIVATE: case QCDM_WCDMA_L1_STATE_DEACTIVATE:
str = "Deactivated"; str = "Deactivated";
break; break;
case QCDM_WCDMA_L1_STATE_PCH_SLEEP:
str = "PCH Sleep";
break;
case QCDM_WCDMA_L1_STATE_DEEP_SLEEP: case QCDM_WCDMA_L1_STATE_DEEP_SLEEP:
str = "Deep Sleep"; str = "Deep Sleep";
break; break;
@@ -1897,6 +1897,12 @@ test_com_wcdma_subsys_state_info (void *f, void *data)
case QCDM_WCDMA_L1_STATE_SUSPENDED: case QCDM_WCDMA_L1_STATE_SUSPENDED:
str = "Suspended"; str = "Suspended";
break; break;
case QCDM_WCDMA_L1_STATE_PCH_BPLMN:
str = "PCH BPLMN";
break;
case QCDM_WCDMA_L1_STATE_WAIT_TRM_STOP:
str = "Wait TRM Stop";
break;
default: default:
break; break;
} }