From c3822da244887ef19b2ef7bba5812d18bc6ea8db Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sat, 16 Dec 2000 18:25:37 +0000
Subject: use ldetect-lst for usb => now auto detects mice types :)

---
 perl-install/mouse.pm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'perl-install/mouse.pm')

diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 2bc5d5efa..7d0cb80c4 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -215,15 +215,19 @@ sub detect() {
         detect_devices::hasMousePS2("psaux") and return fullname2mouse("PS/2|Standard", unsafe => 1), $wacom;
     }
 
-    if (modules::get_alias("usb-interface") && detect_devices::hasUsbMouse()) {
-	eval { 
-	    modules::load("usbmouse");
-	    modules::load("mousedev");
-	};
-	!$@ && detect_devices::tryOpen("usbmouse") and return fullname2mouse("USB|Generic"), $wacom;
-	eval { 
-	    modules::unload("mousedev");
-	    modules::unload("usbmouse");
+    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");
+	    };
+	    !$@ && detect_devices::tryOpen("usbmouse") and 
+	      return fullname2mouse($l[0]{driver} =~ /Mouse:(.*)/ ? $1 : "USB|Generic"), $wacom;
+	    eval { 
+		modules::unload("mousedev");
+		modules::unload("usbmouse");
+	    }
 	}
     }
 
-- 
cgit v1.2.1