temp/eg25-manager: clean up modem_iface when MM disappears (MR 2185)

This commit is contained in:
Dylan Van Assche 2021-05-22 09:03:59 +02:00 committed by Clayton Craft
parent e87d0ad2a6
commit b2e1af04e6
No known key found for this signature in database
GPG key ID: 7A3461CA187CEA54
2 changed files with 37 additions and 4 deletions

View file

@ -0,0 +1,28 @@
From 705950bb399781a291a3998014f916fc1effce16 Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Thu, 15 Apr 2021 09:29:36 +0530
Subject: [PATCH 1/8] mm-iface: clean out modem_iface if mm disappears
otherwise we will be stuck in state where restarting of mm will not
reset the modem_iface and it will loop through hard resetting modem
---
src/mm-iface.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/mm-iface.c b/src/mm-iface.c
index d6a74f8..0409236 100644
--- a/src/mm-iface.c
+++ b/src/mm-iface.c
@@ -183,6 +183,9 @@ static void mm_iface_clean(struct EG25Manager *manager)
g_free(manager->modem_usb_id);
manager->modem_usb_id = NULL;
}
+ if (manager->modem_iface == MODEM_IFACE_MODEMMANAGER) {
+ manager->modem_iface = MODEM_IFACE_NONE;
+ }
}
static void mm_vanished_cb(GDBusConnection *connection,
--
2.31.1

View file

@ -2,8 +2,8 @@
# Ofono compatibility fixes needed for Plasma Mobile
pkgname=eg25-manager
pkgver=0.2.1_git20210317
_commit="ea19b0271cf587c992c315a76b995e42b91f7d74"
pkgver=0.3.0_git20210522
_commit="73e16f76994b1d3c587796a35766cc668e30c0cd"
pkgrel=0
pkgdesc="Daemon for managing the Quectel EG25 modem"
url="https://gitlab.com/mobian1/devices/eg25-manager"
@ -16,11 +16,13 @@ makedepends="
libusb-dev
meson
modemmanager-dev
curl-dev
"
source="
https://gitlab.com/mobian1/devices/eg25-manager/-/archive/$_commit/eg25-manager-$_commit.tar.gz
eg25-manager.confd
eg25-manager.initd
0001-mm-iface-clean-out-modem_iface-if-mm-disappears.patch
"
options="!check" # no tests
subpackages="$pkgname-openrc"
@ -44,6 +46,9 @@ package() {
install -Dm644 "$srcdir"/eg25-manager.confd "$pkgdir"/etc/conf.d/eg25-manager
}
sha512sums="ed8aaef8e9d296b093a686a2c1df091fa01d6f374ca26e5cd36b0e4045d4d622aba59a4c57276504c92bd73f37ba0ec22bc6dfde4a14cf35e4a4abe747eb9eda eg25-manager-ea19b0271cf587c992c315a76b995e42b91f7d74.tar.gz
sha512sums="
2b0d706c893744529e035e8dc70b381362e39ddd2be705e346f0fd88e4907093e59b30800ad5ecb90638338b25bb51308349fb26de2c786197aeed8c1fa9c68a eg25-manager-73e16f76994b1d3c587796a35766cc668e30c0cd.tar.gz
55936830afad2968a214fb39cfe1a9db50421dc2ff4f67d04f08f6bd2b094c3ab46799cfc7743bbc5032682d98d1216203adf5264353a05134bea58524ac070b eg25-manager.confd
0dd866ce18bac37c3832a463205402f5b34a520e1a57cc37658fb37e21a173fbba2cfab223111c68af768be1d3feeb23e41dbaf6d8dc14a2b2c0c088cf3df041 eg25-manager.initd"
0dd866ce18bac37c3832a463205402f5b34a520e1a57cc37658fb37e21a173fbba2cfab223111c68af768be1d3feeb23e41dbaf6d8dc14a2b2c0c088cf3df041 eg25-manager.initd
029dce7e7d6e79faab2a63acde2fe76109e5e269bf38d72617d00ffbb89001f75b604e79290d449db7a6f960f9872eb41c2d0ab4a6d82d7563b66e954cd4ffa8 0001-mm-iface-clean-out-modem_iface-if-mm-disappears.patch
"