4 files changed, 23 insertions, 4 deletions
diff --git a/include/gsmd/event.h b/include/gsmd/event.h
index 38cefae..d10c26e 100644
--- a/include/gsmd/event.h
+++ b/include/gsmd/event.h
@@ -43,6 +43,25 @@ 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/include/gsmd/usock.h b/include/gsmd/usock.h
index 5116da9..5e07ced 100644
--- a/include/gsmd/usock.h
+++ b/include/gsmd/usock.h
@@ -89,13 +89,13 @@ enum gsmd_msg_phone_type {
 
 enum gsmd_msg_pin_type {
 	GSMD_PIN_INPUT		= 1,
+	GSMD_PIN_GET_STATUS     = 2,
 };
 
 enum gsmd_msg_phone {
 	GSMD_PHONE_POWERUP	= 1,
 	GSMD_PHONE_POWERDOWN	= 2,
 	GSMD_PHONE_GET_IMSI     = 3,
-	GSMD_PIN_GET_STATUS     = 4,
 };
 
 enum gsmd_msg_modem {
diff --git a/include/libgsmd/misc.h b/include/libgsmd/misc.h
index 8111360..554d958 100644
--- a/include/libgsmd/misc.h
+++ b/include/libgsmd/misc.h
@@ -79,6 +79,5 @@ extern int lgsm_get_subscriber_num(struct lgsm_handle *lh);
 
 /* Retrieve IMSI information */
 extern int lgsm_get_imsi(struct lgsm_handle *lh);
-/* Get PIN status information */
-extern int lgsm_pin_status(struct lgsm_handle *lh);
+
 #endif
diff --git a/include/libgsmd/pin.h b/include/libgsmd/pin.h
index d125e40..8b02226 100644
--- a/include/libgsmd/pin.h
+++ b/include/libgsmd/pin.h
@@ -5,5 +5,6 @@ extern const char *lgsm_pin_name(enum gsmd_pin_type ptype);
 
 extern int lgsm_pin(struct lgsm_handle *lh, unsigned int type,
 		const char *pin, const char *newpin);
-
+/* Get PIN status information */
+extern int lgsm_pin_status(struct lgsm_handle *lh);
 #endif