sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

udev: Keep vendor and product identifiers around

This commit is contained in:
Marcel Holtmann 2012-01-17 10:35:23 +01:00
parent ef658e92f3
commit d6d86ff938
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/udevng.c
View File

@ -41,6 +41,8 @@ struct modem_info {
char *syspath; char *syspath;
char *devname; char *devname;
char *driver; char *driver;
char *vendor;
char *model;
GSList *devices; GSList *devices;
struct ofono_modem *modem; struct ofono_modem *modem;
const char *sysattr; const char *sysattr;
@ -708,6 +710,8 @@ static void destroy_modem(gpointer data)
g_free(modem->syspath); g_free(modem->syspath);
g_free(modem->devname); g_free(modem->devname);
g_free(modem->driver); g_free(modem->driver);
g_free(modem->vendor);
g_free(modem->model);
g_free(modem); g_free(modem);
} }
@ -750,7 +754,8 @@ static gint compare_device(gconstpointer a, gconstpointer b)
} }
static void add_device(const char *syspath, const char *devname, static void add_device(const char *syspath, const char *devname,
const char *driver, struct udev_device *device) const char *driver, const char *vendor,
const char *model, struct udev_device *device)
{ {
struct udev_device *intf; struct udev_device *intf;
const char *devpath, *devnode, *interface, *number, *label, *sysattr; const char *devpath, *devnode, *interface, *number, *label, *sysattr;
@ -782,6 +787,8 @@ static void add_device(const char *syspath, const char *devname,
modem->syspath = g_strdup(syspath); modem->syspath = g_strdup(syspath);
modem->devname = g_strdup(devname); modem->devname = g_strdup(devname);
modem->driver = g_strdup(driver); modem->driver = g_strdup(driver);
modem->vendor = g_strdup(vendor);
modem->model = g_strdup(model);
modem->sysattr = get_sysattr(driver); modem->sysattr = get_sysattr(driver);
@ -860,7 +867,8 @@ static struct {
static void check_usb_device(struct udev_device *device) static void check_usb_device(struct udev_device *device)
{ {
struct udev_device *usb_device; struct udev_device *usb_device;
const char *driver, *syspath, *devname; const char *syspath, *devname, *driver;
const char *vendor = NULL, *model = NULL;
usb_device = udev_device_get_parent_with_subsystem_devtype(device, usb_device = udev_device_get_parent_with_subsystem_devtype(device,
"usb", "usb_device"); "usb", "usb_device");
@ -900,18 +908,25 @@ static void check_usb_device(struct udev_device *device)
if (vendor_list[i].vid == NULL) { if (vendor_list[i].vid == NULL) {
driver = vendor_list[i].driver; driver = vendor_list[i].driver;
vendor = vid;
model = pid;
break; break;
} }
if (g_str_equal(vendor_list[i].vid, vid) == TRUE) { if (g_str_equal(vendor_list[i].vid, vid) == TRUE) {
if (vendor_list[i].pid == NULL) { if (vendor_list[i].pid == NULL) {
if (driver == NULL) if (driver == NULL) {
driver = vendor_list[i].driver; driver = vendor_list[i].driver;
vendor = vid;
model = pid;
}
continue; continue;
} }
if (g_strcmp0(vendor_list[i].pid, pid) == 0) { if (g_strcmp0(vendor_list[i].pid, pid) == 0) {
driver = vendor_list[i].driver; driver = vendor_list[i].driver;
vendor = vid;
model = pid;
break; break;
} }
} }
@ -921,7 +936,7 @@ static void check_usb_device(struct udev_device *device)
return; return;
} }
add_device(syspath, devname, driver, device); add_device(syspath, devname, driver, vendor, model, device);
} }
static void check_device(struct udev_device *device) static void check_device(struct udev_device *device)