From: Denis Kenzior <denkenz@gmail.com>
To: ofono@lists.linux.dev
Cc: Denis Kenzior <denkenz@gmail.com>
Subject: [PATCH v2 14/15] gprs-provision: Remove no longer used atom/driver
Date: Tue, 19 Dec 2023 12:37:11 -0600 [thread overview]
Message-ID: <20231219184016.420116-14-denkenz@gmail.com> (raw)
In-Reply-To: <20231219184016.420116-1-denkenz@gmail.com>
---
Makefile.am | 2 +-
include/gprs-provision.h | 13 -----
src/gprs-provision.c | 101 ---------------------------------------
3 files changed, 1 insertion(+), 115 deletions(-)
delete mode 100644 src/gprs-provision.c
diff --git a/Makefile.am b/Makefile.am
index 1a97a1f1..15d220f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -702,7 +702,7 @@ src_ofonod_SOURCES = $(builtin_sources) $(gatchat_sources) src/ofono.ver \
src/simfs.c src/simfs.h src/audio-settings.c \
src/smsagent.c src/smsagent.h src/ctm.c \
src/sim-auth.c \
- src/message.h src/message.c src/gprs-provision.c \
+ src/message.h src/message.c \
src/emulator.c src/location-reporting.c \
src/gnss.c \
src/gnssagent.c src/gnssagent.h \
diff --git a/include/gprs-provision.h b/include/gprs-provision.h
index 75808e66..ac0f5905 100644
--- a/include/gprs-provision.h
+++ b/include/gprs-provision.h
@@ -42,19 +42,6 @@ struct ofono_gprs_provision_data {
char *message_center;
};
-struct ofono_gprs_provision_driver {
- const char *name;
- int priority;
- int (*get_settings)(const char *mcc, const char *mnc, const char *spn,
- struct ofono_gprs_provision_data **settings,
- int *count);
-};
-
-int ofono_gprs_provision_driver_register(
- const struct ofono_gprs_provision_driver *driver);
-void ofono_gprs_provision_driver_unregister(
- const struct ofono_gprs_provision_driver *driver);
-
#ifdef __cplusplus
}
#endif
diff --git a/src/gprs-provision.c b/src/gprs-provision.c
deleted file mode 100644
index 011d5a8d..00000000
--- a/src/gprs-provision.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *
- * oFono - Open Source Telephony
- *
- * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <glib.h>
-#include "ofono.h"
-
-static GSList *g_drivers = NULL;
-
-void __ofono_gprs_provision_free_settings(
- struct ofono_gprs_provision_data *settings,
- int count)
-{
- int i;
-
- for (i = 0; i < count; i++) {
- g_free(settings[i].name);
- g_free(settings[i].apn);
- g_free(settings[i].username);
- g_free(settings[i].password);
- g_free(settings[i].message_proxy);
- g_free(settings[i].message_center);
- }
-
- g_free(settings);
-}
-
-ofono_bool_t __ofono_gprs_provision_get_settings(const char *mcc,
- const char *mnc, const char *spn,
- struct ofono_gprs_provision_data **settings,
- int *count)
-{
- GSList *d;
-
- if (mcc == NULL || strlen(mcc) == 0 || mnc == NULL || strlen(mnc) == 0)
- return FALSE;
-
- for (d = g_drivers; d != NULL; d = d->next) {
- const struct ofono_gprs_provision_driver *driver = d->data;
-
- if (driver->get_settings == NULL)
- continue;
-
- DBG("Calling provisioning plugin '%s'", driver->name);
-
- if (driver->get_settings(mcc, mnc, spn, settings, count) < 0)
- continue;
-
- return TRUE;
- }
-
- return FALSE;
-}
-
-static gint compare_priority(gconstpointer a, gconstpointer b)
-{
- const struct ofono_gprs_provision_driver *plugin1 = a;
- const struct ofono_gprs_provision_driver *plugin2 = b;
-
- return plugin2->priority - plugin1->priority;
-}
-
-int ofono_gprs_provision_driver_register(
- const struct ofono_gprs_provision_driver *driver)
-{
- DBG("driver: %p name: %s", driver, driver->name);
-
- g_drivers = g_slist_insert_sorted(g_drivers, (void *) driver,
- compare_priority);
- return 0;
-}
-
-void ofono_gprs_provision_driver_unregister(
- const struct ofono_gprs_provision_driver *driver)
-{
- DBG("driver: %p name: %s", driver, driver->name);
-
- g_drivers = g_slist_remove(g_drivers, driver);
-}
--
2.43.0
next prev parent reply other threads:[~2023-12-19 18:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-19 18:36 [PATCH v2 01/15] build: Fix typo that breaks --fsanitize=leak check Denis Kenzior
2023-12-19 18:36 ` [PATCH v2 02/15] include: Allow multiple context types Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 03/15] module: Add support for ofono modules Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 04/15] doc: docs for intermediate provisioning db format Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 05/15] tools: Add provision.py Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 06/15] core: Add utilities to read the provisioning db Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 07/15] tools: lookup-apn: Use the new provision_db utils Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 08/15] provision: Import initial JSON db Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 09/15] provision: Add new module Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 10/15] gprs: Use the new provisioning module Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 11/15] plugins: Remove support for file-provision plugin Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 12/15] plugins: provision: Remove mbpi support Denis Kenzior
2023-12-19 18:37 ` [PATCH v2 13/15] examples: Remove provision example Denis Kenzior
2023-12-19 18:37 ` Denis Kenzior [this message]
2023-12-19 18:37 ` [PATCH v2 15/15] provision: Detect duplicates Denis Kenzior
2024-01-02 17:18 ` [PATCH v2 01/15] build: Fix typo that breaks --fsanitize=leak check Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231219184016.420116-14-denkenz@gmail.com \
--to=denkenz@gmail.com \
--cc=ofono@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).