diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-11-20 15:22:10 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-11-20 15:22:10 +0000 |
| commit | 4d13371d71531d291e0cfa1fc0a87518406ab1cd (patch) | |
| tree | 1ad2d569f73ea022376f69f3c5a1871161755ba2 | |
| parent | 32b3b86091b04749dcc4d4845cb39ff7016b2696 (diff) | |
| download | drakx-backup-do-not-use-4d13371d71531d291e0cfa1fc0a87518406ab1cd.tar drakx-backup-do-not-use-4d13371d71531d291e0cfa1fc0a87518406ab1cd.tar.gz drakx-backup-do-not-use-4d13371d71531d291e0cfa1fc0a87518406ab1cd.tar.bz2 drakx-backup-do-not-use-4d13371d71531d291e0cfa1fc0a87518406ab1cd.tar.xz drakx-backup-do-not-use-4d13371d71531d291e0cfa1fc0a87518406ab1cd.zip | |
adapt to new usb_class2text()
| -rw-r--r-- | perl-install/c/stuff.xs.pl | 5 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl index b1e9d0691..c9477dae5 100644 --- a/perl-install/c/stuff.xs.pl +++ b/perl-install/c/stuff.xs.pl @@ -398,8 +398,9 @@ usb_probe() EXTEND(SP, entries.nb); for (i = 0; i < entries.nb; i++) { struct pciusb_entry *e = &entries.entries[i]; - snprintf(buf, sizeof(buf), "%04x\t%04x\t%s\t%s\t%s\t%d\t%d", - e->vendor, e->device, usb_class2text(e->class_), e->module ? e->module : "unknown", e->text, e->pci_bus, e->pci_device); + struct usb_class_text class_text = usb_class2text(e->class_); + snprintf(buf, sizeof(buf), "%04x\t%04x\t%s|%s|%s\t%s\t%s\t%d\t%d", + e->vendor, e->device, class_text.usb_class_text, class_text.usb_sub_text, class_text.usb_prot_text, e->module ? e->module : "unknown", e->text, e->pci_bus, e->pci_device); PUSHs(sv_2mortal(newSVpv(buf, 0))); } pciusb_free(&entries); diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 3f75e2cd9..83c64ce5f 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -509,6 +509,7 @@ sub usb_probe() { add_addons($usbtable_addons, map { my %l; @l{qw(vendor id media_type driver description pci_bus pci_device)} = split "\t"; + $l{media_type} = join('|', grep { $_ ne '(null)' } split('\|', $l{media_type})); $l{$_} = hex $l{$_} foreach qw(vendor id); $l{bus} = 'USB'; \%l |