move qmi_get_error_str to into utils.c

In prepration to allow uqmid to use it as well.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 016b0163837040e7bdeedda829be39b8f5b4d0d1..e449b88759f78578ea1330db026f008c364c61af 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations -Wno-
 
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 
-SET(SOURCES qmi-message.c mbim.c)
+SET(SOURCES qmi-message.c mbim.c utils.c)
 SET(UQMI uqmi.c dev.c commands.c ${SOURCES})
 
 FIND_PATH(ubox_include_dir libubox/usock.h)

diff --git a/commands.c b/commands.c
index 7ac67b486589dba95cc5b8de7c3238774b5a311d..ec412d0da45eeb680d5704b67e28049e27b044be 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -29,6 +29,7 @@
 #include <libubox/blobmsg_json.h>
 
 #include "uqmi.h"
+#include "utils.h"
 #include "commands.h"
 
 struct blob_buf status;

diff --git a/dev.c b/dev.c
index 76be5cd4ee5adb5e6c23b5fa018d5217e7f0e9c2..495a7be14794a3a7c0f5e59e8f4d3207fcbaa27f 100644 (file)
--- a/dev.c
+++ b/dev.c
@@ -458,15 +458,3 @@ QmiService qmi_service_get_by_name(const char *str)
 
        return -1;
 }
-
-const char *qmi_get_error_str(int code)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(qmi_errors); i++) {
-               if (qmi_errors[i].code == code)
-                       return qmi_errors[i].text;
-       }
-
-       return "Unknown error";
-}

diff --git a/uqmi.h b/uqmi.h
index dd88151045b5932aeb8a649408f65955389d948d..19140fe43ceadbc4f8a05fed972180ba9ab83b1c 100644 (file)
--- a/uqmi.h
+++ b/uqmi.h
@@ -122,6 +122,5 @@ int qmi_service_connect(struct qmi_dev *qmi, QmiService svc, int client_id);
 int qmi_service_get_client_id(struct qmi_dev *qmi, QmiService svc);
 int qmi_service_release_client_id(struct qmi_dev *qmi, QmiService svc);
 QmiService qmi_service_get_by_name(const char *str);
-const char *qmi_get_error_str(int code);
 
 #endif

diff --git a/utils.c b/utils.c
new file mode 100644 (file)
index 0000000..3a2681d
--- /dev/null
+++ b/utils.c
@@ -0,0 +1,38 @@
+/*
+ * 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 "utils.h"
+#include "qmi-errors.h"
+#include <qmi-errors.c>
+
+#include <libubox/utils.h>
+
+const char *qmi_get_error_str(int code)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(qmi_errors); i++) {
+               if (qmi_errors[i].code == code)
+                       return qmi_errors[i].text;
+       }
+
+       return "Unknown error";
+}

diff --git a/utils.h b/utils.h
new file mode 100644 (file)
index 0000000..d7b7947
--- /dev/null
+++ b/utils.h
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+
+#ifndef __UTILS_H
+#define __UTILS_H
+
+const char *qmi_get_error_str(int code);
+
+#endif /* __UTILS_H */