temp/ofono: upgrade to 9999 (1.32), match WWAN QMI ports (MR 2227)
This commit is contained in:
Minecrell
Bart Ribbers
parent
aa0c95ac72
commit
501c888dc8
5 changed files with 18 additions and 117 deletions
|
|
@ -1,84 +0,0 @@
|
|||
From ce86a6c207222fd5c42b53bc6c4a39c545f543de Mon Sep 17 00:00:00 2001
|
||||
From: Alexey Andreyev <aa13q@ya.ru>
|
||||
Date: Fri, 19 Feb 2021 15:47:42 +0300
|
||||
Subject: qmimodem: Add USSD indication support
|
||||
|
||||
Handle USSD QMI indication messages.
|
||||
Add support for UCS2 USS Data coding scheme.
|
||||
Check for User Action TLV type.
|
||||
---
|
||||
drivers/qmimodem/ussd.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 44 insertions(+)
|
||||
|
||||
diff --git a/drivers/qmimodem/ussd.c b/drivers/qmimodem/ussd.c
|
||||
index 1e613032..e5399b9d 100644
|
||||
--- a/drivers/qmimodem/ussd.c
|
||||
+++ b/drivers/qmimodem/ussd.c
|
||||
@@ -67,6 +67,12 @@ static int convert_qmi_dcs_gsm_dcs(int qmi_dcs, int *gsm_dcs)
|
||||
case QMI_USSD_DCS_ASCII:
|
||||
*gsm_dcs = USSD_DCS_8BIT;
|
||||
break;
|
||||
+ case QMI_USSD_DCS_8BIT:
|
||||
+ *gsm_dcs = USSD_DCS_8BIT;
|
||||
+ break;
|
||||
+ case QMI_USSD_DCS_UCS2:
|
||||
+ *gsm_dcs = USSD_DCS_UCS2;
|
||||
+ break;
|
||||
default:
|
||||
return 1;
|
||||
}
|
||||
@@ -74,6 +80,41 @@ static int convert_qmi_dcs_gsm_dcs(int qmi_dcs, int *gsm_dcs)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static void async_ind(struct qmi_result *result, void *user_data)
|
||||
+{
|
||||
+ struct ofono_ussd *ussd = user_data;
|
||||
+ const struct qmi_ussd_data *qmi_ussd;
|
||||
+ uint8_t user_action_required = 0;
|
||||
+ int notify_status = OFONO_USSD_STATUS_NOTIFY;
|
||||
+ uint16_t len;
|
||||
+ int gsm_dcs;
|
||||
+
|
||||
+ DBG("");
|
||||
+
|
||||
+ qmi_ussd = qmi_result_get(result, QMI_VOICE_PARAM_USSD_IND_DATA, &len);
|
||||
+ if (qmi_ussd == NULL)
|
||||
+ return;
|
||||
+
|
||||
+ if (validate_ussd_data(qmi_ussd, len))
|
||||
+ goto error;
|
||||
+
|
||||
+ if (convert_qmi_dcs_gsm_dcs(qmi_ussd->dcs, &gsm_dcs))
|
||||
+ goto error;
|
||||
+
|
||||
+ if (qmi_result_get_uint8(result, QMI_VOICE_PARAM_USSD_IND_USER_ACTION,
|
||||
+ &user_action_required)) {
|
||||
+ if (user_action_required == QMI_USSD_USER_ACTION_REQUIRED)
|
||||
+ notify_status = OFONO_USSD_STATUS_ACTION_REQUIRED;
|
||||
+ }
|
||||
+
|
||||
+ ofono_ussd_notify(ussd, notify_status, gsm_dcs,
|
||||
+ qmi_ussd->data, qmi_ussd->length);
|
||||
+ return;
|
||||
+
|
||||
+error:
|
||||
+ ofono_ussd_notify(ussd, OFONO_USSD_STATUS_TERMINATED, 0, NULL, 0);
|
||||
+}
|
||||
+
|
||||
static void async_orig_ind(struct qmi_result *result, void *user_data)
|
||||
{
|
||||
struct ofono_ussd *ussd = user_data;
|
||||
@@ -141,6 +182,9 @@ static void create_voice_cb(struct qmi_service *service, void *user_data)
|
||||
|
||||
data->voice = qmi_service_ref(service);
|
||||
|
||||
+ qmi_service_register(data->voice, QMI_VOICE_USSD_IND,
|
||||
+ async_ind, ussd, NULL);
|
||||
+
|
||||
qmi_service_register(data->voice, QMI_VOICE_ASYNC_ORIG_USSD,
|
||||
async_orig_ind, ussd, NULL);
|
||||
|
||||
--
|
||||
cgit 1.2.3-1.el7
|
||||
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
pkgname=ofono
|
||||
pkgver=9999
|
||||
_pkgver=1.31
|
||||
pkgrel=10
|
||||
_pkgver=1.32
|
||||
pkgrel=11
|
||||
pkgdesc="Infrastructure for building mobile telephony (GSM/UMTS) applications [$_pkgver]"
|
||||
url="https://01.org/ofono"
|
||||
arch="armhf armv7 aarch64"
|
||||
|
|
@ -14,7 +14,6 @@ makedepends="glib-dev dbus-dev ell-dev eudev-dev
|
|||
autoconf automake libtool"
|
||||
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-scripts::noarch"
|
||||
source="https://www.kernel.org/pub/linux/network/ofono/ofono-$_pkgver.tar.xz
|
||||
fix-explicit-bzero.patch
|
||||
fix-TEMP_FAILURE_RETRY.patch
|
||||
skip-broken-test.patch
|
||||
support-smdpkt.patch
|
||||
|
|
@ -26,11 +25,11 @@ source="https://www.kernel.org/pub/linux/network/ofono/ofono-$_pkgver.tar.xz
|
|||
0005-qmimodem-implement-voice-calls.patch
|
||||
0006-qmimodem-Fix-dialing-to-an-international-number.patch
|
||||
0007-qmimodem-implement-dtmf.patch
|
||||
0008-qmimodem-add-ussd-indication-support.patch
|
||||
$pkgname.initd
|
||||
$pkgname-auto-enable.initd
|
||||
udev.rules
|
||||
ofono-wheel.conf"
|
||||
ofono-wheel.conf
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$_pkgver"
|
||||
|
||||
# Workaround build freeze with QEMU user emulation
|
||||
|
|
@ -76,11 +75,11 @@ scripts() {
|
|||
amove usr/lib/ofono/test
|
||||
}
|
||||
|
||||
sha512sums="377cda34dcc92d1f339a4b3271de5a14afaf309061c4467e5af18089cd821e65c0d8ad29d07e96d0f0480bb51554b284afb6bc2b9da586cc30dc0c1440612b20 ofono-1.31.tar.xz
|
||||
7367464a8983969c9a78c1e4f8759a17eb47f6c61c94b088d749c83bb7ef5d19e037cadedd7ef5d34a0fdfe837fa8059e963f4fb2b14148e4a80f00e7cb29286 fix-explicit-bzero.patch
|
||||
sha512sums="
|
||||
f37c82cc4c0556e5c68a5a9a342db93dd1ef7a152f0edd1da7d8b9272c7f92ae31255d6ebf2d8cf39c9a4ae67c6ffb72960707e938d61172998a732f40ffc84d ofono-1.32.tar.xz
|
||||
687a2fd592add40122b789073ab9970d6e966752fdecc4077afe1c1bba705fe541dd0e457094f1d9cde747c571b7810b5b1a30835a3f1869bcd810751d5bf76f fix-TEMP_FAILURE_RETRY.patch
|
||||
777ab2e13eebd1ccbe12a304310a83b262a5d934207c6a8d410e75aff380838eed1a52f3c2fe0d80c1e7db7faa9b55bf17e78a1e1acd8cfb95a3c6aef49c5b67 skip-broken-test.patch
|
||||
f7f398f77877e78087b691f78ee0f3af5f99d0f15d01d107fbefff16118db4c1e0261c032bd97836a6c30d8b8a4be9d755900c5f9ea48d274a53d9c39c92683b support-smdpkt.patch
|
||||
57c6896d44b5417aa4bfee4d14db01d5006a52f6ab5aa1a2fec367a5ccd1d676e3af13d29f237694c3fc1082654dbae4fdaa86825b541ce204a3a6988c03ac8b support-smdpkt.patch
|
||||
80a0ea003c4dd3afd8bea7abbfa21b7045b28e46e0a7fcd908a2695999e29657e047eb8d346f81a41ad659e8ce5c4a0f752210594c7e3b7f3c7b04c366d2ddc5 wda-set-data-format.patch
|
||||
ad25dcc34bf710287c9a03fdcd61f2f2fd675691f55be30dbe7c8421753aa857906dd23b2d4f7f752fbc62caf2857b00bf5eaa8916e62718d1da7d0abc083ca0 0001-common-create-GList-helper-ofono_call_compare.patch
|
||||
7e2f7fb1e661cc9f2180c55c701823050328ee906171148e4ba200e6365f1c40382dab608e78e383e62c9029a6a41d7d7a18b971132df30839f625eb576cb080 0002-common-atmodem-move-at_util_call_compare_by_status-t.patch
|
||||
|
|
@ -89,8 +88,8 @@ ad25dcc34bf710287c9a03fdcd61f2f2fd675691f55be30dbe7c8421753aa857906dd23b2d4f7f75
|
|||
72d0f63c091d4b1fc5b405ec67e73f377887ee3dffd4791272122462bf4feaeec207de9b177632756e1f973a7bf7bde119c6ec6556568a6307287ba43998b7a0 0005-qmimodem-implement-voice-calls.patch
|
||||
6dd4d5f829d66b5b9a13aed6d5a991a2cd3dee6db04a122bcc1d87d0eddc37637468bec58f9fe6027c89eac3b14411201d324150e6be4b103622340da6a599fe 0006-qmimodem-Fix-dialing-to-an-international-number.patch
|
||||
7d28bcec2dc8b13003c05d74202aced9c86efe35447fbcb0f444fb04447fab8e80a47fa20a662aa0148d42c25333b3261e3cd570991deee9cdfd76effd24af7e 0007-qmimodem-implement-dtmf.patch
|
||||
6b3acab4124d029bf719e08cc783d46514501066d5ee487e88b37dfd4f7e2552f1f56ff6f80362ef0462c51f3799bba3d451b447e615e51df9860a24324b11f0 0008-qmimodem-add-ussd-indication-support.patch
|
||||
bc76c404a7de626210dbd78f659444567a95b6e6d8db0661d5d67ea361e2941ad55242d43a5957995817145d4d5323476fbc42d1830b20608a5e90a7a4ba1194 ofono.initd
|
||||
54a2cb55547e77c22a98c4260f2e94d9327d5d98e1b604f9413a7380ae4489247a97561cc2ab39476bc6e6fb5e673dca8053218b18ac4626addb51ecb29f0167 ofono-auto-enable.initd
|
||||
28ba914e171ba7f0dcc4be24f2bd078a8db6b2c0fdbb29845b2702f00f9cf64d0e9ecb277e5d7f8113ef450eb9044e542e7093129ecd67bef1c9e9328756391c udev.rules
|
||||
72cd0cd4bee1f885a990c84f7ed3ef27e0d9d2db37d9a486342204152cb02a67d5197e8014dfea59f1a95285c674695b3dc3cb2b53941781bcfc9b73d5580b1f ofono-wheel.conf"
|
||||
6149be86d6feeb63f8a16e067be5b148551b8121340c257d778aea2082fb09baf5bf479c57f87e3c24a4dc988da15a2f0dec8b4bf13f72e67e025933cb6986ff udev.rules
|
||||
72cd0cd4bee1f885a990c84f7ed3ef27e0d9d2db37d9a486342204152cb02a67d5197e8014dfea59f1a95285c674695b3dc3cb2b53941781bcfc9b73d5580b1f ofono-wheel.conf
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
diff --git a/ell/missing.h b/ell/missing.h
|
||||
index 37d5586..649a5ac 100644
|
||||
--- a/ell/missing.h
|
||||
+++ b/ell/missing.h
|
||||
@@ -54,11 +54,3 @@
|
||||
# define __NR_getrandom 0xffffffff
|
||||
# endif
|
||||
#endif
|
||||
-
|
||||
-#ifndef HAVE_EXPLICIT_BZERO
|
||||
-static inline void explicit_bzero(void *s, size_t n)
|
||||
-{
|
||||
- memset(s, 0, n);
|
||||
- __asm__ __volatile__ ("" : : "r"(s) : "memory");
|
||||
-}
|
||||
-#endif
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
From 71737365a6af9f736a816efa7ec15783ab82de6b Mon Sep 17 00:00:00 2001
|
||||
From 7045385547867b629c80cbcadf68c1586b98c51c Mon Sep 17 00:00:00 2001
|
||||
From: Joey Hewitt <joey@joeyhewitt.com>
|
||||
Date: Fri, 19 Jul 2019 22:02:07 +0200
|
||||
Subject: [PATCH] support smdpkt
|
||||
|
||||
---
|
||||
plugins/udevng.c | 65 +++++++++++++++++++++++++++---------------------
|
||||
1 file changed, 36 insertions(+), 29 deletions(-)
|
||||
plugins/udevng.c | 66 +++++++++++++++++++++++++++---------------------
|
||||
1 file changed, 37 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/plugins/udevng.c b/plugins/udevng.c
|
||||
index 4a38621b..ba7d72f0 100644
|
||||
index 34ac1cc0..0d594998 100644
|
||||
--- a/plugins/udevng.c
|
||||
+++ b/plugins/udevng.c
|
||||
@@ -203,41 +203,46 @@ static gboolean setup_gobi(struct modem_info *modem)
|
||||
|
|
@ -87,15 +87,16 @@ index 4a38621b..ba7d72f0 100644
|
|||
|
||||
|
||||
ofono_modem_set_string(modem->modem, "Device", qmi);
|
||||
@@ -2024,6 +2029,8 @@ static void enumerate_devices(struct udev *context)
|
||||
@@ -2074,6 +2079,9 @@ static void enumerate_devices(struct udev *context)
|
||||
return;
|
||||
|
||||
udev_enumerate_add_match_subsystem(enumerate, "tty");
|
||||
+ udev_enumerate_add_match_subsystem(enumerate, "wwan");
|
||||
+ udev_enumerate_add_match_subsystem(enumerate, "smdpkt");
|
||||
+ udev_enumerate_add_match_subsystem(enumerate, "rpmsg");
|
||||
udev_enumerate_add_match_subsystem(enumerate, "usb");
|
||||
udev_enumerate_add_match_subsystem(enumerate, "usbmisc");
|
||||
udev_enumerate_add_match_subsystem(enumerate, "net");
|
||||
--
|
||||
2.27.0
|
||||
2.31.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,2 +1,3 @@
|
|||
SYMLINK=="modem", SUBSYSTEM=="smdpkt", ENV{OFONO_DRIVER}="gobi"
|
||||
SYMLINK=="modem", SUBSYSTEM=="rpmsg", ENV{OFONO_DRIVER}="gobi", ENV{OFONO_NETWORK_INTERFACE}="rmnet0"
|
||||
SUBSYSTEM=="wwan", ATTR{type}=="QMI", ENV{OFONO_DRIVER}="gobi", ENV{OFONO_NETWORK_INTERFACE}="rmnet0"
|
||||
|
|
|
|||
Loading…
Reference in a new issue