X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuqmi.git;a=blobdiff_plain;f=commands-dms.c;h=668c78f2615b4bec900f9ee741387a920032ed52;hp=3a3c394e584d77d7380e18e1316b174c19640834;hb=a9a5797a4693520f4827481998ebf30b9968c34d;hpb=695ac858744ee1321582b76d8faaecbe00f79ab7

diff --git a/commands-dms.c b/commands-dms.c
index 3a3c394..668c78f 100644
--- a/commands-dms.c
+++ b/commands-dms.c
@@ -1,5 +1,65 @@
 #include "qmi-message.h"
 
+static struct {
+	QmiDmsUimPinId pin_id;
+	char* pin;
+	char* new_pin;
+	char* puk;
+} dms_req_data;
+
+static void cmd_dms_get_capabilities_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
+{
+	void *t, *networks;
+	int i;
+	struct qmi_dms_get_capabilities_response res;
+	const char *radio_cap[] = {
+		[QMI_DMS_RADIO_INTERFACE_CDMA20001X] = "cdma1x",
+		[QMI_DMS_RADIO_INTERFACE_EVDO] = "cdma1xevdo",
+		[QMI_DMS_RADIO_INTERFACE_GSM] = "gsm",
+		[QMI_DMS_RADIO_INTERFACE_UMTS] = "umts",
+		[QMI_DMS_RADIO_INTERFACE_LTE] = "lte",
+	};
+	const char *service_cap[] = {
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_NONE] = "none",
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_CS] = "cs",
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_PS] = "ps",
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_SIMULTANEOUS_CS_PS] = "simultaneous_cs_ps",
+		[QMI_DMS_DATA_SERVICE_CAPABILITY_NON_SIMULTANEOUS_CS_PS] = "non_simultaneous_cs_ps",
+	};
+
+	qmi_parse_dms_get_capabilities_response(msg, &res);
+
+	t = blobmsg_open_table(&status, NULL);
+
+	blobmsg_add_u32(&status, "max_tx_channel_rate", (int32_t) res.data.info.max_tx_channel_rate);
+	blobmsg_add_u32(&status, "max_rx_channel_rate", (int32_t) res.data.info.max_rx_channel_rate);
+	if ((int)res.data.info.data_service_capability >= 0 && res.data.info.data_service_capability < ARRAY_SIZE(service_cap))
+		blobmsg_add_string(&status, "data_service", service_cap[res.data.info.data_service_capability]);
+
+	if(res.data.info.sim_capability == QMI_DMS_SIM_CAPABILITY_NOT_SUPPORTED)
+		blobmsg_add_string(&status, "sim", "not supported");
+	else if(res.data.info.sim_capability == QMI_DMS_SIM_CAPABILITY_SUPPORTED)
+		blobmsg_add_string(&status, "sim", "supported");
+
+	networks = blobmsg_open_array(&status, "networks");
+	for (i = 0; i < res.data.info.radio_interface_list_n; i++) {
+		if ((int)res.data.info.radio_interface_list[i] >= 0 && res.data.info.radio_interface_list[i] < ARRAY_SIZE(radio_cap))
+			blobmsg_add_string(&status, NULL, radio_cap[res.data.info.radio_interface_list[i]]);
+		else
+			blobmsg_add_string(&status, NULL, "unknown");
+	}
+	blobmsg_close_array(&status, networks);
+
+	blobmsg_close_table(&status, t);
+}
+
+static enum qmi_cmd_result
+cmd_dms_get_capabilities_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	qmi_set_dms_get_capabilities_request(msg);
+	return QMI_CMD_REQUEST;
+}
+
 static const char *get_pin_status(int status)
 {
 	static const char *pin_status[] = {
@@ -75,24 +135,18 @@ cmd_dms_verify_pin2_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct
 	return QMI_CMD_REQUEST;
 }
 
-static struct qmi_dms_uim_set_pin_protection_request dms_pin_protection_req = {
-	QMI_INIT_SEQUENCE(info,
-		.pin_id = QMI_DMS_UIM_PIN_ID_PIN
-	)
-};
-
 #define cmd_dms_set_pin_cb no_cb
 static enum qmi_cmd_result
 cmd_dms_set_pin_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
-	qmi_set_ptr(&dms_pin_protection_req, info.pin, arg);
+	dms_req_data.pin = arg;
 	return QMI_CMD_DONE;
 }
 
 static enum qmi_cmd_result
 cmd_dms_set_pin_protection_prepare(struct qmi_msg *msg, char *arg)
 {
-	if (!dms_pin_protection_req.data.info.pin) {
+	if (!dms_req_data.pin) {
 		uqmi_add_error("Missing argument");
 		return QMI_CMD_EXIT;
 	}
@@ -107,7 +161,14 @@ cmd_dms_set_pin_protection_prepare(struct qmi_msg *msg, char *arg)
 		return QMI_CMD_EXIT;
 	}
 
-	qmi_set_ptr(&dms_pin_protection_req, info.protection_enabled, is_enabled);
+	struct qmi_dms_uim_set_pin_protection_request dms_pin_protection_req = {
+		QMI_INIT_SEQUENCE(info,
+			.pin_id = dms_req_data.pin_id
+		),
+		QMI_INIT_PTR(info.pin, dms_req_data.pin),
+		QMI_INIT_PTR(info.protection_enabled, is_enabled)
+	};
+
 	qmi_set_dms_uim_set_pin_protection_request(msg, &dms_pin_protection_req);
 	return QMI_CMD_REQUEST;
 }
