This email list is read-only. Emails sent to this list will be discarded ---------------------------------- .gitignore | 1 + include/device.h | 15 ++++++--------- plugins/ethernet.c | 3 +++ plugins/supplicant.c | 2 ++ src/detect.c | 2 ++ src/device.c | 11 +++++++++-- 6 files changed, 23 insertions(+), 11 deletions(-)
New commits: commit 4c9720135427e44a128e80462acec3cf55eba31d Author: Marcel Holtmann <[email protected]> Date: Sun Dec 28 07:40:50 2008 +0100 Set correct subtype for transition period commit 724dd78ca41f3a77f4fa03d359d420d89dd92083 Author: Marcel Holtmann <[email protected]> Date: Sun Dec 28 07:33:11 2008 +0100 Add udhcpc-script to list of ignored files commit 94b1272c0d8f0c33d56765a0c51a0c49802853bd Author: Marcel Holtmann <[email protected]> Date: Sun Dec 28 07:32:21 2008 +0100 Fix list of device types commit 62dd8d00c2f5b7bf19b44e7541aa419cd50dd104 Author: Marcel Holtmann <[email protected]> Date: Sun Dec 28 07:21:07 2008 +0100 Add missing includes Diff in this email is a maximum of 400 lines. diff --git a/.gitignore b/.gitignore index 40db380..9c29734 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ src/connman.exp src/connman.ver src/connman.service scripts/connman +scripts/udhcpc-script scripts/dhclient-script client/cm doc/*.bak diff --git a/include/device.h b/include/device.h index 6d172e8..7d26cc9 100644 --- a/include/device.h +++ b/include/device.h @@ -27,7 +27,6 @@ extern "C" { #endif #include <connman/network.h> -#include <connman/element.h> /** * SECTION:device @@ -36,15 +35,13 @@ extern "C" { */ 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, + CONNMAN_DEVICE_TYPE_UNKNOWN = 0, + CONNMAN_DEVICE_TYPE_ETHERNET = 1, + CONNMAN_DEVICE_TYPE_WIFI = 2, + CONNMAN_DEVICE_TYPE_WIMAX = 3, + CONNMAN_DEVICE_TYPE_BLUETOOTH = 4, + CONNMAN_DEVICE_TYPE_HSO = 11, CONNMAN_DEVICE_TYPE_VENDOR = 42, - CONNMAN_DEVICE_TYPE_HSO, }; enum connman_device_mode { diff --git a/plugins/ethernet.c b/plugins/ethernet.c index 5ddc765..7b5ca41 100644 --- a/plugins/ethernet.c +++ b/plugins/ethernet.c @@ -23,6 +23,7 @@ #include <config.h> #endif +#include <errno.h> #include <unistd.h> #include <string.h> #include <sys/ioctl.h> @@ -31,6 +32,8 @@ #include <linux/netlink.h> #include <linux/rtnetlink.h> +#include <glib.h> + #include <connman/plugin.h> #include <connman/device.h> #include <connman/rtnl.h> diff --git a/plugins/supplicant.c b/plugins/supplicant.c index daff3a2..d907534 100644 --- a/plugins/supplicant.c +++ b/plugins/supplicant.c @@ -27,6 +27,8 @@ #include <string.h> #include <dbus/dbus.h> +#include <glib.h> + #include <connman/log.h> #include <connman/dbus.h> diff --git a/src/detect.c b/src/detect.c index bac075b..c6988df 100644 --- a/src/detect.c +++ b/src/detect.c @@ -35,6 +35,8 @@ #include <linux/if_arp.h> #include <linux/wireless.h> +#include <glib.h> + #include <connman/device.h> #include <connman/rtnl.h> #include <connman/log.h> diff --git a/src/device.c b/src/device.c index ef89933..590b955 100644 --- a/src/device.c +++ b/src/device.c @@ -72,8 +72,6 @@ static const char *type2string(enum connman_device_type type) return "wifi"; case CONNMAN_DEVICE_TYPE_WIMAX: return "wimax"; - case CONNMAN_DEVICE_TYPE_MODEM: - return "modem"; case CONNMAN_DEVICE_TYPE_BLUETOOTH: return "bluetooth"; case CONNMAN_DEVICE_TYPE_HSO: @@ -540,6 +538,15 @@ struct connman_device *connman_device_create(const char *node, device->element.type = CONNMAN_ELEMENT_TYPE_DEVICE; device->element.index = -1; + switch (type) { + case CONNMAN_DEVICE_TYPE_ETHERNET: + device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_ETHERNET; + break; + default: + device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN; + break; + } + device->element.device = device; device->element.destruct = device_destruct; _______________________________________________ Commits mailing list [email protected] https://lists.moblin.org/mailman/listinfo/commits
