Add network type for Ericsson MBM devices
authorMarcel Holtmann <marcel@holtmann.org>
Sun, 12 Jul 2009 08:50:30 +0000 (01:50 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Sun, 12 Jul 2009 08:50:30 +0000 (01:50 -0700)
include/network.h
src/network.c
src/service.c

index 0498109..49a42d8 100644 (file)
@@ -41,6 +41,7 @@ enum connman_network_type {
        CONNMAN_NETWORK_TYPE_WIMAX         = 2,
        CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN = 8,
        CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN = 9,
+       CONNMAN_NETWORK_TYPE_MBM           = 22,
        CONNMAN_NETWORK_TYPE_HSO           = 23,
        CONNMAN_NETWORK_TYPE_VENDOR        = 10000,
 };
index 6c72d19..76671b0 100644 (file)
@@ -77,6 +77,7 @@ static const char *type2string(enum connman_network_type type)
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
                return "bluetooth";
+       case CONNMAN_NETWORK_TYPE_MBM:
        case CONNMAN_NETWORK_TYPE_HSO:
                return "cellular";
        }
@@ -610,6 +611,7 @@ void connman_network_set_group(struct connman_network *network,
        case CONNMAN_NETWORK_TYPE_VENDOR:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_MBM:
        case CONNMAN_NETWORK_TYPE_HSO:
                return;
        case CONNMAN_NETWORK_TYPE_WIFI:
@@ -1238,6 +1240,7 @@ static int network_probe(struct connman_element *element)
        case CONNMAN_NETWORK_TYPE_VENDOR:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_MBM:
        case CONNMAN_NETWORK_TYPE_HSO:
                break;
        case CONNMAN_NETWORK_TYPE_WIFI:
@@ -1267,6 +1270,7 @@ static void network_remove(struct connman_element *element)
        case CONNMAN_NETWORK_TYPE_VENDOR:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
+       case CONNMAN_NETWORK_TYPE_MBM:
        case CONNMAN_NETWORK_TYPE_HSO:
                break;
        case CONNMAN_NETWORK_TYPE_WIFI:
index c9f8844..9935e6d 100644 (file)
@@ -1348,8 +1348,10 @@ static enum connman_service_type convert_network_type(struct connman_network *ne
        case CONNMAN_NETWORK_TYPE_VENDOR:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_PAN:
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
-       case CONNMAN_NETWORK_TYPE_HSO:
                break;
+       case CONNMAN_NETWORK_TYPE_MBM:
+       case CONNMAN_NETWORK_TYPE_HSO:
+               return CONNMAN_SERVICE_TYPE_CELLULAR;
        case CONNMAN_NETWORK_TYPE_WIFI:
                return CONNMAN_SERVICE_TYPE_WIFI;
        case CONNMAN_NETWORK_TYPE_WIMAX: