Add skeleton for storage drivers

diff --git a/include/Makefile.am b/include/Makefile.am
index 67ffb4e..84eece9 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,7 +2,7 @@
 includedir = @includedir@/connman
 
 include_HEADERS = types.h log.h plugin.h security.h resolver.h \
-                                               device.h network.h
+                                       storage.h device.h network.h
 
 noinst_HEADERS = driver.h element.h property.h ipv4.h rtnl.h dbus.h
 

diff --git a/include/storage.h b/include/storage.h
new file mode 100644 (file)
index 0000000..de4107c
--- /dev/null
+++ b/include/storage.h
@@ -0,0 +1,56 @@
+/*
+ *
+ *  Connection Manager
+ *
+ *  Copyright (C) 2007-2009  Intel Corporation. All rights reserved.
+ *
+ *  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
+ *
+ */
+
+#ifndef __CONNMAN_STORAGE_H
+#define __CONNMAN_STORAGE_H
+
+#include <connman/device.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * SECTION:storage
+ * @title: Storage premitives
+ * @short_description: Functions for registering storage modules
+ */
+
+#define CONNMAN_STORAGE_PRIORITY_LOW      -100
+#define CONNMAN_STORAGE_PRIORITY_DEFAULT     0
+#define CONNMAN_STORAGE_PRIORITY_HIGH      100
+
+struct connman_storage {
+       const char *name;
+       int priority;
+       enum connman_device_type device_type;
+       int (*device_load) (struct connman_device *device);
+       int (*device_save) (struct connman_device *device);
+};
+
+extern int connman_storage_register(struct connman_storage *storage);
+extern void connman_storage_unregister(struct connman_storage *storage);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CONNMAN_STORAGE_H */

diff --git a/src/connman.h b/src/connman.h
index 87fe927..a87c49f 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -39,9 +39,6 @@ DBusMessage *__connman_error_not_supported(DBusMessage *msg);
 
 int __connman_selftest(void);
 
-int __connman_storage_init(void);
-void __connman_storage_cleanup(void);
-
 int __connman_manager_init(DBusConnection *conn, gboolean compat);
 void __connman_manager_cleanup(void);
 
@@ -84,6 +81,11 @@ void __connman_resolver_cleanup(void);
 
 int __connman_resolver_selftest(void);
 
+#include <connman/storage.h>
+
+int __connman_storage_init(void);
+void __connman_storage_cleanup(void);
+
 #include <connman/driver.h>
 
 void __connman_driver_rescan(struct connman_driver *driver);

diff --git a/src/storage.c b/src/storage.c
index 41cfd42..1266fc2 100644 (file)
--- a/src/storage.c
+++ b/src/storage.c
@@ -25,6 +25,47 @@
 
 #include "connman.h"
 
+static GSList *storage_list = NULL;
+
+static gint compare_priority(gconstpointer a, gconstpointer b)
+{
+       const struct connman_storage *storage1 = a;
+       const struct connman_storage *storage2 = b;
+
+       return storage2->priority - storage1->priority;
+}
+
+/**
+ * connman_storage_register:
+ * @storage: storage module
+ *
+ * Register a new storage module
+ *
+ * Returns: %0 on success
+ */
+int connman_storage_register(struct connman_storage *storage)
+{
+       DBG("storage %p name %s", storage, storage->name);
+
+       storage_list = g_slist_insert_sorted(storage_list, storage,
+                                                       compare_priority);
+
+       return 0;
+}
+
+/**
+ * connman_storage_unregister:
+ * @storage: storage module
+ *
+ * Remove a previously registered storage module
+ */
+void connman_storage_unregister(struct connman_storage *storage)
+{
+       DBG("storage %p name %s", storage, storage->name);
+
+       storage_list = g_slist_remove(storage_list, storage);
+}
+
 int __connman_storage_init(void)
 {
        DBG("");