From 17068198874ddf8c49ee708311cf83dbe723fd2a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 23 Oct 2002 10:56:37 +0000 Subject: reindent for lord pix --- perl-install/harddrake/data.pm | 78 +++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 39 deletions(-) (limited to 'perl-install/harddrake/data.pm') diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 3554184fb..e581c3bb9 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -21,52 +21,52 @@ sub unknown { our @tree = ( - ["FLOPPY","Floppy", "floppy.png", "",\&detect_devices::floppies, 0 ], - ["HARDDISK","Disk", "harddisk.png", "$sbindir/diskdrake", \&detect_devices::hds, 1 ], - ["CDROM","CDROM", "cd.png", "", sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms } , 0 ], - ["BURNER","CD/DVD burners", "cd.png", "", \&detect_devices::burners, 0 ], - ["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms}, 0 ], - ["TAPE","Tape", "tape.png", "", \&detect_devices::tapes, 0 ], - ["VIDEO","Videocard", "video.png", "$sbindir/XFdrake", sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ 'DISPLAY_VGA' } @devices }, 1 ], - ["TV","Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI' } @devices}, 0 ], - ["MULTIMEDIA_OTHER","Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_OTHER' } @devices}, 0 ], - ["AUDIO","Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_AUDIO' } @devices}, 0 ], - ["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} ne 'PCI'} @devices }, 0 ], - ["CPU","Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ], - ["ETHERNET","Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub { - #- generic NIC detection for USB seems broken (class, subclass, - #- protocol report are not accurate) so I'll need to verify against - #- known drivers :-( - my @usbnet = qw/CDCEther catc kaweth pegasus usbnet/; - # should be taken from detect_devices.pm or modules.pm. it's identical - - grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices}, 1 ], - ["MODEM","Modem", "modem.png", "", sub { detect_devices::getModem() } , 0 ], - ["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ 'BRIDGE' } @devices}, 0 ], - ["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown, 0 ], + ["FLOPPY","Floppy", "floppy.png", "",\&detect_devices::floppies, 0 ], + ["HARDDISK","Disk", "harddisk.png", "$sbindir/diskdrake", \&detect_devices::hds, 1 ], + ["CDROM","CDROM", "cd.png", "", sub { grep { !(detect_devices::isBurner($_) || detect_devices::isDvdDrive($_)) } &detect_devices::cdroms } , 0 ], + ["BURNER","CD/DVD burners", "cd.png", "", \&detect_devices::burners, 0 ], + ["DVDROM","DVD-ROM", "cd.png", "", sub { grep { ! detect_devices::isBurner($_) } detect_devices::dvdroms}, 0 ], + ["TAPE","Tape", "tape.png", "", \&detect_devices::tapes, 0 ], + ["VIDEO","Videocard", "video.png", "$sbindir/XFdrake", sub { grep { $_->{driver} =~ /^(Card|Server):/ || $_->{media_type} =~ 'DISPLAY_VGA' } @devices }, 1 ], + ["TV","Tvcard", "tv.png", "/usr/bin/XawTV", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} eq 'PCI' } @devices}, 0 ], + ["MULTIMEDIA_OTHER","Other MultiMedia devices", "multimedia.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_OTHER' } @devices}, 0 ], + ["AUDIO","Soundcard", "sound.png", "$sbindir/draksound", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_AUDIO' } @devices}, 0 ], + ["WEBCAM","Webcam", "webcam.png", "", sub { grep { $_->{media_type} =~ 'MULTIMEDIA_VIDEO' && $_->{bus} ne 'PCI'} @devices }, 0 ], + ["CPU","Processors", "cpu.png", "", sub { detect_devices::getCPUs() }, 0 ], + ["ETHERNET","Ethernetcard", "hw_network.png", "$sbindir/drakconnect", sub { + #- generic NIC detection for USB seems broken (class, subclass, + #- protocol report are not accurate) so I'll need to verify against + #- known drivers :-( + my @usbnet = qw/CDCEther catc kaweth pegasus usbnet/; + # should be taken from detect_devices.pm or modules.pm. it's identical + + grep { $_->{media_type} =~ /^NETWORK/ || member($_->{driver}, @usbnet) || $_->{type} eq 'network' } @devices}, 1 ], + ["MODEM","Modem", "modem.png", "", sub { detect_devices::getModem() } , 0 ], + ["BRIDGE","Bridge(s)", "memory.png", "", sub { grep { $_->{media_type} =~ 'BRIDGE' } @devices}, 0 ], + ["UNKNOWN","Unknown/Others", "unknown.png", "" , \&unknown, 0 ], - ["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake", sub { require printerdrake; printerdrake::detect() } , 0 ], - ["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake", sub { require scanner; scanner::detect() }, 0 ], - ["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { - require mouse; - require modules; - modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; - &mouse::detect() } , 1 ], - ["JOYSTICK","Joystick", "joystick.png", "", sub {}, 0 ], + ["PRINTER","Printer", "hw_printer.png", "$sbindir/printerdrake", sub { require printerdrake; printerdrake::detect() } , 0 ], + ["SCANNER","Scanner", "scanner.png", "$sbindir/scannerdrake", sub { require scanner; scanner::detect() }, 0 ], + ["MOUSE","Mouse", "hw_mouse.png", "$sbindir/mousedrake", sub { + require mouse; + require modules; + modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; + &mouse::detect() } , 1 ], + ["JOYSTICK","Joystick", "joystick.png", "", sub {}, 0 ], - ["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_(IDE|OTHER)' } @devices}, 0 ], - ["SCSI_CONTROLLER","SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_SCSI' } @devices}, 0 ], - ["USB_CONTROLLER","USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_USB' } @devices}, 0 ], - ["SMB_CONTROLLER","SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_SMBUS' } @devices}, 0 ], - ); + ["ATA_STORAGE","(E)IDE/ATA controllers", "ide_hd.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_(IDE|OTHER)' } @devices}, 0 ], + ["SCSI_CONTROLLER","SCSI controllers", "scsi.png", "", sub { grep { $_->{media_type} =~ 'STORAGE_SCSI' } @devices}, 0 ], + ["USB_CONTROLLER","USB controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_USB' } @devices}, 0 ], + ["SMB_CONTROLLER","SMBus controllers", "usb.png", "", sub { grep { $_->{media_type} =~ 'SERIAL_SMBUS' } @devices}, 0 ], + ); sub custom_id { my ($device, $str) = @_; defined($device->{device}) ? $device->{device} : - (defined($device->{processor}) ? - "$device->{vendor_id} $device->{name} " . _("cpu number ") . $device->{processor} : - (defined($device->{description}) ? $device->{description} : $str)); + (defined($device->{processor}) ? + "$device->{vendor_id} $device->{name} " . _("cpu number ") . $device->{processor} : + (defined($device->{description}) ? $device->{description} : $str)); } 1; -- cgit v1.2.1