This email list is read-only. Emails sent to this list will be discarded ---------------------------------- include/device.h | 7 ++++--- src/connman.rules | 2 ++ src/detect.c | 2 ++ src/device.c | 3 +++ src/udev.c | 7 +++++-- 5 files changed, 16 insertions(+), 5 deletions(-)
New commits: commit df8540c0cd1e8cf3fe1a1de8f0594ecca0eac41d Author: Marcel Holtmann <[email protected]> Date: Fri Jan 2 23:53:25 2009 +0100 Add detection support for Nozomi based hardware commit e332ca14596915316a66e671fd2e0fd7e4e0fbca Author: Marcel Holtmann <[email protected]> Date: Fri Jan 2 23:47:11 2009 +0100 Add device type for Nozomi based hardware Diff in this email is a maximum of 400 lines. diff --git a/include/device.h b/include/device.h index fcd8cc0..44032b0 100644 --- a/include/device.h +++ b/include/device.h @@ -41,9 +41,10 @@ enum connman_device_type { CONNMAN_DEVICE_TYPE_WIFI = 2, CONNMAN_DEVICE_TYPE_WIMAX = 3, CONNMAN_DEVICE_TYPE_BLUETOOTH = 4, - CONNMAN_DEVICE_TYPE_HSO = 11, - CONNMAN_DEVICE_TYPE_HUAWEI = 12, - CONNMAN_DEVICE_TYPE_NOVATEL = 13, + CONNMAN_DEVICE_TYPE_HSO = 15, + CONNMAN_DEVICE_TYPE_NOZOMI = 16, + CONNMAN_DEVICE_TYPE_HUAWEI = 17, + CONNMAN_DEVICE_TYPE_NOVATEL = 18, CONNMAN_DEVICE_TYPE_VENDOR = 42, }; diff --git a/src/connman.rules b/src/connman.rules index 8a935ce..84b3b4b 100644 --- a/src/connman.rules +++ b/src/connman.rules @@ -1,6 +1,8 @@ SUBSYSTEM=="net", DRIVERS=="hso", ENV{CONNMAN_TYPE}="hso" +SUBSYSTEM=="tty", KERNEL=="noz[0-9]*", ENV{CONNMAN_TYPE}="nozomi" + SUBSYSTEM=="tty", ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1003", \ ENV{CONNMAN_TYPE}="huawei" diff --git a/src/detect.c b/src/detect.c index 5ae9083..fab79d4 100644 --- a/src/detect.c +++ b/src/detect.c @@ -188,6 +188,7 @@ static void detect_newlink(unsigned short type, int index, break; case CONNMAN_DEVICE_TYPE_BLUETOOTH: case CONNMAN_DEVICE_TYPE_HSO: + case CONNMAN_DEVICE_TYPE_NOZOMI: case CONNMAN_DEVICE_TYPE_HUAWEI: case CONNMAN_DEVICE_TYPE_NOVATEL: case CONNMAN_DEVICE_TYPE_VENDOR: @@ -205,6 +206,7 @@ static void detect_newlink(unsigned short type, int index, switch (devtype) { case CONNMAN_DEVICE_TYPE_UNKNOWN: case CONNMAN_DEVICE_TYPE_VENDOR: + case CONNMAN_DEVICE_TYPE_NOZOMI: case CONNMAN_DEVICE_TYPE_HUAWEI: case CONNMAN_DEVICE_TYPE_NOVATEL: mode = CONNMAN_DEVICE_MODE_UNKNOWN; diff --git a/src/device.c b/src/device.c index 2851cb4..c972c08 100644 --- a/src/device.c +++ b/src/device.c @@ -60,6 +60,7 @@ static const char *type2description(enum connman_device_type type) case CONNMAN_DEVICE_TYPE_BLUETOOTH: return "Bluetooth"; case CONNMAN_DEVICE_TYPE_HSO: + case CONNMAN_DEVICE_TYPE_NOZOMI: case CONNMAN_DEVICE_TYPE_HUAWEI: case CONNMAN_DEVICE_TYPE_NOVATEL: return "Cellular"; @@ -84,6 +85,7 @@ static const char *type2string(enum connman_device_type type) return "bluetooth"; case CONNMAN_DEVICE_TYPE_HSO: case CONNMAN_DEVICE_TYPE_HUAWEI: + case CONNMAN_DEVICE_TYPE_NOZOMI: case CONNMAN_DEVICE_TYPE_NOVATEL: return "cellular"; } @@ -632,6 +634,7 @@ struct connman_device *connman_device_create(const char *node, case CONNMAN_DEVICE_TYPE_WIMAX: case CONNMAN_DEVICE_TYPE_BLUETOOTH: case CONNMAN_DEVICE_TYPE_HSO: + case CONNMAN_DEVICE_TYPE_NOZOMI: case CONNMAN_DEVICE_TYPE_HUAWEI: case CONNMAN_DEVICE_TYPE_NOVATEL: device->element.subtype = CONNMAN_ELEMENT_SUBTYPE_UNKNOWN; diff --git a/src/udev.c b/src/udev.c index 623962a..95faf60 100644 --- a/src/udev.c +++ b/src/udev.c @@ -100,10 +100,13 @@ static void add_device(struct udev_device *udev_device) if (type == NULL || interface == NULL) return; - if (g_str_equal(interface, "ttyUSB0") == FALSE) + if (g_str_equal(interface, "ttyUSB0") == FALSE && + g_str_equal(interface, "noz0") == FALSE) return; - if (g_str_equal(type, "huawei") == TRUE) + if (g_str_equal(type, "nozomi") == TRUE) + devtype = CONNMAN_DEVICE_TYPE_NOZOMI; + else if (g_str_equal(type, "huawei") == TRUE) devtype = CONNMAN_DEVICE_TYPE_HUAWEI; else if (g_str_equal(type, "novatel") == TRUE) devtype = CONNMAN_DEVICE_TYPE_NOVATEL; _______________________________________________ Commits mailing list [email protected] https://lists.moblin.org/mailman/listinfo/commits
