From cf5f4d02bc5380afa126c75c724517aff6356ea7 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 15 Mar 2005 14:37:15 +0000 Subject: - new function Xconfig::monitor::is_valid() - new function Xconfig::monitor::probe() which probes DDC, then fallbacks on DMI --- perl-install/Xconfig/main.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'perl-install/Xconfig/main.pm') 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; -- cgit v1.2.1