[PATCH 2/4] qmi: sim: use struct/enum for session type when sending pin

drop unnecessary passwd checks in qmi_pin_send() while at it
drop struct qmi_uim_param_message_info as well
---
 drivers/qmimodem/sim.c | 40 ++++++++++++++++++----------------------
 drivers/qmimodem/uim.h | 36 ++++++++++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 28 deletions(-)

diff --git a/drivers/qmimodem/sim.c b/drivers/qmimodem/sim.c
index a700f31..724a3d3 100644
--- a/drivers/qmimodem/sim.c
+++ b/drivers/qmimodem/sim.c
@@ -718,33 +718,30 @@ static void qmi_pin_send(struct ofono_sim *sim, const char *passwd,
 	struct cb_data *cbd = cb_data_new(cb, user_data);
 	int passwd_len;
 	struct qmi_param *param;
-	struct qmi_uim_param_message_info *info_data;
-	unsigned char session_info_data[2];
+	struct qmi_uim_param_session_info session;
+	struct {
+		uint8_t id;
+		uint8_t length;
+		uint8_t pin[0];
+	} __attribute__((__packed__)) *info;
 
 	DBG("");
 
-	if (!passwd)
-		goto error;
-
 	passwd_len = strlen(passwd);
-
-	if (passwd_len <= 0 || passwd_len > 0xFF)
-		goto error;
-
 	param = qmi_param_new();
 
-	/* param info */
-	info_data = alloca(2 + passwd_len);
-	info_data->pin_id = 0x01; /* PIN 1 */
-	info_data->length = (uint8_t) passwd_len;
-	memcpy(info_data->pin_value, passwd, passwd_len);
-	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_INFO, 2 + passwd_len,
-					info_data);
-	/* param Session Information */
-	session_info_data[0] = 0x6;
-	session_info_data[1] = 0x0;
-	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_SESSION_INFO, 2,
-					session_info_data);
+	/* info */
+	info = alloca(sizeof(*info) + passwd_len);
+	info->id = 0x01; /* PIN 1 */
+	info->length = (uint8_t) passwd_len;
+	memcpy(info->pin, passwd, passwd_len);
+	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_INFO,
+					sizeof(*info) + passwd_len, info);
+	/* session */
+	session.type = QMI_UIM_SESSION_TYPE_CS1;
+	session.aid_length = 0;
+	qmi_param_append(param, QMI_UIM_PARAM_MESSAGE_SESSION_INFO,
+					sizeof(session), &session);
 
 	if (qmi_service_send(data->uim, QMI_UIM_VERIFY_PIN, param,
 					pin_send_cb, cbd, l_free) > 0)
@@ -752,7 +749,6 @@ static void qmi_pin_send(struct ofono_sim *sim, const char *passwd,
 
 	qmi_param_free(param);
 
-error:
 	CALLBACK_WITH_FAILURE(cb, cbd->data);
 	l_free(cbd);
 }
diff --git a/drivers/qmimodem/uim.h b/drivers/qmimodem/uim.h
index 439e25b..92cd963 100644
--- a/drivers/qmimodem/uim.h
+++ b/drivers/qmimodem/uim.h
@@ -80,11 +80,35 @@ struct qmi_uim_file_attributes {
 	uint8_t raw_value[0];
 } __attribute__((__packed__));
 
-/* Verify PIN parameter */
 #define QMI_UIM_PARAM_MESSAGE_SESSION_INFO	0x01
-#define QMI_UIM_PARAM_MESSAGE_INFO	0x02
-struct qmi_uim_param_message_info {
-	uint8_t pin_id;
-	uint8_t length;
-	uint8_t pin_value[0];
+
+enum qmi_uim_session_type {
+	/* Primary GW Provisioning */
+	QMI_UIM_SESSION_TYPE_PGWP =		0x00,
+	/* Primary 1X Provisioning */
+	QMI_UIM_SESSION_TYPE_P1XP =		0x01,
+	/* Secondary GW Provisioning */
+	QMI_UIM_SESSION_TYPE_SGWP =		0x02,
+	/* Secondary 1X Provisioning */
+	QMI_UIM_SESSION_TYPE_S1XP =		0x03,
+	/* NonProvisioning on Slot 1 */
+	QMI_UIM_SESSION_TYPE_NPS1 =		0x04,
+	/* NonProvisioning on Slot 2 */
+	QMI_UIM_SESSION_TYPE_NPS2 =		0x05,
+	/* Card on Slot 1 */
+	QMI_UIM_SESSION_TYPE_CS1 =		0x06,
+	/* Card on Slot 2 */
+	QMI_UIM_SESSION_TYPE_CS2 =		0x07,
+	/* Logical Channel on Slot 1 */
+	QMI_UIM_SESSION_TYPE_LCS1 =		0x08,
+	/* Logical Channel on Slot 2 */
+	QMI_UIM_SESSION_TYPE_LCS2 =		0x09
+};
+
+struct qmi_uim_param_session_info {
+	uint8_t type;
+	uint8_t aid_length;
+	uint8_t aid[0];
 } __attribute__((__packed__));
+
+#define QMI_UIM_PARAM_MESSAGE_INFO	0x02
-- 
2.7.4