diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-16 21:32:34 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-16 21:32:34 +0200 |
| commit | 73608ed994efef7f00eac0b0275ab0f7bc218af5 (patch) | |
| tree | 3a6962625dfe80dab9fd979fbd6c539bf301cace /src | |
| parent | 2d3b2c0032268a32557cb03a98175b828620a706 (diff) | |
device: rename 'available' state to 'plugged'
Diffstat (limited to 'src')
| -rw-r--r-- | src/device.c | 8 | ||||
| -rw-r--r-- | src/device.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/device.c b/src/device.c index aeafd5e9f3..dc626d8189 100644 --- a/src/device.c +++ b/src/device.c @@ -32,7 +32,7 @@ static const UnitActiveState state_translation_table[_DEVICE_STATE_MAX] = { [DEVICE_DEAD] = UNIT_INACTIVE, - [DEVICE_AVAILABLE] = UNIT_ACTIVE + [DEVICE_PLUGGED] = UNIT_ACTIVE }; static void device_done(Unit *u) { @@ -67,7 +67,7 @@ static int device_coldplug(Unit *u) { assert(d->state == DEVICE_DEAD); if (d->sysfs) - device_set_state(d, DEVICE_AVAILABLE); + device_set_state(d, DEVICE_PLUGGED); return 0; } @@ -262,7 +262,7 @@ static int device_process_new_device(Manager *m, struct udev_device *dev, bool u if (update_state) { manager_dispatch_load_queue(u->meta.manager); - device_set_state(DEVICE(u), DEVICE_AVAILABLE); + device_set_state(DEVICE(u), DEVICE_PLUGGED); } unit_add_to_dbus_queue(u); @@ -443,7 +443,7 @@ fail: static const char* const device_state_table[_DEVICE_STATE_MAX] = { [DEVICE_DEAD] = "dead", - [DEVICE_AVAILABLE] = "available" + [DEVICE_PLUGGED] = "plugged" }; DEFINE_STRING_TABLE_LOOKUP(device_state, DeviceState); diff --git a/src/device.h b/src/device.h index a5c5f745b8..654499cfd7 100644 --- a/src/device.h +++ b/src/device.h @@ -30,7 +30,7 @@ typedef struct Device Device; * simplifies the state engine greatly */ typedef enum DeviceState { DEVICE_DEAD, - DEVICE_AVAILABLE, + DEVICE_PLUGGED, _DEVICE_STATE_MAX, _DEVICE_STATE_INVALID = -1 } DeviceState; |