X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevdb.c;h=678ddd960340764bb8a94f7025ebb4bf29e8d00d;hp=c2e90be32f47a71eceddc820c041e17c734ff4b6;hb=05fdfe68e2a628ceabf41f32300bf9f7578a29c5;hpb=dbfc520c605dee3244dbbfd563e908901324689b diff --git a/udevdb.c b/udevdb.c index c2e90be32..678ddd960 100644 --- a/udevdb.c +++ b/udevdb.c @@ -1,3 +1,26 @@ +/* + * udevdb.c + * + * Userspace devfs + * + * Copyright (C) 2003 Greg Kroah-Hartman + * Copyright (C) 2003 IBM Corp. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + * + */ + /* * udev database library */ @@ -9,8 +32,12 @@ #include #include +#include "udev_version.h" +#include "udev.h" +#include "namedev.h" #include "udevdb.h" #include "tdb/tdb.h" +#include "libsysfs/libsysfs.h" static TDB_CONTEXT *udevdb; @@ -29,11 +56,15 @@ struct classdb_record { char name[NAME_SIZE]; }; +struct sysfsdb_record { + char name[PATH_SIZE]; +}; + /** * namedb_record - device name is key, remaining udevice info stored here. */ struct namedb_record { - char sysfs_path[PATH_SIZE]; + char sysfs_dev_path[PATH_SIZE]; char class_dev_name[NAME_SIZE]; char class_name[NAME_SIZE]; char bus[BUS_SIZE]; @@ -42,7 +73,7 @@ struct namedb_record { char type; int major; int minor; - int mode; + mode_t mode; }; /** @@ -63,9 +94,14 @@ static void udevdb_close(void) */ static int udevdb_open(int method) { - udevdb = tdb_open(UDEVDB, 0, method, O_RDWR | O_CREAT, 0644); - if (udevdb == NULL) - return -1; + udevdb = tdb_open(UDEV_CONFIG_DIR UDEV_DB, 0, method, O_RDWR | O_CREAT, 0644); + if (udevdb == NULL) { + if (method == UDEVDB_INTERNAL) + dbg("Unable to initialize in-memory database"); + else + dbg("Unable to initialize database at %s", UDEV_CONFIG_DIR UDEV_DB); + return -EINVAL; + } return 0; } @@ -94,13 +130,13 @@ static struct busdb_record *busdb_fetch(const char *bus, const char *id) data = tdb_fetch(udevdb, key); if (data.dptr == NULL || data.dsize == 0) return NULL; - + rec = (struct busdb_record *)malloc(sizeof(struct busdb_record)); if (rec == NULL) { free(data.dptr); return NULL; } - + memcpy(rec, data.dptr, sizeof(struct busdb_record)); free(data.dptr); @@ -146,6 +182,41 @@ static struct classdb_record *classdb_fetch(const char *cls, return rec; } +static struct sysfsdb_record *sysfsdb_fetch(const char *path) +{ + TDB_DATA key, data; + char keystr[PATH_SIZE+2]; + struct sysfsdb_record *rec = NULL; + + if (strlen(path) >= PATH_SIZE) + return NULL; + + memset(keystr, 0, sizeof(keystr)); + strcpy(keystr, path); + + dbg("keystr = %s", keystr); + + key.dptr = (void *)keystr; + key.dsize = strlen(keystr) + 1; + + data = tdb_fetch(udevdb, key); + if (data.dptr == NULL || data.dsize == 0) { + dbg("tdb_fetch did not work :("); + return NULL; + } + + rec = (struct sysfsdb_record *)malloc(sizeof(struct sysfsdb_record)); + if (rec == NULL) { + free(data.dptr); + return NULL; + } + + memcpy(rec, data.dptr, sizeof(struct sysfsdb_record)); + free(data.dptr); + + return rec; +} + /** * namedb_fetch */ @@ -242,6 +313,32 @@ static int classdb_store(const struct udevice *dev) return retval; } +static int sysfs_store(const char *path, const struct udevice *dev) +{ + TDB_DATA key, data; + char keystr[PATH_SIZE+2]; + struct sysfsdb_record rec; + int retval = 0; + + if (dev == NULL) + return -ENODEV; + + memset(keystr, 0, sizeof(keystr)); + strcpy(keystr, path); + dbg("keystr = %s", keystr); + + key.dptr = (void *)keystr; + key.dsize = strlen(keystr) + 1; + + strcpy(rec.name, dev->name); + + data.dptr = (void *) &rec; + data.dsize = sizeof(rec); + + retval = tdb_store(udevdb, key, data, TDB_REPLACE); + return retval; +} + /** * namedb_store */ @@ -261,7 +358,7 @@ static int namedb_store(const struct udevice *dev) key.dptr = (void *)keystr; key.dsize = strlen(keystr) + 1; - strcpy(rec.sysfs_path, dev->sysfs_path); + strcpy(rec.sysfs_dev_path, dev->sysfs_dev_path); strcpy(rec.bus, dev->bus_name); strcpy(rec.id, dev->bus_id); strcpy(rec.class_dev_name, dev->class_dev_name); @@ -378,18 +475,41 @@ int udevdb_delete_udevice(const char *name) } /** - * udevdb_add_udevice: adds udevice to database + * udevdb_add_device: adds class device to database */ -int udevdb_add_udevice(const struct udevice *dev) +int udevdb_add_device(const char *device, const struct sysfs_class_device *class_dev, const char *name, char type, int major, int minor, int mode) { - if (dev == NULL) - return -1; + struct udevice dbdev; - if ((busdb_store(dev)) != 0) + if (class_dev == NULL) + return -ENODEV; + + memset(&dbdev, 0, sizeof(dbdev)); + strncpy(dbdev.name, name, NAME_SIZE); + if (class_dev->sysdevice) { + strncpy(dbdev.sysfs_dev_path, class_dev->sysdevice->directory->path, PATH_SIZE); + strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE); + } + strncpy(dbdev.class_dev_name, class_dev->name, NAME_SIZE); +// if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE)) != 0) +// strcpy(dbdev.class_name, "unknown"); + strcpy(dbdev.bus_name, "unknown"); + if (class_dev->driver != NULL) + strncpy(dbdev.driver, class_dev->driver->name, NAME_SIZE); + else + strcpy(dbdev.driver, "unknown"); + dbdev.type = type; + dbdev.major = major; + dbdev.minor = minor; + dbdev.mode = mode; + + if ((busdb_store(&dbdev)) != 0) + return -1; + if ((classdb_store(&dbdev)) != 0) return -1; - if ((classdb_store(dev)) != 0) + if ((sysfs_store(device, &dbdev)) != 0) return -1; - if ((namedb_store(dev)) != 0) + if ((namedb_store(&dbdev)) != 0) return -1; return 0; @@ -417,7 +537,7 @@ struct udevice *udevdb_get_udevice(const char *name) } strcpy(dev->name, name); - strcpy(dev->sysfs_path, nrec->sysfs_path); + strcpy(dev->sysfs_dev_path, nrec->sysfs_dev_path); strcpy(dev->class_dev_name, nrec->class_dev_name); strcpy(dev->class_name, nrec->class_name); strcpy(dev->bus_name, nrec->bus); @@ -475,6 +595,27 @@ struct udevice *udevdb_get_udevice_by_class(const char *cls, return dev; } + +char *udevdb_get_udevice_by_sysfs(const char *path) +{ + struct sysfsdb_record *crec = NULL; +// struct udevice *dev = NULL; + + if (path == NULL) + return NULL; + + crec = sysfsdb_fetch(path); + if (crec == NULL) + return NULL; + + // FIXME leak!!! + return crec->name; +// dev = udevdb_get_udevice(crec->name); +// free(crec); +// +// return dev; +} + /** * udevdb_exit: closes database */