diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-15 16:02:02 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-15 16:11:26 +0200 |
commit | dbd4e1166ead4579e959a3c799a22fa2780d845d (patch) | |
tree | 335c328ce31fc33d5ef2c0c48405835b1e613369 | |
parent | 9d699b790cfc3afa6766a1d047def724cc42386e (diff) | |
download | barebox-dbd4e1166ead4579e959a3c799a22fa2780d845d.tar.gz barebox-dbd4e1166ead4579e959a3c799a22fa2780d845d.tar.xz |
device: make singular devices possible
Currently all devices have an id meaning that all devicenames
end with a number. This patch adds a DEVICE_ID_SINGLE to make
it ppossible to register a device without an id assigned to
it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | drivers/base/driver.c | 7 | ||||
-rw-r--r-- | include/driver.h | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index a2674d607b..2d206f934d 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -103,7 +103,7 @@ int register_device(struct device_d *new_device) { struct driver_d *drv; - if (new_device->id < 0) { + if (new_device->id == DEVICE_ID_DYNAMIC) { new_device->id = get_free_deviceid(new_device->name); } else { if (get_device_by_name_id(new_device->name, new_device->id)) { @@ -302,7 +302,10 @@ const char *dev_id(const struct device_d *dev) { static char buf[MAX_DRIVER_NAME + 16]; - snprintf(buf, sizeof(buf), FORMAT_DRIVER_NAME_ID, dev->name, dev->id); + if (dev->id != DEVICE_ID_SINGLE) + snprintf(buf, sizeof(buf), FORMAT_DRIVER_NAME_ID, dev->name, dev->id); + else + snprintf(buf, sizeof(buf), "%s", dev->name); return buf; } diff --git a/include/driver.h b/include/driver.h index 37620273af..4efa9642b8 100644 --- a/include/driver.h +++ b/include/driver.h @@ -126,6 +126,11 @@ struct driver_d { #define RW_SIZE(x) (x) #define RW_SIZE_MASK 0x7 +/* dynamically assign the next free id */ +#define DEVICE_ID_DYNAMIC -1 +/* do not use an id (only one device available */ +#define DEVICE_ID_SINGLE -2 + /* Register devices and drivers. */ int register_driver(struct driver_d *); |