summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-05-19 03:01:24 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-05-19 03:01:24 +0000
commit899e400bc1962be37655f6d61e54fcc0317e3188 (patch)
tree5a2d4256c45b1f601e41df5a545336778bfa69e4
parent799442e9226213669a28af5fdc0a9c4ad1c7bce2 (diff)
downloaddrakx-899e400bc1962be37655f6d61e54fcc0317e3188.tar
drakx-899e400bc1962be37655f6d61e54fcc0317e3188.tar.gz
drakx-899e400bc1962be37655f6d61e54fcc0317e3188.tar.bz2
drakx-899e400bc1962be37655f6d61e54fcc0317e3188.tar.xz
drakx-899e400bc1962be37655f6d61e54fcc0317e3188.zip
split the old joystick category into gameport (aka joystick controllers) and
joystick (real joysticks devices)
-rw-r--r--kernel/list_modules.pm9
-rw-r--r--perl-install/harddrake/data.pm15
2 files changed, 22 insertions, 2 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index d57b5bb77..d2eba2932 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -187,7 +187,14 @@ our %l = (
photo => [ qw(dc2xx mdc800) ],
radio => [ qw(radio-gemtek-pci radio-maxiradio) ],
scanner => [ qw(scanner microtek) ],
- joystick => [ qw(cs461x ns558 emu10k1-gp fm801-gp iforce lightning ns558 vortex) ],
+ joystick => [
+ qw(iforce),
+ # there're more drivers in drivers/input/joystick but they support non USB or PCI devices
+ # and thus cannot be detected but by slow (and maybe dangerous?) load_category:
+ qw(a3d adi analog cobra db9 gamecon gf2k grip grip_mp guillemot interact),
+ qw(joydump magellan sidewinder spaceball spaceorb stinger tmdc turbografx warrior)
+ ],
+ gameport => [ qw(cs461x ns558 emu10k1-gp fm801-gp lightning ns558 vortex) ],
usb_sound => [ qw(audio dabusb dsbr100 snd-usb-audio snd-usb-usx2y) ],
webcam => [ qw(cpia_usb cyber2000fb ibmcam konicawc mod_quickcam ov511 ov511-alt ov518_decomp ovfx2 pwc quickcam se401 stv680 ultracam usbvideo usbvision vicam w9968cf) ],
},
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 0e10a7403..f27c8d9a4 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -275,12 +275,25 @@ our @tree =
checked_on_boot => 0,
},
+
+
+ {
+ class => "GAMEPORT",
+ string =>
+ #-PO: these are joysticks controllers:
+ N("Game port controllers"),
+ icon => "joystick.png",
+ configurator => "",
+ detector => sub { f(modules::probe_category('multimedia/gameport')) },
+ checked_on_boot => 0,
+ },
+
{
class => "JOYSTICK",
string => N("Joystick"),
icon => "joystick.png",
configurator => "",
- detector => sub { f(grep { $_->{description} =~ /Joystick/ } @devices) },
+ detector => sub { f(modules::probe_category('multimedia/gameport')), f(grep { $_->{description} =~ /Joystick/ } @devices) },
checked_on_boot => 0,
},