nas: fix network scan

[project/uqmi.git] / commands-nas.c

diff --git a/commands-nas.c b/commands-nas.c
index 831e3f4..5874bfb 100644 (file)
--- a/commands-nas.c
+++ b/commands-nas.c
@@ -1,6 +1,31 @@
+/*
+ * uqmi -- tiny QMI support implementation
+ *
+ * Copyright (C) 2014-2015 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ */
+
 #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 +124,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)
@@ -283,7 +364,13 @@ cmd_nas_network_scan_cb(struct qmi_dev *qmi, struct qmi_request *req, struct qmi
 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 = {};
+       struct qmi_nas_network_scan_request sreq = {
+               QMI_INIT(network_type,
+                    QMI_NAS_NETWORK_SCAN_TYPE_GSM |
+                    QMI_NAS_NETWORK_SCAN_TYPE_UMTS |
+                    QMI_NAS_NETWORK_SCAN_TYPE_LTE |
+                    QMI_NAS_NETWORK_SCAN_TYPE_TD_SCDMA),
+       };
 
        qmi_set_nas_network_scan_request(msg, &sreq);
        return QMI_CMD_REQUEST;