sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Sascha Hauer 2012-04-15 16:02:02 +02:00
parent 9d699b790c
commit dbd4e1166e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/base/driver.c
View File

@ -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;
}

5
include/driver.h
View File

@ -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 *);