summaryrefslogtreecommitdiffstats
path: root/perl-install/mouse.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-03-14 09:25:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-03-14 09:25:40 +0000
commite2cbffc6422fc59ee624c2c399e79109c21c7cc4 (patch)
tree8bc16a2c6a23da765f7bd7ca08b5ad5dc676b6c5 /perl-install/mouse.pm
parent9266168309a593e84c47cc59edb2a6ccd49e4686 (diff)
downloaddrakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.gz
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.bz2
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.tar.xz
drakx-e2cbffc6422fc59ee624c2c399e79109c21c7cc4.zip
no_comment
Diffstat (limited to 'perl-install/mouse.pm')
-rw-r--r--perl-install/mouse.pm17
1 files changed, 14 insertions, 3 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index fcbf1e25f..3cf91bd7a 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -135,10 +135,21 @@ sub detect() {
my ($r, $wacom) = mouseconfig(); return ($r, $wacom) if $r;
require pci_probing::main;
- if (my ($c) = pci_probing::main::probe("serial_usb")) {
- eval { modules::load($c->[1], "serial_usb") };
+ if (my ($c) = pci_probing::main::probe("SERIAL_USB")) {
+ eval {
+ modules::load($c->[1], "SERIAL_USB");
+ modules::load("usbmouse");
+ modules::load("mousedev");
+ };
sleep(1);
- do { $wacom or modules::unload("serial"); return name2mouse("USB Mouse"), $wacom } if !$@ && detect_devices::tryOpen("usbmouse");
+ do {
+ $wacom or modules::unload("serial");
+ modules::load("usbkbd");
+ modules::load("keybdev");
+ return name2mouse("USB Mouse"), $wacom;
+ } if !$@ && detect_devices::tryOpen("usbmouse");
+ modules::unload("mousedev");
+ modules::unload("usbmouse");
modules::unload($c->[1], 'remove_alias');
}