diff options
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/harddrake/ui.pm | 21 |
2 files changed, 15 insertions, 8 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 6072d8d60..ce7ceab7e 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -363,7 +363,7 @@ sub getCPUs { push @cpus, $cpu if $cpu; $cpu = {}; } - /(\S*)\s*:\s*(\S*)/; + /^([^\t]*).*:\s(.*)$/; $cpu->{$1} = $2 if $1; } push @cpus, $cpu; diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm index 595e8dc50..882f0bc1a 100644 --- a/perl-install/harddrake/ui.pm +++ b/perl-install/harddrake/ui.pm @@ -27,22 +27,29 @@ my %fields = N("- pci devices: this gives the PCI slot, device and function of this card - eide devices: the device is either a slave or a master device - scsi devices: the scsi bus and the scsi device ids")], - "description" => [ N("Description"), N("this field describe the device")], + "cache size" => [ N("Cache size"), N("Size of the (second level) cpu cache") ], + "cpu family" => [ N("Cpuid family"), N("Family of the cpu (eg: 6 for i686 class)")], + "cpuid level" => [ N("Cpuid level"), N("Information level that one can obtain through the cpuid instruction")], + "cpu MHz" => [ N("Frequency (MHz)"), N("The cpu frequency in Mhz (Mega herz which in first approximation may be coarsely assimilated to number of instructions the cpu is able to execute per second)")], + "description" => [ N("Description"), N("This field describe the device")], "device" => [ N("Old device file"), N("old static device name used in dev package")], "devfs_device" => [ N("New devfs device"), N("new dinamic device name generated by incore kernel devfs")], "driver" => [ N("Module"), N("the module of the GNU/Linux kernel that handle that device")], - "flags" => [ N("Flags"), N("CPU flags reported by the kernel")], - "fpu" => [ N("Is FPU present"), N("yes means the processor has an arithmetic coprocessor")], - "fpu_exception" => [ N("Does FPU have an irq vector"), N("yes means the arithmetic coprocessor has an exception vector attached")], - "f00f_bug" => [N("F00f bug"), N("Early pentium were buggy and freeze when decoding the F00F instruction")], + "flags" => [ N("Flags"), N("CPU flags reported by the kernel")], + "fpu" => [ N("Is FPU present"), N("yes means the processor has an arithmetic coprocessor")], + "fpu_exception" => [ N("Does FPU have an irq vector"), N("yes means the arithmetic coprocessor has an exception vector attached")], + "f00f_bug" => [N("F00f bug"), N("Early pentium were buggy and freeze when decoding the F00F instruction")], + "level" => [N("Level"), N("Sub generation of the cpu")], "media_type" => [ N("Media class"), N("class of hardware device")], - "Mhz" => [ N("Frequency (Mhz)"), N("The cpu frequency in Mhz")], "Model" => [N("Model"), N("hard disk model")], + "model" => [N("Model"), N("Generation of the cpu (eg: 8 for PentiumIII, ...)")], + "model name" => [N("Model name"), N("Official vendor name of the cpu")], "nbuttons" => [ N("Number of buttons"), "the number of buttons the mouse have"], "name" => [ N("Name"), "the name of the cpu"], "processor" => [ N("Processor ID"), N("the number of the processor")], + "stepping" => [ N("Model stepping"), N("Stepping of the cpu (sub model (generation) number)") ], "Vendor" => [ N("Vendor"), N("the vendor name of the device")], "vendor_id" => [ N("Vendor"), N("the vendor name of the processor")] ); @@ -217,7 +224,7 @@ sub new { $text->insert("", $text->style->black, "", $fields{$i}[0] . ": "); $text->insert("", ($i eq 'driver' && $current_device->{$i} eq 'unknown') ? $wcolor : $color, "", "$current_device->{$i}\n\n"); - } else { print "Skip $i field\n\n" } + } else { print "Skip \"$i\" field => \"$current_device->{$i}\"\n\n" } } disconnect($module_cfg_button, 'module'); |