X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuqmi.git;a=blobdiff_plain;f=commands-nas.c;h=0eb6941fd42326031e9807745c6b53a702f32f0c;hp=c3298e2473bfddca7077877add610396567127c9;hb=6e19fb326c8a4988cecbfc5490037a6041aca095;hpb=e5e70f32ea49eb1e3aab7f13cdeb7b29b696a8a2;ds=sidebyside

diff --git a/commands-nas.c b/commands-nas.c
index c3298e2..0eb6941 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) {
-			blobmsg_add_string(&status, "error", "Invalid network mode");
+			uqmi_add_error("Invalid network mode");
 			return QMI_CMD_EXIT;
 		}
 	}
@@ -45,6 +45,22 @@ cmd_nas_set_network_modes_prepare(struct qmi_dev *qmi, struct qmi_request *req,
 	return QMI_CMD_REQUEST;
 }
 
+#define cmd_nas_set_network_preference_cb no_cb
+static enum qmi_cmd_result
+cmd_nas_set_network_preference_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	QmiNasGsmWcdmaAcquisitionOrderPreference pref = QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_AUTOMATIC;
+
+	if (!strcmp(arg, "gsm"))
+		pref = QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_GSM;
+	else if (!strcmp(arg, "wcdma"))
+		pref = QMI_NAS_GSM_WCDMA_ACQUISITION_ORDER_PREFERENCE_WCDMA;
+
+	qmi_set(&sel_req, gsm_wcdma_acquisition_order_preference, pref);
+	qmi_set_nas_set_system_selection_preference_request(msg, &sel_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)
@@ -58,9 +74,11 @@ static void
 cmd_nas_get_signal_info_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
 {
 	struct qmi_nas_get_signal_info_response res;
+	void *c;
 
 	qmi_parse_nas_get_signal_info_response(msg, &res);
 
+	c = blobmsg_open_table(&status, NULL);
 	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);
@@ -92,6 +110,8 @@ cmd_nas_get_signal_info_cb(struct qmi_dev *qmi, struct qmi_request *req, struct
 		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);
 	}
+
+	blobmsg_close_table(&status, c);
 }
 
 static enum qmi_cmd_result
@@ -112,9 +132,11 @@ cmd_nas_get_serving_system_cb(struct qmi_dev *qmi, struct qmi_request *req, stru
 		[QMI_NAS_REGISTRATION_STATE_REGISTRATION_DENIED] = "registering_denied",
 		[QMI_NAS_REGISTRATION_STATE_UNKNOWN] = "unknown",
 	};
+	void *c;
 
 	qmi_parse_nas_get_serving_system_response(msg, &res);
 
+	c = blobmsg_open_table(&status, NULL);
 	if (res.set.serving_system) {
 		int state = res.data.serving_system.registration_state;
 
@@ -132,6 +154,8 @@ cmd_nas_get_serving_system_cb(struct qmi_dev *qmi, struct qmi_request *req, stru
 
 	if (res.set.roaming_indicator)
 		blobmsg_add_u8(&status, "roaming", !res.data.roaming_indicator);
+
+	blobmsg_close_table(&status, c);
 }
 
 static enum qmi_cmd_result
@@ -140,3 +164,81 @@ cmd_nas_get_serving_system_prepare(struct qmi_dev *qmi, struct qmi_request *req,
 	qmi_set_nas_get_serving_system_request(msg);
 	return QMI_CMD_REQUEST;
 }
+
+static void
+cmd_nas_network_scan_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg)
+{
+	static struct qmi_nas_network_scan_response res;
+	const char *network_status[] = {
+		"current_serving",
+		"available",
+		"home",
+		"roaming",
+		"forbidden",
+		"not_forbidden",
+		"preferred",
+		"not_preferred",
+	};
+	const char *radio[] = {
+		[QMI_NAS_RADIO_INTERFACE_NONE] = "none",
+		[QMI_NAS_RADIO_INTERFACE_CDMA_1X] = "cdma-1x",
+		[QMI_NAS_RADIO_INTERFACE_CDMA_1XEVDO] = "cdma-1x_evdo",
+		[QMI_NAS_RADIO_INTERFACE_AMPS] = "amps",
+		[QMI_NAS_RADIO_INTERFACE_GSM] = "gsm",
+		[QMI_NAS_RADIO_INTERFACE_UMTS] = "umts",
+		[QMI_NAS_RADIO_INTERFACE_LTE] = "lte",
+		[QMI_NAS_RADIO_INTERFACE_TD_SCDMA] = "td-scdma",
+	};
+	void *t, *c, *info, *stat;
+	int i, j;
+
+	qmi_parse_nas_network_scan_response(msg, &res);
+
+	t = blobmsg_open_table(&status, NULL);
+
+	c = blobmsg_open_array(&status, "network_info");
+	for (i = 0; i < res.data.network_information_n; i++) {
+		info = blobmsg_open_table(&status, NULL);
+		blobmsg_add_u32(&status, "mcc", res.data.network_information[i].mcc);
+		blobmsg_add_u32(&status, "mnc", res.data.network_information[i].mnc);
+		if (res.data.network_information[i].description)
+			blobmsg_add_string(&status, "description", res.data.network_information[i].description);
+		stat = blobmsg_open_array(&status, "status");
+		for (j = 0; j < ARRAY_SIZE(network_status); j++) {
+			if (!(res.data.network_information[i].network_status & (1 << j)))
+				continue;
+
+			blobmsg_add_string(&status, NULL, network_status[j]);
+		}
+		blobmsg_close_array(&status, stat);
+		blobmsg_close_table(&status, info);
+	}
+	blobmsg_close_array(&status, c);
+
+	c = blobmsg_open_array(&status, "radio_access_technology");
+	for (i = 0; i < res.data.radio_access_technology_n; i++) {
+		const char *r = "unknown";
+		int r_i = res.data.radio_access_technology[i].radio_interface;
+
+		info = blobmsg_open_table(&status, NULL);
+		blobmsg_add_u32(&status, "mcc", res.data.radio_access_technology[i].mcc);
+		blobmsg_add_u32(&status, "mnc", res.data.radio_access_technology[i].mnc);
+		if (r_i >= 0 && r_i < ARRAY_SIZE(radio))
+			r = radio[r_i];
+
+		blobmsg_add_string(&status, "radio", r);
+		blobmsg_close_table(&status, info);
+	}
+	blobmsg_close_array(&status, c);
+
+	blobmsg_close_table(&status, t);
+}
+
+static enum qmi_cmd_result
+cmd_nas_network_scan_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	struct qmi_nas_network_scan_request sreq = {};
+
+	qmi_set_nas_network_scan_request(msg, &sreq);
+	return QMI_CMD_REQUEST;
+}