diff options
| -rw-r--r-- | perl-install/detect_devices.pm | 51 | ||||
| -rw-r--r-- | perl-install/harddrake/TODO | 6 | ||||
| -rw-r--r-- | perl-install/harddrake/data.pm | 3 | ||||
| -rw-r--r-- | perl-install/harddrake/ui.pm | 4 | ||||
| -rw-r--r-- | perl-install/harddrake/v4l.pm | 2 |
5 files changed, 25 insertions, 41 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 21c2fa22f..ace2d12cb 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -346,46 +346,22 @@ sub getATARAID { values %l; } -<<<<<<< detect_devices.pm -#-AT&F&O2B40 -#- DialString=ATDT0231389595(( - -#- modem_detect_backend : detects modem on serial ports and fills the infos in $modem : detects only one card -#- input -#- $modem -#- $mouse : facultative, hash containing device to exclude not to test mouse port : ( device => /ttyS[0-9]/ ) -#- output: -#- $modem->{device} : device where the modem were detected -sub getSerialModem { - my ($modem, $mouse) = @_; - $mouse ||= {}; - $mouse->{device} = readlink "/dev/mouse"; - my $serdev = arch() =~ /ppc/ ? "macserial" : "serial"; - eval { modules::load($serdev) }; - - detect_devices::probeSerialDevices(); - foreach ('modem', map { "ttyS$_" } (0..7)) { - next if $mouse->{device} =~ /$_/; - next unless -e "/dev/$_"; - detect_devices::hasModem("/dev/$_") and $modem->{device} = $_, last; - } - - #- add an alias for macserial on PPC - modules::add_alias('serial', $serdev) if (arch() =~ /ppc/ && $modem->{device}); - my @devs = detect_devices::pcmcia_probe(); - foreach (@devs) { - $_->{type} =~ /serial/ and $modem->{device} = $_->{device}; +sub getCPUs { + my (@cpus, $cpu); + foreach (cat_("/proc/cpuinfo")) { + if (/^processor/) { + next unless $cpu; + push @cpus, $cpu; + $cpu = {}; + } else { + /(\S*)\s*:\s*(\S*)/; + $cpu->{$1} = $2 if $1; + } } + push @cpus, $cpu; + @cpus; } -sub getModem() { - my @modems = grep { $_->{media_type} eq 'COMMUNICATION_MODEM' || $_->{media_type} =~ /modem/ } probeall(0); - my $serial_modem = {}; - getSerialModem($serial_modem); - @modems, $serial_modem; -} - -======= #-AT&F&O2B40 #- DialString=ATDT0231389595(( @@ -428,7 +404,6 @@ sub getSpeedtouch { grep { $_->{description} eq 'Alcatel|USB ADSL Modem (Speed Touch)' } probeall(0); } ->>>>>>> 1.217 sub getNet() { grep { !(($::isStandalone || $::live) && /plip/) && c::hasNetDevice($_) } @netdevices; } diff --git a/perl-install/harddrake/TODO b/perl-install/harddrake/TODO index 02e4bcff2..71cbc1d2d 100644 --- a/perl-install/harddrake/TODO +++ b/perl-install/harddrake/TODO @@ -1,7 +1,13 @@ -*- outline -*- +* drakxtools +** drakxtools* need XF-{75,100}fonts that requires XFree86 + * Harddrake TODO: ** fixes +*** configure at boot : +**** configure usb interfaces +**** switch nvidia-nv in /etc/X11/XF86Config *** non needed stuff to run X must be posponed after X11 startup **** eg: scanner/audio/printer/floppy/cdrom/tape/tv/webcam/joystick/ ... *** enable the user to force a module (isa, isapnp, ...) diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index f34d3a7a9..e39b1d3ae 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -38,6 +38,9 @@ our @tree = ["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 diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm index b6c361cd1..4e3ba7b73 100644 --- a/perl-install/harddrake/ui.pm +++ b/perl-install/harddrake/ui.pm @@ -2,8 +2,7 @@ package harddrake::ui; use strict; -use harddrake::data; -use harddrake::sound; +require harddrake::data; use common; use my_gtk qw(:helpers :wrappers :various); use interactive; @@ -126,6 +125,7 @@ sub detect { $_->{bus_location} = join ':', map { sprintf("%lx", $i->{$_} ) } qw(bus id); } if ($Ident eq "AUDIO") { + require harddrake::sound; my $alter = harddrake::sound::get_alternative($_->{driver}); $_->{alternative_drivers} = join(':', @$alter) if $alter->[0] ne 'unknown'; } diff --git a/perl-install/harddrake/v4l.pm b/perl-install/harddrake/v4l.pm index 5e00b668d..fccce9a46 100644 --- a/perl-install/harddrake/v4l.pm +++ b/perl-install/harddrake/v4l.pm @@ -218,7 +218,7 @@ If your card is misdetected, you can force the right tuner and card types here. ] )) { - $conf{card}=$cards_lst->{$driver}{$conf{card}}; + $conf{card} = $cards_lst->{$driver}{$conf{card}}; my $options = 'radio=' . ($conf{radio} ? 1 : 0) . ' '. |