@@ -116,7 +177,7 @@ cmd_dms_set_pin_protection_prepare(struct qmi_msg *msg, char *arg)
 static enum qmi_cmd_result
 cmd_dms_set_pin1_protection_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
-	qmi_set_ptr(&dms_pin_protection_req, info.pin_id, QMI_DMS_UIM_PIN_ID_PIN);
+	dms_req_data.pin_id = QMI_DMS_UIM_PIN_ID_PIN;
 	return cmd_dms_set_pin_protection_prepare(msg, arg);
 }
 
@@ -124,21 +185,51 @@ cmd_dms_set_pin1_protection_prepare(struct qmi_dev *qmi, struct qmi_request *req
 static enum qmi_cmd_result
 cmd_dms_set_pin2_protection_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
-	qmi_set_ptr(&dms_pin_protection_req, info.pin_id, QMI_DMS_UIM_PIN_ID_PIN2);
+	dms_req_data.pin_id = QMI_DMS_UIM_PIN_ID_PIN2;
 	return cmd_dms_set_pin_protection_prepare(msg, arg);
 }
 
-static struct qmi_dms_uim_unblock_pin_request dms_unlock_pin_req = {
-	QMI_INIT_SEQUENCE(info,
-			.pin_id = QMI_DMS_UIM_PIN_ID_PIN
-		)
+static enum qmi_cmd_result
+cmd_dms_change_pin_prepare(struct qmi_msg *msg, char *arg)
+{
+	if (!dms_req_data.pin || !dms_req_data.new_pin) {
+		uqmi_add_error("Missing argument");
+		return QMI_CMD_EXIT;
+	}
+
+	struct qmi_dms_uim_change_pin_request dms_change_pin_req = {
+		QMI_INIT_SEQUENCE(info,
+			.pin_id = dms_req_data.pin_id
+		),
+		QMI_INIT_PTR(info.old_pin, dms_req_data.pin),
+		QMI_INIT_PTR(info.new_pin, dms_req_data.new_pin)
 	};
 
+	qmi_set_dms_uim_change_pin_request(msg, &dms_change_pin_req);
+	return QMI_CMD_REQUEST;
+}
+
+#define cmd_dms_change_pin1_cb no_cb
+static enum qmi_cmd_result
+cmd_dms_change_pin1_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	dms_req_data.pin_id = QMI_DMS_UIM_PIN_ID_PIN;
+	return cmd_dms_change_pin_prepare(msg, arg);
+}
+
+#define cmd_dms_change_pin2_cb no_cb
+static enum qmi_cmd_result
+cmd_dms_change_pin2_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	dms_req_data.pin_id = QMI_DMS_UIM_PIN_ID_PIN2;
+	return cmd_dms_change_pin_prepare(msg, arg);
+}
+
 #define cmd_dms_set_new_pin_cb no_cb
 static enum qmi_cmd_result
 cmd_dms_set_new_pin_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
