Add device type for Nozomi based hardware

diff --git a/include/device.h b/include/device.h
index fcd8cc0..44032b0 100644 (file)
--- 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/detect.c b/src/detect.c
index 5ae9083..fab79d4 100644 (file)
--- 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 (file)
--- 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;