diff options
| -rwxr-xr-x | perl-install/c/stuff.xs.pl | 41 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 28 |
2 files changed, 40 insertions, 29 deletions
diff --git a/perl-install/c/stuff.xs.pl b/perl-install/c/stuff.xs.pl index 095d92ffc..42dc7841d 100755 --- a/perl-install/c/stuff.xs.pl +++ b/perl-install/c/stuff.xs.pl @@ -95,6 +95,18 @@ void log_perror(const char *msg) { log_message("%s: %s", msg, strerror(errno)); } +HV* common_pciusb_hash_init(struct pciusb_entry *e) { + HV *rh = (HV *)sv_2mortal((SV *)newHV()); + hv_store(rh, "vendor", 6, newSVnv(e->vendor), 0); + hv_store(rh, "subvendor", 9, newSVnv(e->subvendor), 0); + hv_store(rh, "id", 2, newSVnv(e->device), 0); + hv_store(rh, "subid", 5, newSVnv(e->subdevice), 0); + hv_store(rh, "driver", 6, newSVpv(e->module ? e->module : "unknown", 0), 0); + hv_store(rh, "description", 11, newSVpv(e->text, 0), 0); + hv_store(rh, "pci_bus", 7, newSVnv(e->pci_bus), 0); + hv_store(rh, "pci_device", 10, newSVnv(e->pci_device), 0); + return rh; +} '; @@ -268,11 +280,14 @@ pci_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%04x\t%04x\t%d\t%d\t%d\t%d\t%d\t%d\t%s\t%s\t%s\t%s", - e->vendor, e->device, e->subvendor, e->subdevice, e->pci_domain, e->pci_bus, - e->pci_device, e->pci_function, e->pci_revision, e->is_pciexpress, - pci_class2text(e->class_id), e->class, e->module ? e->module : "unknown", e->text); - PUSHs(sv_2mortal(newSVpv(buf, 0))); + HV * rh = common_pciusb_hash_init(e); + hv_store(rh, "pci_domain", 10, newSVnv(e->pci_domain), 0); + hv_store(rh, "pci_function", 12, newSVnv(e->pci_function), 0); + hv_store(rh, "pci_revision", 12, newSVnv(e->pci_revision), 0); + hv_store(rh, "is_pciexpress", 13, newSVnv(e->is_pciexpress), 0); + hv_store(rh, "nice_media_type", 15, newSVpv(e->class, 0), 0); + hv_store(rh, "media_type", 10, newSVpv(pci_class2text(e->class_id), 0), 0); + PUSHs(newRV((SV *)rh)); } pciusb_free(&entries); @@ -287,11 +302,10 @@ usb_probe() for (i = 0; i < entries.nb; i++) { struct pciusb_entry *e = &entries.entries[i]; struct usb_class_text class_text = usb_class2text(e->class_id); - snprintf(buf, sizeof(buf), "%04x\t%04x\t%s|%s|%s\t%s\t%s\t%d\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, e->usb_port); - PUSHs(sv_2mortal(newSVpv(buf, 0))); + snprintf(buf, sizeof(buf), "%s|%s|%s", class_text.usb_class_text, class_text.usb_sub_text, class_text.usb_prot_text); + HV * rh = common_pciusb_hash_init(e); + hv_store(rh, "usb_port", 8, newSVnv(e->usb_port), 0); + PUSHs(newRV((SV *)rh)); } pciusb_free(&entries); @@ -307,9 +321,10 @@ dmi_probe() EXTEND(SP, entries.nb); for (i = 0; i < entries.nb; i++) { - snprintf(buf, sizeof(buf), "%s\t%s", - entries.entries[i].module, entries.entries[i].constraints); - PUSHs(sv_2mortal(newSVpv(buf, 0))); + HV * rh = (HV *)sv_2mortal((SV *)newHV()); + hv_store(rh, "driver", 6, newSVpv(entries.entries[i].module, 0), 0); + hv_store(rh, "description", 11, newSVpv(entries.entries[i].constraints, 0), 0); + PUSHs(newRV((SV *)rh)); } dmi_entries_free(entries); diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 7cfdf31c6..6d4090d5f 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -847,12 +847,11 @@ my (@pci, @usb); sub pci_probe__real() { add_addons($pcitable_addons, map { - my %l; - @l{qw(vendor id subvendor subid pci_domain pci_bus pci_device pci_function pci_revision is_pciexpress media_type nice_media_type driver description)} = split "\t"; - $l{$_} = hex $l{$_} foreach qw(vendor id subvendor subid); - $l{bus} = 'PCI'; - $l{sysfs_device} = '/sys/bus/pci/devices/' . get_pci_sysfs_path(\%l); - \%l; + my $l = $_; + $l->{$_} = hex $l->{$_} foreach qw(vendor id subvendor subid); + $l->{bus} = 'PCI'; + $l->{sysfs_device} = '/sys/bus/pci/devices/' . get_pci_sysfs_path($l); + $l; } c::pci_probe()); } sub pci_probe() { @@ -870,13 +869,12 @@ sub usb_probe__real() { -e "/sys/kernel/debug/usb/devices" or return; add_addons($usbtable_addons, map { - my %l; - @l{qw(vendor id media_type driver description pci_bus pci_device usb_port)} = split "\t"; - $l{media_type} = join('|', grep { $_ ne '(null)' } split('\|', $l{media_type})); - $l{$_} = hex $l{$_} foreach qw(vendor id); - $l{sysfs_device} = "/sys/bus/usb/devices/$l{pci_bus}-" . ($l{usb_port} + 1); - $l{bus} = 'USB'; - \%l; + my $l = $_; + $l->{media_type} = join('|', grep { $_ ne '(null)' } split('\|', $l->{media_type})); + $l->{$_} = hex $l->{$_} foreach qw(vendor id); + $l->{sysfs_device} = "/sys/bus/usb/devices/$l->{pci_bus}-" . ($l->{usb_port} + 1); + $l->{bus} = 'USB'; + $l; } c::usb_probe()); } sub usb_probe() { @@ -967,9 +965,7 @@ sub dmi_probe() { if (arch() !~ /86/) { return []; } - $dmi_probe ||= [ map { - /(.*?)\t(.*)/ && { bus => 'DMI', driver => $1, description => $2 }; - } $> ? () : c::dmi_probe() ]; + $dmi_probe ||= $> ? [] : [ c::dmi_probe() ]; @$dmi_probe; } |