-	qmi_set_ptr(&dms_unlock_pin_req, info.new_pin, arg);
+	dms_req_data.new_pin = arg;
 	return QMI_CMD_DONE;
 }
 
@@ -146,7 +237,7 @@ cmd_dms_set_new_pin_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct
 static enum qmi_cmd_result
 cmd_dms_set_puk_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
-	qmi_set_ptr(&dms_unlock_pin_req, info.puk, arg);
+	dms_req_data.puk = arg;
 	return QMI_CMD_DONE;
 }
 
@@ -154,13 +245,19 @@ cmd_dms_set_puk_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi
 static enum qmi_cmd_result
 cmd_dms_unblock_pin1_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
-	qmi_set_ptr(&dms_unlock_pin_req, info.pin_id, QMI_DMS_UIM_PIN_ID_PIN);
-
-	if (!dms_unlock_pin_req.data.info.puk || !dms_unlock_pin_req.data.info.new_pin) {
+	if (!dms_req_data.puk || !dms_req_data.new_pin) {
 		uqmi_add_error("Missing argument");
 		return QMI_CMD_EXIT;
 	}
 
+	struct qmi_dms_uim_unblock_pin_request dms_unlock_pin_req = {
+		QMI_INIT_SEQUENCE(info,
+				.pin_id = QMI_DMS_UIM_PIN_ID_PIN
+			),
+		QMI_INIT_PTR(info.puk, dms_req_data.puk),
+		QMI_INIT_PTR(info.new_pin, dms_req_data.new_pin)
+		};
+
 	qmi_set_dms_uim_unblock_pin_request(msg, &dms_unlock_pin_req);
 	return QMI_CMD_REQUEST;
 }
@@ -169,13 +266,19 @@ cmd_dms_unblock_pin1_prepare(struct qmi_dev *qmi, struct qmi_request *req, struc
 static enum qmi_cmd_result
 cmd_dms_unblock_pin2_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
 {
-	qmi_set_ptr(&dms_unlock_pin_req, info.pin_id, QMI_DMS_UIM_PIN_ID_PIN2);
-
-	if (!dms_unlock_pin_req.data.info.puk || !dms_unlock_pin_req.data.info.new_pin) {
+	if (!dms_req_data.puk || !dms_req_data.new_pin) {
 		uqmi_add_error("Missing argument");
 		return QMI_CMD_EXIT;
 	}
 
+	struct qmi_dms_uim_unblock_pin_request dms_unlock_pin_req = {
+		QMI_INIT_SEQUENCE(info,
+			.pin_id = QMI_DMS_UIM_PIN_ID_PIN2
+		),
+		QMI_INIT_PTR(info.puk, dms_req_data.puk),
+		QMI_INIT_PTR(info.new_pin, dms_req_data.new_pin)
+	};
+
 	qmi_set_dms_uim_unblock_pin_request(msg, &dms_unlock_pin_req);
 	return QMI_CMD_REQUEST;
 }
@@ -228,6 +331,22 @@ cmd_dms_get_msisdn_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct
 	return QMI_CMD_REQUEST;
 }
 
+static void cmd_dms_get_imei_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
+{
+	struct qmi_dms_get_ids_response res;
+
+	qmi_parse_dms_get_ids_response(msg, &res);
+	if (res.data.imei)
+		blobmsg_add_string(&status, NULL, res.data.imei);
+}
+
+static enum qmi_cmd_result
+cmd_dms_get_imei_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	qmi_set_dms_get_ids_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)