| Message ID | 20240613214134.1056517-1-denkenz@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 540689ac89b576880f235ab2bb9999c545ebc433 |
| Headers | show |
| Series | [v2,01/23] gobi: Remove phonebook and stk atom creation | expand |
Hello: This series was applied to ofono.git (master) by Denis Kenzior <denkenz@gmail.com>: On Thu, 13 Jun 2024 16:41:10 -0500 you wrote: > These atoms do not exist in the current qmimodem driver. Remove them > until they're added back in. > --- > plugins/gobi.c | 26 +++----------------------- > 1 file changed, 3 insertions(+), 23 deletions(-) Here is the summary with links: - [v2,01/23] gobi: Remove phonebook and stk atom creation https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=540689ac89b5 - [v2,02/23] qmi: lookup shared family directly by type https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=eda7b48d5737 - [v2,03/23] core: allow multiple args in atom constructors https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=27c8b1d178c3 - [v2,04/23] unit: Update unit tests to the new API https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=c7ece29ab1f5 - [v2,05/23] core: Support register on probe flag https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=063856a2ba93 - [v2,06/23] qmi: introduce qmi_service_clone https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=c6226a486eb1 - [v2,07/23] gobi: request needed services at .enable() https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=67a899089ac8 - [v2,08/23] qmi: devinfo: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=97dd4a15230d - [v2,09/23] qmi: sim-legacy: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=ab6c6d22a7b9 - [v2,10/23] qmi: voicecall: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=b4d86ddb4bb1 - [v2,11/23] qmi: call-barring: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=5ce6c2a31ed3 - [v2,12/23] qmi: call-forwarding: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=bb9f9390831b - [v2,13/23] qmi: call-settings: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=c43de054332a - [v2,14/23] qmi: ussd: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=d627f3d6b991 - [v2,15/23] qmi: location-reporting: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=0f2341fe9753 - [v2,16/23] qmi: sms: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=b5c96dee90f6 - [v2,17/23] qmi: netreg: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=2af37b3a96c3 - [v2,18/23] qmi: netmon: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=75dd97480610 - [v2,19/23] qmi: lte: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=48230640815e - [v2,20/23] qmi: gprs-context: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=841b2e5d3f8d - [v2,21/23] qmi: sim: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=c571d73dc1c7 - [v2,22/23] qmi: gprs: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=607e7ef2f89e - [v2,23/23] qmi: radio-settings: Drop use of qmi_service_create_shared https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=1e4b61884a6f You are awesome, thank you!
diff --git a/plugins/gobi.c b/plugins/gobi.c index 7c105eef992a..10ce2acc0cca 100644 --- a/plugins/gobi.c +++ b/plugins/gobi.c @@ -51,12 +51,9 @@ #define GOBI_WMS (1 << 2) #define GOBI_WDS (1 << 3) #define GOBI_PDS (1 << 4) -#define GOBI_PBM (1 << 5) -#define GOBI_UIM (1 << 6) -#define GOBI_CAT (1 << 7) -#define GOBI_CAT_OLD (1 << 8) -#define GOBI_VOICE (1 << 9) -#define GOBI_WDA (1 << 10) +#define GOBI_UIM (1 << 5) +#define GOBI_VOICE (1 << 6) +#define GOBI_WDA (1 << 7) enum qmi_protocol { QMI_PROTOCOL_QMUX, @@ -411,7 +408,6 @@ static void discover_cb(void *user_data) { struct ofono_modem *modem = user_data; struct gobi_data *data = ofono_modem_get_data(modem); - uint16_t major, minor; DBG(""); @@ -427,16 +423,8 @@ static void discover_cb(void *user_data) data->features |= GOBI_WDA; if (qmi_device_has_service(data->device, QMI_SERVICE_PDS)) data->features |= GOBI_PDS; - if (qmi_device_has_service(data->device, QMI_SERVICE_PBM)) - data->features |= GOBI_PBM; if (qmi_device_has_service(data->device, QMI_SERVICE_UIM)) data->features |= GOBI_UIM; - if (qmi_device_has_service(data->device, QMI_SERVICE_CAT)) - data->features |= GOBI_CAT; - if (qmi_device_get_service_version(data->device, - QMI_SERVICE_CAT_OLD, &major, &minor)) - if (major > 0) - data->features |= GOBI_CAT_OLD; if (qmi_device_has_service(data->device, QMI_SERVICE_VOICE)) data->features |= GOBI_VOICE; @@ -748,14 +736,6 @@ static void gobi_post_sim(struct ofono_modem *modem) ofono_lte_create(modem, 0, "qmimodem", data->device); - if (data->features & GOBI_CAT) - ofono_stk_create(modem, 0, "qmimodem", data->device); - else if (data->features & GOBI_CAT_OLD) - ofono_stk_create(modem, 1, "qmimodem", data->device); - - if (data->features & GOBI_PBM) - ofono_phonebook_create(modem, 0, "qmimodem", data->device); - if (data->features & GOBI_NAS) ofono_radio_settings_create(modem, 0, "qmimodem", data->device);