X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuqmi.git;a=blobdiff_plain;f=commands-nas.c;h=c3298e2473bfddca7077877add610396567127c9;hp=81975b28a4d96f4d4b9825bf3db2f88e14844c48;hb=b77ffd42fe98c186db6875f78bb9f278e5d94fc3;hpb=40fa0f983ba95da1750c8bef6cdfa0271f4c4b44

diff --git a/commands-nas.c b/commands-nas.c
index 81975b2..c3298e2 100644
--- a/commands-nas.c
+++ b/commands-nas.c
@@ -35,7 +35,7 @@ cmd_nas_set_network_modes_prepare(struct qmi_dev *qmi, struct qmi_request *req,
 		}
 
 		if (!found) {
-			fprintf(stderr, "Invalid network mode '%s'\n", word);
+			blobmsg_add_string(&status, "error", "Invalid network mode");
 			return QMI_CMD_EXIT;
 		}
 	}
@@ -45,6 +45,15 @@ cmd_nas_set_network_modes_prepare(struct qmi_dev *qmi, struct qmi_request *req,
 	return QMI_CMD_REQUEST;
 }
 
+#define cmd_nas_initiate_network_register_cb no_cb
+static enum qmi_cmd_result
+cmd_nas_initiate_network_register_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	static struct qmi_nas_initiate_network_register_request register_req;
+	qmi_set_nas_initiate_network_register_request(msg, &register_req);
+	return QMI_CMD_REQUEST;
+}
+
 static void
 cmd_nas_get_signal_info_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
 {
@@ -52,32 +61,37 @@ cmd_nas_get_signal_info_cb(struct qmi_dev *qmi, struct qmi_request *req, struct
 
 	qmi_parse_nas_get_signal_info_response(msg, &res);
 
-	if (res.set.cdma_signal_strength)
-		printf("cdma_rssi=%d\ncdma_ecio=%d\n",
-			res.data.cdma_signal_strength.rssi,
-			res.data.cdma_signal_strength.ecio);
-
-	if (res.set.hdr_signal_strength)
-		printf("hdr_rssi=%d\nhdr_ecio=%d\nhdr_io=%d\n",
-			res.data.hdr_signal_strength.rssi,
-			res.data.hdr_signal_strength.ecio,
-			res.data.hdr_signal_strength.io);
+	if (res.set.cdma_signal_strength) {
+		blobmsg_add_string(&status, "type", "cdma");
+		blobmsg_add_u32(&status, "rssi", (int32_t) res.data.cdma_signal_strength.rssi);
+		blobmsg_add_u32(&status, "ecio", (int32_t) res.data.cdma_signal_strength.ecio);
+	}
 
-	if (res.set.gsm_signal_strength)
-		printf("gsm_rssi=%d\n", res.data.gsm_signal_strength);
+	if (res.set.hdr_signal_strength) {
+		blobmsg_add_string(&status, "type", "hdr");
+		blobmsg_add_u32(&status, "rssi", (int32_t) res.data.hdr_signal_strength.rssi);
+		blobmsg_add_u32(&status, "ecio", (int32_t) res.data.hdr_signal_strength.ecio);
+		blobmsg_add_u32(&status, "io", res.data.hdr_signal_strength.io);
+	}
 
-	if (res.set.wcdma_signal_strength)
-		printf("wcdma_rssi=%d\nwcdma_ecio=%d\n",
-			res.data.wcdma_signal_strength.rssi,
-			res.data.wcdma_signal_strength.ecio);
+	if (res.set.gsm_signal_strength) {
+		blobmsg_add_string(&status, "type", "gsm");
+		blobmsg_add_u32(&status, "signal", (int32_t) res.data.gsm_signal_strength);
+	}
 
-	if (res.set.lte_signal_strength)
-		printf("lte_rssi=%d\nlte_rsrq=%d\nlte_rsrp=%d\nlte_snr=%d\n",
-			res.data.lte_signal_strength.rssi,
-			res.data.lte_signal_strength.rsrq,
-			res.data.lte_signal_strength.rsrp,
-			res.data.lte_signal_strength.snr);
+	if (res.set.wcdma_signal_strength) {
+		blobmsg_add_string(&status, "type", "wcdma");
+		blobmsg_add_u32(&status, "rssi", (int32_t) res.data.wcdma_signal_strength.rssi);
+		blobmsg_add_u32(&status, "ecio", (int32_t) res.data.wcdma_signal_strength.ecio);
+	}
 
+	if (res.set.lte_signal_strength) {
+		blobmsg_add_string(&status, "type", "lte");
+		blobmsg_add_u32(&status, "rssi", (int32_t) res.data.lte_signal_strength.rssi);
+		blobmsg_add_u32(&status, "rsrq", (int32_t) res.data.lte_signal_strength.rsrq);
+		blobmsg_add_u32(&status, "rsrp", (int32_t) res.data.lte_signal_strength.rsrp);
+		blobmsg_add_u32(&status, "snr", (int32_t) res.data.lte_signal_strength.snr);
+	}
 }
 
 static enum qmi_cmd_result
@@ -86,3 +100,43 @@ cmd_nas_get_signal_info_prepare(struct qmi_dev *qmi, struct qmi_request *req, st
 	qmi_set_nas_get_signal_info_request(msg);
 	return QMI_CMD_REQUEST;
 }
+
+static void
+cmd_nas_get_serving_system_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
+{
+	struct qmi_nas_get_serving_system_response res;
+	static const char *reg_states[] = {
+		[QMI_NAS_REGISTRATION_STATE_NOT_REGISTERED] = "not_registered",
+		[QMI_NAS_REGISTRATION_STATE_REGISTERED] = "registered",
+		[QMI_NAS_REGISTRATION_STATE_NOT_REGISTERED_SEARCHING] = "searching",
+		[QMI_NAS_REGISTRATION_STATE_REGISTRATION_DENIED] = "registering_denied",
+		[QMI_NAS_REGISTRATION_STATE_UNKNOWN] = "unknown",
+	};
+
+	qmi_parse_nas_get_serving_system_response(msg, &res);
+
+	if (res.set.serving_system) {
+		int state = res.data.serving_system.registration_state;
+
+		if (state > QMI_NAS_REGISTRATION_STATE_UNKNOWN)
+			state = QMI_NAS_REGISTRATION_STATE_UNKNOWN;
+
+		blobmsg_add_string(&status, "registration", reg_states[state]);
+	}
+	if (res.set.current_plmn) {
+		blobmsg_add_u32(&status, "plmn_mcc", res.data.current_plmn.mcc);
+		blobmsg_add_u32(&status, "plmn_mnc", res.data.current_plmn.mnc);
+		if (res.data.current_plmn.description)
+			blobmsg_add_string(&status, "plmn_description", res.data.current_plmn.description);
+	}
+
+	if (res.set.roaming_indicator)
+		blobmsg_add_u8(&status, "roaming", !res.data.roaming_indicator);
+}
+
+static enum qmi_cmd_result
+cmd_nas_get_serving_system_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	qmi_set_nas_get_serving_system_request(msg);
+	return QMI_CMD_REQUEST;
+}