add UIM verify pin commands

[project/uqmi.git] / dev.c

diff --git a/dev.c b/dev.c
index b00ee8d2da44c9db827346a1412123a38670faf0..9bf7ab20f904b5ac631c3d2538c5f6384139f292 100644 (file)
--- a/dev.c
+++ b/dev.c
@@ -1,3 +1,24 @@
+/*
+ * 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 <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -6,6 +27,7 @@
 #include "uqmi.h"
 #include "qmi-errors.h"
 #include "qmi-errors.c"
+#include "mbim.h"
 
 bool cancel_all_requests = false;
 
@@ -15,10 +37,13 @@ static const uint8_t qmi_services[__QMI_SERVICE_LAST] = {
 };
 #undef __qmi_service
 
-static union {
-       char buf[512];
-       struct qmi_msg msg;
-} msgbuf;
+static struct {
+       struct mbim_command_message mbim;
+       union {
+               char buf[512];
+               struct qmi_msg msg;
+       } u;
+} __packed msgbuf;
 
 #ifdef DEBUG_PACKET
 void dump_packet(const char *prefix, void *ptr, int len)
@@ -49,7 +74,6 @@ static void __qmi_request_complete(struct qmi_dev *qmi, struct qmi_request *req,
 {
        void *tlv_buf;
        int tlv_len;
-       int ret;
 
        if (!req->pending)
                return;
@@ -103,22 +127,36 @@ static void qmi_notify_read(struct ustream *us, int bytes)
        struct qmi_msg *msg;
        char *buf;
        int len, msg_len;
-       int i;
+
 
        while (1) {
                buf = ustream_get_read_buf(us, &len);
                if (!buf || !len)
                        return;
 
-               if (len < offsetof(struct qmi_msg, flags))
-                       return;
+               dump_packet("Received packet", buf, len);
+               if (qmi->is_mbim) {
+                       struct mbim_command_message *mbim = (void *) buf;
+
+                       if (len < sizeof(*mbim))
+                               return;
+                       msg = (struct qmi_msg *) (buf + sizeof(*mbim));
+                       msg_len = le32_to_cpu(mbim->header.length);
+                       if (!is_mbim_qmi(mbim)) {
+                               /* must consume other MBIM packets */
+                               ustream_consume(us, msg_len);
+                               return;
+                       }
+               } else {
+                       if (len < offsetof(struct qmi_msg, flags))
+                               return;
+                       msg = (struct qmi_msg *) buf;
+                       msg_len = le16_to_cpu(msg->qmux.len) + 1;
+               }
 
-               msg = (struct qmi_msg *) buf;
-               msg_len = le16_to_cpu(msg->qmux.len) + 1;
                if (len < msg_len)
                        return;
 
-               dump_packet("Received packet", msg, msg_len);
                qmi_process_msg(qmi, msg);
                ustream_consume(us, msg_len);
        }
@@ -128,8 +166,7 @@ int qmi_request_start(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_m
 {
        int len = qmi_complete_request_message(msg);
        uint16_t tid;
-       int ret;
-       int i;
+       char *buf = (void *) msg;
 
        memset(req, 0, sizeof(*req));
        req->ret = -1;
@@ -153,8 +190,14 @@ int qmi_request_start(struct qmi_dev *qmi, struct qmi_request *req, struct qmi_m
        req->pending = true;
        list_add(&req->list, &qmi->req);
 
-       dump_packet("Send packet", msg, len);
-       ustream_write(&qmi->sf.stream, (void *) msg, len, false);
+       if (qmi->is_mbim) {
+               buf -= sizeof(struct mbim_command_message);
+               mbim_qmi_cmd((struct mbim_command_message *) buf, len, tid);
+               len += sizeof(struct mbim_command_message);
+       }
+
+       dump_packet("Send packet", buf, len);
+       ustream_write(&qmi->sf.stream, buf, len, false);
        return 0;
 }
 
@@ -217,7 +260,7 @@ int qmi_service_connect(struct qmi_dev *qmi, QmiService svc, int client_id)
        };
        struct qmi_connect_request req;
        int idx = qmi_get_service_idx(svc);
-       struct qmi_msg *msg = &msgbuf.msg;
+       struct qmi_msg *msg = &msgbuf.u.msg;
 
        if (idx < 0)
                return -1;
@@ -234,6 +277,8 @@ int qmi_service_connect(struct qmi_dev *qmi, QmiService svc, int client_id)
                        return req.req.ret;
 
                client_id = req.cid;
+       } else {
+               qmi->service_keep_cid |= (1 << idx);
        }
 
        qmi->service_data[idx].connected = true;
@@ -254,7 +299,7 @@ static void __qmi_service_disconnect(struct qmi_dev *qmi, int idx)
                )
        };
        struct qmi_request req;
-       struct qmi_msg *msg = &msgbuf.msg;
+       struct qmi_msg *msg = &msgbuf.u.msg;
 
        qmi->service_connected &= ~(1 << idx);
        qmi->service_data[idx].client_id = -1;
@@ -265,11 +310,19 @@ static void __qmi_service_disconnect(struct qmi_dev *qmi, int idx)
        qmi_request_wait(qmi, &req);
 }
 
+int qmi_service_release_client_id(struct qmi_dev *qmi, QmiService svc)
+{
+       int idx = qmi_get_service_idx(svc);
+       qmi->service_release_cid |= 1 << idx;
+       return 0;
+}
+
 static void qmi_close_all_services(struct qmi_dev *qmi)
 {
        uint32_t connected = qmi->service_connected;
        int idx;
 
+       qmi->service_keep_cid &= ~qmi->service_release_cid;
        for (idx = 0; connected; idx++, connected >>= 1) {
                if (!(connected & 1))
                        continue;
@@ -314,7 +367,6 @@ int qmi_device_open(struct qmi_dev *qmi, const char *path)
 void qmi_device_close(struct qmi_dev *qmi)
 {
        struct qmi_request *req;
-       int idx;
 
        qmi_close_all_services(qmi);
        ustream_free(&qmi->sf.stream);
@@ -337,6 +389,8 @@ QmiService qmi_service_get_by_name(const char *str)
                { "pds", QMI_SERVICE_PDS },
                { "wds", QMI_SERVICE_WDS },
                { "wms", QMI_SERVICE_WMS },
+               { "wda", QMI_SERVICE_WDA },
+               { "uim", QMI_SERVICE_UIM },
        };
        int i;