X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuqmi.git;a=blobdiff_plain;f=commands-nas.c;fp=commands-nas.c;h=33477ddf518483d69e56864d880363ba2fcaac1d;hp=831e3f42290615862235bf20abc412a4593ec75f;hb=2858f0afce879219dd63cb74340012bffc2115d8;hpb=095f897278912dffe82df309d5e642662615ee2c

diff --git a/commands-nas.c b/commands-nas.c
index 831e3f4..33477dd 100644
--- a/commands-nas.c
+++ b/commands-nas.c
@@ -1,6 +1,10 @@
 #include "qmi-message.h"
 
 static struct qmi_nas_set_system_selection_preference_request sel_req;
+static struct	{
+	bool mcc_is_set;
+	bool mnc_is_set;
+} plmn_code_flag;
 
 #define cmd_nas_do_set_system_selection_cb no_cb
 static enum qmi_cmd_result
@@ -99,6 +103,62 @@ cmd_nas_set_roaming_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct
 	return do_sel_network();
 }
 
+#define cmd_nas_set_mcc_cb no_cb
+static enum qmi_cmd_result
+cmd_nas_set_mcc_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	char *err;
+	int value = strtoul(arg, &err, 10);
+	if (err && *err) {
+		uqmi_add_error("Invalid MCC value");
+		return QMI_CMD_EXIT;
+	}
+
+	sel_req.data.network_selection_preference.mcc = value;
+	plmn_code_flag.mcc_is_set = true;
+	return QMI_CMD_DONE;
+}
+
+#define cmd_nas_set_mnc_cb no_cb
+static enum qmi_cmd_result
+cmd_nas_set_mnc_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	char *err;
+	int value = strtoul(arg, &err, 10);
+	if (err && *err) {
+		uqmi_add_error("Invalid MNC value");
+		return QMI_CMD_EXIT;
+	}
+
+	sel_req.data.network_selection_preference.mnc = value;
+	plmn_code_flag.mnc_is_set = true;
+	return QMI_CMD_DONE;
+}
+
+#define cmd_nas_set_plmn_cb no_cb
+static enum qmi_cmd_result
+cmd_nas_set_plmn_prepare(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_msg *msg, char *arg)
+{
+	sel_req.set.network_selection_preference = 1;
+	sel_req.data.network_selection_preference.mode = QMI_NAS_NETWORK_SELECTION_PREFERENCE_AUTOMATIC;
+
+	if (!plmn_code_flag.mcc_is_set && plmn_code_flag.mnc_is_set) {
+		uqmi_add_error("No MCC value");
+		return QMI_CMD_EXIT;
+	}
+
+	if (plmn_code_flag.mcc_is_set && sel_req.data.network_selection_preference.mcc) {
+		if (!plmn_code_flag.mnc_is_set) {
+			uqmi_add_error("No MNC value");
+			return QMI_CMD_EXIT;
+		} else {
+			sel_req.data.network_selection_preference.mode = QMI_NAS_NETWORK_SELECTION_PREFERENCE_MANUAL;
+		}
+	}
+
+	return do_sel_network();
+}
+
 #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)