diff options
| -rw-r--r-- | include/gsmd/event.h | 21 | ||||
| -rw-r--r-- | src/gsmd/usock.c | 19 | ||||
| -rw-r--r-- | src/libgsmd/libgsmd_pin.c | 19 |
3 files changed, 39 insertions, 20 deletions
diff --git a/include/gsmd/event.h b/include/gsmd/event.h index d10c26e..90e4dc7 100644 --- a/include/gsmd/event.h +++ b/include/gsmd/event.h @@ -24,7 +24,7 @@ enum gsmd_events { /* Chapter 8.3 */ enum gsmd_pin_type { /* waiting for ... */ - GSMD_PIN_NONE = 0, /* not for any PIN */ + GSMD_PIN_READY = 0, /* not pending for any password */ GSMD_PIN_SIM_PIN = 1, /* SIM PIN */ GSMD_PIN_SIM_PUK = 2, /* SIM PUK */ GSMD_PIN_PH_SIM_PIN = 3, /* phone-to-SIM passowrd */ @@ -43,25 +43,6 @@ enum gsmd_pin_type { /* waiting for ... */ __NUM_GSMD_PIN }; -static const char *pin_type_names[__NUM_GSMD_PIN] = { - [GSMD_PIN_NONE] = "NONE", - [GSMD_PIN_SIM_PIN] = "SIM PIN", - [GSMD_PIN_SIM_PUK] = "SIM PUK", - [GSMD_PIN_PH_SIM_PIN] = "Phone-to-SIM PIN", - [GSMD_PIN_PH_FSIM_PIN] = "Phone-to-very-first SIM PIN", - [GSMD_PIN_PH_FSIM_PUK] = "Phone-to-very-first SIM PUK", - [GSMD_PIN_SIM_PIN2] = "SIM PIN2", - [GSMD_PIN_SIM_PUK2] = "SIM PUK2", - [GSMD_PIN_PH_NET_PIN] = "Network personalization PIN", - [GSMD_PIN_PH_NET_PUK] = "Network personalizaiton PUK", - [GSMD_PIN_PH_NETSUB_PIN]= "Network subset personalisation PIN", - [GSMD_PIN_PH_NETSUB_PUK]= "Network subset personalisation PUK", - [GSMD_PIN_PH_SP_PIN] = "Service provider personalisation PIN", - [GSMD_PIN_PH_SP_PUK] = "Service provider personalisation PUK", - [GSMD_PIN_PH_CORP_PIN] = "Corporate personalisation PIN", - [GSMD_PIN_PH_CORP_PUK] = "Corporate personalisation PUK", -}; - enum gsmd_call_type { GSMD_CALL_NONE = 0, GSMD_CALL_UNSPEC = 1, diff --git a/src/gsmd/usock.c b/src/gsmd/usock.c index 5b9eb1c..0a4acd7 100644 --- a/src/gsmd/usock.c +++ b/src/gsmd/usock.c @@ -303,6 +303,25 @@ static int pin_cmd_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) cmd->id, sizeof(ret), &ret); } +static const char *pin_type_names[__NUM_GSMD_PIN] = { + [GSMD_PIN_READY] = "READY", + [GSMD_PIN_SIM_PIN] = "SIM PIN", + [GSMD_PIN_SIM_PUK] = "SIM PUK", + [GSMD_PIN_PH_SIM_PIN] = "Phone-to-SIM PIN", + [GSMD_PIN_PH_FSIM_PIN] = "Phone-to-very-first SIM PIN", + [GSMD_PIN_PH_FSIM_PUK] = "Phone-to-very-first SIM PUK", + [GSMD_PIN_SIM_PIN2] = "SIM PIN2", + [GSMD_PIN_SIM_PUK2] = "SIM PUK2", + [GSMD_PIN_PH_NET_PIN] = "Network personalization PIN", + [GSMD_PIN_PH_NET_PUK] = "Network personalizaiton PUK", + [GSMD_PIN_PH_NETSUB_PIN]= "Network subset personalisation PIN", + [GSMD_PIN_PH_NETSUB_PUK]= "Network subset personalisation PUK", + [GSMD_PIN_PH_SP_PIN] = "Service provider personalisation PIN", + [GSMD_PIN_PH_SP_PUK] = "Service provider personalisation PUK", + [GSMD_PIN_PH_CORP_PIN] = "Corporate personalisation PIN", + [GSMD_PIN_PH_CORP_PUK] = "Corporate personalisation PUK", +}; + static int get_cpin_cb(struct gsmd_atcmd *cmd, void *ctx, char *resp) { enum gsmd_pin_type type; diff --git a/src/libgsmd/libgsmd_pin.c b/src/libgsmd/libgsmd_pin.c index 4918fec..8d50b67 100644 --- a/src/libgsmd/libgsmd_pin.c +++ b/src/libgsmd/libgsmd_pin.c @@ -28,6 +28,25 @@ #include <gsmd/event.h> #include <libgsmd/libgsmd.h> +static const char *pin_type_names[__NUM_GSMD_PIN] = { + [GSMD_PIN_READY] = "READY", + [GSMD_PIN_SIM_PIN] = "SIM PIN", + [GSMD_PIN_SIM_PUK] = "SIM PUK", + [GSMD_PIN_PH_SIM_PIN] = "Phone-to-SIM PIN", + [GSMD_PIN_PH_FSIM_PIN] = "Phone-to-very-first SIM PIN", + [GSMD_PIN_PH_FSIM_PUK] = "Phone-to-very-first SIM PUK", + [GSMD_PIN_SIM_PIN2] = "SIM PIN2", + [GSMD_PIN_SIM_PUK2] = "SIM PUK2", + [GSMD_PIN_PH_NET_PIN] = "Network personalization PIN", + [GSMD_PIN_PH_NET_PUK] = "Network personalizaiton PUK", + [GSMD_PIN_PH_NETSUB_PIN]= "Network subset personalisation PIN", + [GSMD_PIN_PH_NETSUB_PUK]= "Network subset personalisation PUK", + [GSMD_PIN_PH_SP_PIN] = "Service provider personalisation PIN", + [GSMD_PIN_PH_SP_PUK] = "Service provider personalisation PUK", + [GSMD_PIN_PH_CORP_PIN] = "Corporate personalisation PIN", + [GSMD_PIN_PH_CORP_PUK] = "Corporate personalisation PUK", +}; + const char *lgsm_pin_name(enum gsmd_pin_type ptype) { if (ptype >= __NUM_GSMD_PIN) |