summaryrefslogtreecommitdiffstats
path: root/perl-install/Xconfig/main.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-03-15 14:37:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-03-15 14:37:15 +0000
commitcf5f4d02bc5380afa126c75c724517aff6356ea7 (patch)
treecb323fa52afa187870af57b752f6fad8cc6c5afc /perl-install/Xconfig/main.pm
parent439c56f83d802760f5fc10d1971cbca1154e4c60 (diff)
downloaddrakx-cf5f4d02bc5380afa126c75c724517aff6356ea7.tar
drakx-cf5f4d02bc5380afa126c75c724517aff6356ea7.tar.gz
drakx-cf5f4d02bc5380afa126c75c724517aff6356ea7.tar.bz2
drakx-cf5f4d02bc5380afa126c75c724517aff6356ea7.tar.xz
drakx-cf5f4d02bc5380afa126c75c724517aff6356ea7.zip
- new function Xconfig::monitor::is_valid()
- new function Xconfig::monitor::probe() which probes DDC, then fallbacks on DMI
Diffstat (limited to 'perl-install/Xconfig/main.pm')
-rw-r--r--perl-install/Xconfig/main.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index 715cc0d1f..abcbe8be1 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -64,10 +64,10 @@ sub configure_everything {
my $X = {};
my $ok = 1;
- my $ddc_info = Xconfig::monitor::getinfoFromDDC();
- $options->{VideoRam_probed} = $ddc_info->{VideoRam_probed};
+ my $probed_info = Xconfig::monitor::probe();
+ $options->{VideoRam_probed} = $probed_info->{VideoRam_probed};
$ok &&= $X->{card} = Xconfig::card::configure($in, $raw_X, $do_pkgs, $auto, $options);
- $ok &&= $X->{monitors} = Xconfig::monitor::configure($in, $raw_X, int($raw_X->get_devices), $ddc_info, $auto);
+ $ok &&= $X->{monitors} = Xconfig::monitor::configure($in, $raw_X, int($raw_X->get_devices), $probed_info, $auto);
$ok &&= Xconfig::screen::configure($raw_X);
$ok &&= $X->{resolution} = Xconfig::resolution_and_depth::configure($in, $raw_X, $X->{card}, $X->{monitors}, $auto);
$ok &&= Xconfig::test::test($in, $raw_X, $X->{card}, '', 'skip_badcard') if !$auto;