technology: Remove "blocked" state and use "offline" state instead

Both "offline" and "blocked" states mean the same hence merging them.

diff --git a/doc/technology-api.txt b/doc/technology-api.txt
index 992ee56..c86a58e 100644 (file)
--- a/doc/technology-api.txt
+++ b/doc/technology-api.txt
@@ -21,8 +21,8 @@ Properties    string State [readonly]
 
                        The technology state information.
 
-                       Valid states are "offline", "available", "blocked",
-                       "enabled "and "connected".
+                       Valid states are "offline", "available", "enabled"
+                       and "connected".
 
                string Name [readonly]
 

diff --git a/src/technology.c b/src/technology.c
index 2a48698..aa6fde0 100644 (file)
--- a/src/technology.c
+++ b/src/technology.c
@@ -46,9 +46,8 @@ enum connman_technology_state {
        CONNMAN_TECHNOLOGY_STATE_UNKNOWN   = 0,
        CONNMAN_TECHNOLOGY_STATE_OFFLINE   = 1,
        CONNMAN_TECHNOLOGY_STATE_AVAILABLE = 2,
-       CONNMAN_TECHNOLOGY_STATE_BLOCKED   = 3,
-       CONNMAN_TECHNOLOGY_STATE_ENABLED   = 4,
-       CONNMAN_TECHNOLOGY_STATE_CONNECTED = 5,
+       CONNMAN_TECHNOLOGY_STATE_ENABLED   = 3,
+       CONNMAN_TECHNOLOGY_STATE_CONNECTED = 4,
 };
 
 struct connman_technology {
@@ -255,8 +254,6 @@ static const char *state2string(enum connman_technology_state state)
                return "offline";
        case CONNMAN_TECHNOLOGY_STATE_AVAILABLE:
                return "available";
-       case CONNMAN_TECHNOLOGY_STATE_BLOCKED:
-               return "blocked";
        case CONNMAN_TECHNOLOGY_STATE_ENABLED:
                return "enabled";
        case CONNMAN_TECHNOLOGY_STATE_CONNECTED:
@@ -729,7 +726,7 @@ int __connman_technology_disable_device(struct connman_device *device)
                        return 0;
        }
 
-       technology->state = CONNMAN_TECHNOLOGY_STATE_BLOCKED;
+       technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
        state_changed(technology);
 
        return 0;
@@ -783,7 +780,7 @@ int __connman_technology_add_rfkill(unsigned int index,
        if (g_atomic_int_exchange_and_add(&technology->blocked, 1) == 0) {
                technology_blocked(technology, TRUE);
 
-               technology->state = CONNMAN_TECHNOLOGY_STATE_BLOCKED;
+               technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
                state_changed(technology);
        }
 
@@ -826,7 +823,7 @@ int __connman_technology_update_rfkill(unsigned int index,
                        return 0;
 
                technology_blocked(technology, blocked);
-               technology->state = CONNMAN_TECHNOLOGY_STATE_BLOCKED;
+               technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
                state_changed(technology);
        } else {
                if (g_atomic_int_dec_and_test(&technology->blocked) == FALSE)