diff options
| author | Dan Williams <dcbw@redhat.com> | 2017-02-28 13:30:56 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2017-03-01 09:15:20 -0600 |
| commit | bd9609c6759217275105dc1294233129d249f043 (patch) | |
| tree | cfd79e0e1d918b481f213c2e31b5809ea28c06eb | |
| parent | 8d4f94f34d0af771fe94e7eb82da8d11f4668c8b (diff) | |
| download | ModemManager-bd9609c6759217275105dc1294233129d249f043.tar.gz | |
libqcdm: fix WCDMA L1 Manager states
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
(cherry picked from commit cec01fdaf67a7973a4bb1691baeb31fb0cf7ec2f)
| -rw-r--r-- | libqcdm/src/commands.h | 20 | ||||
| -rw-r--r-- | libqcdm/tests/test-qcdm-com.c | 12 |
2 files changed, 20 insertions, 12 deletions
diff --git a/libqcdm/src/commands.h b/libqcdm/src/commands.h index 6f05f1c7b..a73e65028 100644 --- a/libqcdm/src/commands.h +++ b/libqcdm/src/commands.h @@ -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 */ enum { - QCDM_WCDMA_L1_STATE_INIT = 0, - QCDM_WCDMA_L1_STATE_IDLE = 1, - QCDM_WCDMA_L1_STATE_FS = 2, - QCDM_WCDMA_L1_STATE_ACQ = 3, - QCDM_WCDMA_L1_STATE_BCH = 4, - QCDM_WCDMA_L1_STATE_PCH = 5, - QCDM_WCDMA_L1_STATE_FACH = 6, - QCDM_WCDMA_L1_STATE_DCH = 7, - QCDM_WCDMA_L1_STATE_DEACTIVATE = 8, + QCDM_WCDMA_L1_STATE_IDLE = 0, + QCDM_WCDMA_L1_STATE_FS = 1, + QCDM_WCDMA_L1_STATE_ACQ = 2, + QCDM_WCDMA_L1_STATE_BCH = 3, + QCDM_WCDMA_L1_STATE_PCH = 4, + QCDM_WCDMA_L1_STATE_FACH = 5, + QCDM_WCDMA_L1_STATE_DCH = 6, + QCDM_WCDMA_L1_STATE_DEACTIVATE = 7, + QCDM_WCDMA_L1_STATE_PCH_SLEEP = 8, QCDM_WCDMA_L1_STATE_DEEP_SLEEP = 9, QCDM_WCDMA_L1_STATE_STOPPED = 10, 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_* */ diff --git a/libqcdm/tests/test-qcdm-com.c b/libqcdm/tests/test-qcdm-com.c index 861528463..4e5ea3edf 100644 --- a/libqcdm/tests/test-qcdm-com.c +++ b/libqcdm/tests/test-qcdm-com.c @@ -1861,9 +1861,6 @@ test_com_wcdma_subsys_state_info (void *f, void *data) str = "unknown"; qcdm_result_get_u8 (result, QCDM_CMD_WCDMA_SUBSYS_STATE_INFO_ITEM_L1_STATE, &num8); switch (num8) { - case QCDM_WCDMA_L1_STATE_INIT: - str = "Init"; - break; case QCDM_WCDMA_L1_STATE_IDLE: str = "Idle"; break; @@ -1888,6 +1885,9 @@ test_com_wcdma_subsys_state_info (void *f, void *data) case QCDM_WCDMA_L1_STATE_DEACTIVATE: str = "Deactivated"; break; + case QCDM_WCDMA_L1_STATE_PCH_SLEEP: + str = "PCH Sleep"; + break; case QCDM_WCDMA_L1_STATE_DEEP_SLEEP: str = "Deep Sleep"; break; @@ -1897,6 +1897,12 @@ test_com_wcdma_subsys_state_info (void *f, void *data) case QCDM_WCDMA_L1_STATE_SUSPENDED: str = "Suspended"; 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: break; } |