From 4fe64c1ea26c8d0d5c2d51c495a83824613cf2e4 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 14 Oct 2008 18:05:16 +0200 Subject: [PATCH] Add first step towards providing device abstraction --- include/Makefile.am | 2 +- include/device.h | 83 ++++++++++++++++++++++++++++ src/Makefile.am | 3 +- src/device.c | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 238 insertions(+), 2 deletions(-) create mode 100644 include/device.h create mode 100644 src/device.c diff --git a/include/Makefile.am b/include/Makefile.am index 76057be..74a8cb7 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -2,7 +2,7 @@ includedir = @includedir@/connman include_HEADERS = log.h plugin.h security.h driver.h element.h property.h \ - rtnl.h dbus.h + device.h rtnl.h dbus.h MAINTAINERCLEANFILES = Makefile.in diff --git a/include/device.h b/include/device.h new file mode 100644 index 0000000..09d2856 --- /dev/null +++ b/include/device.h @@ -0,0 +1,83 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2008 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_DEVICE_H +#define __CONNMAN_DEVICE_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** + * SECTION:driver + * @title: Driver premitives + * @short_description: Functions for registering drivers + */ + +enum connman_device_type { + CONNMAN_DEVICE_TYPE_UNKNOWN = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN, + CONNMAN_DEVICE_TYPE_FAKE = CONNMAN_ELEMENT_SUBTYPE_FAKE, + CONNMAN_DEVICE_TYPE_ETHERNET = CONNMAN_ELEMENT_SUBTYPE_ETHERNET, + CONNMAN_DEVICE_TYPE_WIFI = CONNMAN_ELEMENT_SUBTYPE_WIFI, + CONNMAN_DEVICE_TYPE_WIMAX = CONNMAN_ELEMENT_SUBTYPE_WIMAX, + CONNMAN_DEVICE_TYPE_MODEM = CONNMAN_ELEMENT_SUBTYPE_MODEM, + CONNMAN_DEVICE_TYPE_BLUETOOTH = CONNMAN_ELEMENT_SUBTYPE_BLUETOOTH, +}; + +enum connman_device_state { + CONNMAN_DEVICE_STATE_UNKNOWN = 0, + CONNMAN_DEVICE_STATE_OFF = 1, +}; + +struct connman_device_driver; + +struct connman_device { + struct connman_element *element; + enum connman_device_state state; + + struct connman_device_driver *driver; + void *driver_data; + + GSList *networks; +}; + +extern int connman_device_set_enabled(struct connman_device *device, + gboolean enabled); + +struct connman_device_driver { + const char *name; + enum connman_device_type type; + int priority; + int (*probe) (struct connman_device *device); + void (*remove) (struct connman_device *device); + int (*scan) (struct connman_device *device); +}; + +extern int connman_device_driver_register(struct connman_device_driver *driver); +extern void connman_device_driver_unregister(struct connman_device_driver *driver); + +#ifdef __cplusplus +} +#endif + +#endif /* __CONNMAN_DEVICE_H */ diff --git a/src/Makefile.am b/src/Makefile.am index 52082cd..afa1ce9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,8 @@ DISTCLEANFILES = $(service_DATA) sbin_PROGRAMS = connmand connmand_SOURCES = main.c connman.h log.c error.c plugin.c profile.c \ - element.c security.c storage.c manager.c agent.c rtnl.c + element.c device.c security.c storage.c \ + manager.c agent.c rtnl.c connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GTHREAD_LIBS@ -ldl diff --git a/src/device.c b/src/device.c new file mode 100644 index 0000000..6b73438 --- /dev/null +++ b/src/device.c @@ -0,0 +1,152 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2008 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 + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include "connman.h" + +static GSList *driver_list = NULL; + +static gboolean match_driver(struct connman_device *device, + struct connman_device_driver *driver) +{ + if (device->element->subtype == driver->type || + driver->type == CONNMAN_DEVICE_TYPE_UNKNOWN) + return TRUE; + + return FALSE; +} + +static int device_probe(struct connman_element *element) +{ + struct connman_device *device; + GSList *list; + + DBG("element %p name %s", element, element->name); + + device = g_try_new0(struct connman_device, 1); + if (device == NULL) + return -ENOMEM; + + device->element = element; + + for (list = driver_list; list; list = list->next) { + struct connman_device_driver *driver = list->data; + + if (match_driver(device, driver) == FALSE) + continue; + + DBG("driver %p name %s", driver, driver->name); + + if (driver->probe(device) == 0) { + device->driver = driver; + connman_element_set_data(element, device); + return 0; + } + } + + g_free(device); + + return -ENODEV; +} + +static int device_remove(struct connman_element *element) +{ + struct connman_device *device = connman_element_get_data(element); + + DBG("element %p name %s", element, element->name); + + if (device->driver && device->driver->remove) + device->driver->remove(device); + + connman_element_set_data(element, NULL); + + g_free(device); + + return 0; +} + +static struct connman_driver device_driver = { + .name = "device", + .type = CONNMAN_ELEMENT_TYPE_DEVICE, + .priority = CONNMAN_DRIVER_PRIORITY_LOW, + .probe = device_probe, + .remove = device_remove, +}; + +int __connman_device_init(void) +{ + DBG(""); + + return connman_driver_register(&device_driver); +} + +void __connman_device_cleanup(void) +{ + DBG(""); + + connman_driver_unregister(&device_driver); +} + +static gint compare_priority(gconstpointer a, gconstpointer b) +{ + const struct connman_device_driver *driver1 = a; + const struct connman_device_driver *driver2 = b; + + return driver2->priority - driver1->priority; +} + +/** + * connman_device_driver_register: + * @driver: device driver definition + * + * Register a new device driver + * + * Returns: %0 on success + */ +int connman_device_driver_register(struct connman_device_driver *driver) +{ + DBG("driver %p name %s", driver, driver->name); + + driver_list = g_slist_insert_sorted(driver_list, driver, + compare_priority); + + __connman_driver_rescan(&device_driver); + + return 0; +} + +/** + * connman_device_driver_unregister: + * @driver: device driver definition + * + * Remove a previously registered device driver + */ +void connman_device_driver_unregister(struct connman_device_driver *driver) +{ + DBG("driver %p name %s", driver, driver->name); + + driver_list = g_slist_remove(driver_list, driver); +} -- 2.7.4