X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuqmi.git;a=blobdiff_plain;f=commands-dms.c;h=af8b3cebeaefc7b68193738fd7c1f76503b9216b;hp=d9f23c1713bc41b0baea25ba28916a576f89691d;hb=1c39b551f3b74d342238d7ae1b4921f7c1e41d94;hpb=7933948e65924b827924e09542aa8ccc1cffeec4;ds=inline

diff --git a/commands-dms.c b/commands-dms.c
index d9f23c1..af8b3ce 100644
--- a/commands-dms.c
+++ b/commands-dms.c
@@ -23,24 +23,21 @@ static const char *get_pin_status(QmiDmsUimPinStatus status)
 static void cmd_dms_get_pin_status_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
 {
 	struct qmi_dms_uim_get_pin_status_response res;
+	void *c;
 
 	qmi_parse_dms_uim_get_pin_status_response(msg, &res);
+	c = blobmsg_open_table(&status, NULL);
 	if (res.set.pin1_status) {
-		printf("pin1_status=%s\n"
-			   "pin1_verify_tries=%d\n"
-			   "pin1_unblock_tries=%d\n",
-			   get_pin_status(res.data.pin1_status.current_status),
-			   res.data.pin1_status.verify_retries_left,
-			   res.data.pin1_status.unblock_retries_left);
+		blobmsg_add_string(&status, "pin1_status", get_pin_status(res.data.pin1_status.current_status));
+		blobmsg_add_u32(&status, "pin1_verify_tries", (int32_t) res.data.pin1_status.verify_retries_left);
+		blobmsg_add_u32(&status, "pin1_unblock_tries", (int32_t) res.data.pin1_status.unblock_retries_left);
 	}
 	if (res.set.pin2_status) {
-		printf("pin2_status=%s\n"
-			   "pin2_verify_tries=%d\n"
-			   "pin2_unblock_tries=%d\n",
-			   get_pin_status(res.data.pin2_status.current_status),
-			   res.data.pin2_status.verify_retries_left,
-			   res.data.pin2_status.unblock_retries_left);
+		blobmsg_add_string(&status, "pin2_status", get_pin_status(res.data.pin2_status.current_status));
+		blobmsg_add_u32(&status, "pin2_verify_tries", (int32_t) res.data.pin2_status.verify_retries_left);
+		blobmsg_add_u32(&status, "pin2_unblock_tries", (int32_t) res.data.pin2_status.unblock_retries_left);
 	}
+	blobmsg_close_table(&status, c);
 }
 
 static enum qmi_cmd_result
@@ -50,16 +47,7 @@ cmd_dms_get_pin_status_prepare(struct qmi_dev *qmi, struct qmi_request *req, str
 	return QMI_CMD_REQUEST;
 }
 
-static void cmd_dms_verify_pin1_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
-{
-	if (!msg) {
-		printf("failed\n");
-		return;
-	}
-
-	printf("ok\n");
-}
-
+#define cmd_dms_verify_pin1_cb no_cb
 static enum qmi_cmd_result
 cmd_dms_verify_pin1_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
@@ -73,7 +61,7 @@ cmd_dms_verify_pin1_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct
 	return QMI_CMD_REQUEST;
 }
 
-#define cmd_dms_verify_pin2_cb cmd_dms_verify_pin1_cb
+#define cmd_dms_verify_pin2_cb no_cb
 static enum qmi_cmd_result
 cmd_dms_verify_pin2_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
@@ -86,3 +74,27 @@ cmd_dms_verify_pin2_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct
 	qmi_set_dms_uim_verify_pin_request(msg, &data);
 	return QMI_CMD_REQUEST;
 }
+
+static void cmd_dms_get_imsi_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
+{
+	struct qmi_dms_uim_get_imsi_response res;
+
+	qmi_parse_dms_uim_get_imsi_response(msg, &res);
+	if (res.data.imsi)
+		blobmsg_add_string(&status, NULL, res.data.imsi);
+}
+
+static enum qmi_cmd_result
+cmd_dms_get_imsi_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	qmi_set_dms_uim_get_imsi_request(msg);
+	return QMI_CMD_REQUEST;
+}
+
+#define cmd_dms_reset_cb no_cb
+static enum qmi_cmd_result
+cmd_dms_reset_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	qmi_set_dms_reset_request(msg);
+	return QMI_CMD_REQUEST;
+}