static void __init dev_init(void)
{
- avl_init(&devices, avl_strcmp, false, NULL);
+ avl_init(&devices, avl_strcmp, true, NULL);
}
static void device_broadcast_event(struct device *dev, enum device_event ev)
return 0;
dep->claimed = true;
- DPRINTF("claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
+ D(DEVICE, "claim device %s, new refcount: %d\n", dev->ifname, dev->active + 1);
if (++dev->active != 1)
return 0;
dep->claimed = false;
dev->active--;
- DPRINTF("release device %s, new refcount: %d\n", dev->ifname, dev->active);
+ D(DEVICE, "release device %s, new refcount: %d\n", dev->ifname, dev->active);
assert(dev->active >= 0);
if (dev->active)
device_broadcast_event(dev, DEV_EVENT_DOWN);
}
-int check_device_state(struct device *dev)
+int device_check_state(struct device *dev)
{
if (!dev->type->check_state)
return 0;
if (name)
strncpy(dev->ifname, name, IFNAMSIZ);
- DPRINTF("Initialize device '%s'\n", dev->ifname);
+ D(DEVICE, "Initialize device '%s'\n", dev->ifname);
INIT_LIST_HEAD(&dev->users);
dev->type = type;
}
if (ret < 0)
return ret;
- check_device_state(dev);
+ device_check_state(dev);
return 0;
}
{
struct device_user *dep, *tmp;
- DPRINTF("Clean up device '%s'\n", dev->ifname);
+ D(DEVICE, "Clean up device '%s'\n", dev->ifname);
list_for_each_entry_safe(dep, tmp, &dev->users, list) {
if (!dep->cb)
continue;
if (dev->present == state)
return;
- DPRINTF("Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" );
+ D(DEVICE, "Device '%s' %s present\n", dev->ifname, state ? "is now" : "is no longer" );
dev->present = state;
device_broadcast_event(dev, state ? DEV_EVENT_ADD : DEV_EVENT_REMOVE);
}
device_set_present(odev, false);
list_for_each_entry_safe(dep, tmp, &odev->users, list) {
- list_move_tail(&dep->list, &dev->users);
- dep->dev = dev;
+ device_remove_user(dep);
+ device_add_user(dep, dev);
}
device_free(odev);
struct device *odev = NULL, *dev;
enum dev_change_type change;
+ D(DEVICE, "Create new device '%s' (%s)\n", name, type->name);
+ config = config_memdup(config);
+ if (!config)
+ return NULL;
+
odev = device_get(name, false);
if (odev) {
change = device_check_config(odev, config);
switch (change) {
case DEV_CONFIG_APPLIED:
free(odev->config);
- odev->config = config_memdup(config);
+ odev->config = config;
if (odev->present) {
device_set_present(odev, false);
device_set_present(odev, true);
}
/* fall through */
case DEV_CONFIG_NO_CHANGE:
+ free(config);
return odev;
case DEV_CONFIG_RECREATE:
break;
}
dev = type->create(config);
- dev->config = config_memdup(config);
+ dev->config = config;
if (odev)
device_replace(dev, odev);