From 6cb5dd30efab27e03a47cc0261d087b6e8eedcf5 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 10 Sep 2001 15:53:29 +0000
Subject: added hid type usb mouse support.

---
 perl-install/install_steps_interactive.pm | 3 +--
 perl-install/mouse.pm                     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d492f08ac..02fa7829c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -246,8 +246,7 @@ sub selectMouse {
     any::setup_thiskind($o, 'usb', !$::expert, 0, $o->{pcmcia}) if $o->{mouse}{device} eq "usbmouse";
     eval { 
 	devices::make("usbmouse");
-	modules::load("usbmouse");
-	modules::load("mousedev");
+	modules::load($_) foreach qw(hid mousedev usbmouse);
     } if $o->{mouse}{device} eq "usbmouse";
 
     $o->SUPER::selectMouse;
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 07130be50..6d80964b4 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -261,13 +261,13 @@ sub detect() {
 	if (modules::get_alias("usb-interface")) {
 	    if (my (@l) = detect_devices::usbMice()) {
 		log::l("found usb mouse $_->{driver} $_->{description} ($_->{type})") foreach @l;
-		eval { modules::load("usbmouse"); modules::load("mousedev"); };
+		eval { modules::load($_) foreach qw(hid mousedev usbmouse) };
 		if (!$@ && detect_devices::tryOpen("usbmouse")) {
 		    my $mouse = fullname2mouse($l[0]{driver} =~ /Mouse:(.*)/ ? $1 : "USB|Generic");
 		    $auxmouse and $mouse->{auxmouse} = $auxmouse; #- for laptop, we kept the PS/2 as secondary (symbolic).
 		    return $mouse;
 		}
-		eval { modules::unload("mousedev"); modules::unload("usbmouse"); };
+		eval { modules::unload($_) foreach qw(usbmouse mousedev hid) };
 	    }
 	}
 	$auxmouse;
-- 
cgit v1.2.1