Commit 1c025398 authored by Vojtech Pavlik's avatar Vojtech Pavlik

The patch moves:

	* joystick drivers from drivers/char/joystick to drivers/input/joystick
	* gameport drivers from drivers/char/joystick to drivers/input/gameport
	* serio drivers from drivers/char/joystick to drivers/input/serio

I don't think the joystick drivers should stay in char, because they're
NOT character device drivers (check for register_chrdev, none to be found).

It also fixes build problems with sound driver gameport support.
parent 88d3c6a5
...@@ -178,6 +178,8 @@ DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o ...@@ -178,6 +178,8 @@ DRIVERS-$(CONFIG_HAMRADIO) += drivers/net/hamradio/hamradio.o
DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
DRIVERS-$(CONFIG_GAMEPORT) += drivers/input/gameport/gamedrv.o
DRIVERS-$(CONFIG_SERIO) += drivers/input/serio/seriodrv.o
DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o
DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \ mod-subdirs := dio mtd sbus video macintosh usb input telephony sgi ide \
message/i2o message/fusion scsi md ieee1394 pnp isdn atm \ message/i2o message/fusion scsi md ieee1394 pnp isdn atm \
fc4 net/hamradio i2c acpi bluetooth fc4 net/hamradio i2c acpi bluetooth input/serio input/gameport
subdir-y := base parport char block net sound misc media cdrom hotplug subdir-y := base parport char block net sound misc media cdrom hotplug
subdir-m := $(subdir-y) subdir-m := $(subdir-y)
...@@ -27,6 +27,8 @@ subdir-$(CONFIG_MAC) += macintosh ...@@ -27,6 +27,8 @@ subdir-$(CONFIG_MAC) += macintosh
subdir-$(CONFIG_ALL_PPC) += macintosh subdir-$(CONFIG_ALL_PPC) += macintosh
subdir-$(CONFIG_USB) += usb subdir-$(CONFIG_USB) += usb
subdir-$(CONFIG_INPUT) += input subdir-$(CONFIG_INPUT) += input
subdir-$(CONFIG_SERIO) += input/serio
subdir-$(CONFIG_GAMEPORT) += input/gameport
subdir-$(CONFIG_PHONE) += telephony subdir-$(CONFIG_PHONE) += telephony
subdir-$(CONFIG_SGI) += sgi subdir-$(CONFIG_SGI) += sgi
subdir-$(CONFIG_IDE) += ide subdir-$(CONFIG_IDE) += ide
......
...@@ -127,8 +127,6 @@ if [ "$CONFIG_MOUSE" != "n" ]; then ...@@ -127,8 +127,6 @@ if [ "$CONFIG_MOUSE" != "n" ]; then
fi fi
endmenu endmenu
source drivers/char/joystick/Config.in
tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE tristate 'QIC-02 tape support' CONFIG_QIC02_TAPE
if [ "$CONFIG_QIC02_TAPE" != "n" ]; then if [ "$CONFIG_QIC02_TAPE" != "n" ]; then
bool ' Do you want runtime configuration for QIC-02' CONFIG_QIC02_DYNCONF bool ' Do you want runtime configuration for QIC-02' CONFIG_QIC02_DYNCONF
......
...@@ -25,7 +25,7 @@ export-objs := busmouse.o console.o keyboard.o sysrq.o \ ...@@ -25,7 +25,7 @@ export-objs := busmouse.o console.o keyboard.o sysrq.o \
misc.o pty.o random.o selection.o serial.o \ misc.o pty.o random.o selection.o serial.o \
sonypi.o tty_io.o tty_ioctl.o generic_serial.o sonypi.o tty_io.o tty_ioctl.o generic_serial.o
mod-subdirs := joystick ftape drm pcmcia mod-subdirs := ftape drm pcmcia
list-multi := list-multi :=
...@@ -166,16 +166,11 @@ obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o ...@@ -166,16 +166,11 @@ obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o
obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o obj-$(CONFIG_SERIAL_TX3912) += generic_serial.o serial_tx3912.o
subdir-$(CONFIG_RIO) += rio subdir-$(CONFIG_RIO) += rio
subdir-$(CONFIG_INPUT) += joystick
obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o obj-$(CONFIG_ATIXL_BUSMOUSE) += atixlmouse.o
obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o obj-$(CONFIG_LOGIBUSMOUSE) += logibusmouse.o
obj-$(CONFIG_PRINTER) += lp.o obj-$(CONFIG_PRINTER) += lp.o
ifeq ($(CONFIG_INPUT),y)
obj-y += joystick/js.o
endif
obj-$(CONFIG_BUSMOUSE) += busmouse.o obj-$(CONFIG_BUSMOUSE) += busmouse.o
obj-$(CONFIG_DTLK) += dtlk.o obj-$(CONFIG_DTLK) += dtlk.o
obj-$(CONFIG_R3964) += n_r3964.o obj-$(CONFIG_R3964) += n_r3964.o
......
#
# Joystick driver configuration
#
mainmenu_option next_comment
comment 'Joysticks'
if [ "$CONFIG_INPUT" != "n" ]; then
dep_tristate 'Game port support' CONFIG_INPUT_GAMEPORT $CONFIG_INPUT
dep_tristate ' Classic ISA/PnP gameports' CONFIG_INPUT_NS558 $CONFIG_INPUT_GAMEPORT
dep_tristate ' PDPI Lightning 4 gamecard' CONFIG_INPUT_LIGHTNING $CONFIG_INPUT_GAMEPORT
dep_tristate ' Aureal Vortex and Trident 4DWave gameports' CONFIG_INPUT_PCIGAME $CONFIG_INPUT_GAMEPORT
dep_tristate ' Crystal SoundFusion gameports' CONFIG_INPUT_CS461X $CONFIG_INPUT_GAMEPORT
dep_tristate ' SoundBlaster Live! gameports' CONFIG_INPUT_EMU10K1 $CONFIG_INPUT_GAMEPORT
tristate 'Serial port device support' CONFIG_INPUT_SERIO
dep_tristate ' Serial port input line discipline' CONFIG_INPUT_SERPORT $CONFIG_INPUT_SERIO
else
# Must explicitly set to n for drivers/sound/Config.in
define_tristate CONFIG_INPUT_GAMEPORT n
comment 'Input core support is needed for gameports'
fi
if [ "$CONFIG_INPUT" != "n" ]; then
comment 'Joysticks'
dep_tristate ' Classic PC analog joysticks and gamepads' CONFIG_INPUT_ANALOG $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' Assasin 3D and MadCatz Panther devices' CONFIG_INPUT_A3D $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' Logitech ADI digital joysticks and gamepads' CONFIG_INPUT_ADI $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' Creative Labs Blaster Cobra gamepad' CONFIG_INPUT_COBRA $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' Genius Flight2000 Digital joysticks and gamepads' CONFIG_INPUT_GF2K $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' Gravis GrIP joysticks and gamepads' CONFIG_INPUT_GRIP $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' InterAct digital joysticks and gamepads' CONFIG_INPUT_INTERACT $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' ThrustMaster DirectConnect joysticks and gamepads' CONFIG_INPUT_TMDC $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' Microsoft SideWinder digital joysticks and gamepads' CONFIG_INPUT_SIDEWINDER $CONFIG_INPUT $CONFIG_INPUT_GAMEPORT
dep_tristate ' I-Force USB joysticks and wheels' CONFIG_INPUT_IFORCE_USB $CONFIG_INPUT $CONFIG_USB
dep_tristate ' I-Force Serial joysticks and wheels' CONFIG_INPUT_IFORCE_232 $CONFIG_INPUT $CONFIG_INPUT_SERIO
dep_tristate ' Logitech WingMan Warrior joystick' CONFIG_INPUT_WARRIOR $CONFIG_INPUT $CONFIG_INPUT_SERIO
dep_tristate ' LogiCad3d Magellan/SpaceMouse 6dof controller' CONFIG_INPUT_MAGELLAN $CONFIG_INPUT $CONFIG_INPUT_SERIO
dep_tristate ' SpaceTec SpaceOrb/Avenger 6dof controller' CONFIG_INPUT_SPACEORB $CONFIG_INPUT $CONFIG_INPUT_SERIO
dep_tristate ' SpaceTec SpaceBall 4000 FLX 6dof controller' CONFIG_INPUT_SPACEBALL $CONFIG_INPUT $CONFIG_INPUT_SERIO
dep_tristate ' Gravis Stinger gamepad' CONFIG_INPUT_STINGER $CONFIG_INPUT $CONFIG_INPUT_SERIO
dep_tristate ' Multisystem, Sega Genesis, Saturn joysticks and gamepads' CONFIG_INPUT_DB9 $CONFIG_INPUT $CONFIG_PARPORT
dep_tristate ' Multisystem, NES, SNES, N64, PSX joysticks and gamepads' CONFIG_INPUT_GAMECON $CONFIG_INPUT $CONFIG_PARPORT
dep_tristate ' Multisystem joysticks via TurboGraFX device' CONFIG_INPUT_TURBOGRAFX $CONFIG_INPUT $CONFIG_PARPORT
if [ "$CONFIG_AMIGA" = "y" ]; then
dep_tristate ' Amiga joysticks' CONFIG_INPUT_AMIJOY $CONFIG_INPUT
fi
else
comment 'Input core support is needed for joysticks'
fi
endmenu
#
# Makefile for the joystick drivers.
#
O_TARGET := js.o
# Objects that export symbols.
export-objs := serio.o gameport.o
# I-Force may need both USB and RS-232
ifeq ($(CONFIG_INPUT_IFORCE_232),m)
ifeq ($(CONFIG_INPUT_IFORCE_USB),y)
CONFIG_INPUT_IFORCE_USB := m
endif
endif
ifeq ($(CONFIG_INPUT_IFORCE_USB),m)
ifeq ($(CONFIG_INPUT_IFORCE_232),y)
CONFIG_INPUT_IFORCE_232 := m
endif
endif
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_INPUT_GAMEPORT) += gameport.o
obj-$(CONFIG_INPUT_SERIO) += serio.o
obj-$(CONFIG_INPUT_SERPORT) += serport.o
obj-$(CONFIG_INPUT_NS558) += ns558.o
obj-$(CONFIG_INPUT_LIGHTNING) += lightning.o
obj-$(CONFIG_INPUT_PCIGAME) += pcigame.o
obj-$(CONFIG_INPUT_CS461X) += cs461x.o
obj-$(CONFIG_INPUT_EMU10K1) += emu10k1-gp.o
obj-$(CONFIG_INPUT_WARRIOR) += warrior.o
obj-$(CONFIG_INPUT_MAGELLAN) += magellan.o
obj-$(CONFIG_INPUT_SPACEORB) += spaceorb.o
obj-$(CONFIG_INPUT_SPACEBALL) += spaceball.o
obj-$(CONFIG_INPUT_STINGER) += stinger.o
obj-$(CONFIG_INPUT_IFORCE_232) += iforce.o
obj-$(CONFIG_INPUT_IFORCE_USB) += iforce.o
obj-$(CONFIG_INPUT_ANALOG) += analog.o
obj-$(CONFIG_INPUT_A3D) += a3d.o
obj-$(CONFIG_INPUT_ADI) += adi.o
obj-$(CONFIG_INPUT_COBRA) += cobra.o
obj-$(CONFIG_INPUT_GF2K) += gf2k.o
obj-$(CONFIG_INPUT_GRIP) += grip.o
obj-$(CONFIG_INPUT_INTERACT) += interact.o
obj-$(CONFIG_INPUT_TMDC) += tmdc.o
obj-$(CONFIG_INPUT_SIDEWINDER) += sidewinder.o
obj-$(CONFIG_INPUT_DB9) += db9.o
obj-$(CONFIG_INPUT_GAMECON) += gamecon.o
obj-$(CONFIG_INPUT_TURBOGRAFX) += turbografx.o
obj-$(CONFIG_INPUT_AMIJOY) += amijoy.o
# The global Rules.make.
include $(TOPDIR)/Rules.make
CONFIG_INPUT CONFIG_INPUT
Say Y here if you want to enable any of the following options for Say Y here if you have any input device (mouse, keyboard, tablet,
USB Human Interface Device (HID) support. joystick, steering wheel ...) connected to your system and want
it to be available to applications. This includes standard PS/2
keyboard and mouse.
Say Y here if you want to enable any of the USB HID options in the Say N here if you have a headless (no monitor, no keyboard) system.
USB support section which require Input core support.
Otherwise, say N. More information is available: <file:Documentation/input/input.txt>
If unsure, say Y.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called input.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
CONFIG_INPUT_KEYBDEV CONFIG_INPUT_KEYBDEV
Say Y here if you want your USB HID keyboard (or an ADB keyboard Say Y here if you want your keyboard to be able to serve as a system
handled by the input layer) to be able to serve as a system keyboard. This is needed in most cases. The only exceptions are
keyboard. headless and embedded systems.
This driver is also available as a module ( = code which can be This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want). inserted in and removed from the running kernel whenever you want).
...@@ -18,10 +26,10 @@ CONFIG_INPUT_KEYBDEV ...@@ -18,10 +26,10 @@ CONFIG_INPUT_KEYBDEV
module, say M here and read <file:Documentation/modules.txt>. module, say M here and read <file:Documentation/modules.txt>.
CONFIG_INPUT_MOUSEDEV CONFIG_INPUT_MOUSEDEV
Say Y here if you want your USB HID mouse (or ADB mouse handled by Say Y here if you want your mouse to be accessible as char devices
the input layer) to be accessible as char devices 13:32+ - 13:32+ - /dev/input/mouseX and 13:63 - /dev/input/mice as an
/dev/input/mouseX and 13:63 - /dev/input/mice as an emulated ImPS/2 emulated IntelliMouse Explorer PS/2 mouse. That way, all user space
mouse. That way, all user space programs will be able to use your programs (includung SVGAlib, GPM and X) will be able to use your
mouse. mouse.
If unsure, say Y. If unsure, say Y.
...@@ -44,16 +52,23 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y ...@@ -44,16 +52,23 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y
you're not using a digitizer, this value is ignored. you're not using a digitizer, this value is ignored.
CONFIG_INPUT_JOYDEV CONFIG_INPUT_JOYDEV
Say Y here if you want your USB HID joystick or gamepad to be Say Y here if you want your joystick or gamepad to be
accessible as char device 13:0+ - /dev/input/jsX device. accessible as char device 13:0+ - /dev/input/jsX device.
If unsure, say Y.
More information is available: <file:Documentation/input/joystick.txt>
This driver is also available as a module ( = code which can be This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want). inserted in and removed from the running kernel whenever you want).
The module will be called joydev.o. If you want to compile it as a The module will be called joydev.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>. module, say M here and read <file:Documentation/modules.txt>.
CONFIG_INPUT_EVDEV CONFIG_INPUT_EVDEV
Say Y here if you want your USB or ADB HID device events be Say Y here if you want your input device events be accessible
accessible under char device 13:64+ - /dev/input/eventX in a generic under char device 13:64+ - /dev/input/eventX in a generic way.
way. This is the future ...
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called evdev.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
# #
# Input core configuration # Input device configuration
# #
mainmenu_option next_comment mainmenu_option next_comment
comment 'Input core support' comment 'Input device support'
tristate 'Input core support' CONFIG_INPUT tristate 'Input core support' CONFIG_INPUT
dep_tristate ' Keyboard support' CONFIG_INPUT_KEYBDEV $CONFIG_INPUT dep_tristate ' Keyboard interface' CONFIG_INPUT_KEYBDEV $CONFIG_INPUT
dep_tristate ' Mouse support' CONFIG_INPUT_MOUSEDEV $CONFIG_INPUT dep_tristate ' Mouse interface' CONFIG_INPUT_MOUSEDEV $CONFIG_INPUT
if [ "$CONFIG_INPUT_MOUSEDEV" != "n" ]; then if [ "$CONFIG_INPUT_MOUSEDEV" != "n" ]; then
int ' Horizontal screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_X 1024 int ' Horizontal screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_X 1024
int ' Vertical screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_Y 768 int ' Vertical screen resolution' CONFIG_INPUT_MOUSEDEV_SCREEN_Y 768
fi fi
dep_tristate ' Joystick support' CONFIG_INPUT_JOYDEV $CONFIG_INPUT dep_tristate ' Joystick interface' CONFIG_INPUT_JOYDEV $CONFIG_INPUT
dep_tristate ' Event interface support' CONFIG_INPUT_EVDEV $CONFIG_INPUT dep_tristate ' Event interface' CONFIG_INPUT_EVDEV $CONFIG_INPUT
source drivers/input/gameport/Config.in
source drivers/input/serio/Config.in
if [ "$CONFIG_INPUT" != "n" ]; then
source drivers/input/joystick/Config.in
fi
endmenu endmenu
...@@ -8,15 +8,9 @@ O_TARGET := inputdrv.o ...@@ -8,15 +8,9 @@ O_TARGET := inputdrv.o
# Objects that export symbols. # Objects that export symbols.
mod-subdirs := joystick
export-objs := input.o export-objs := input.o
# Object file lists.
obj-y :=
obj-m :=
obj-n :=
obj- :=
# Each configuration option enables a list of files. # Each configuration option enables a list of files.
obj-$(CONFIG_INPUT) += input.o obj-$(CONFIG_INPUT) += input.o
...@@ -25,6 +19,12 @@ obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o ...@@ -25,6 +19,12 @@ obj-$(CONFIG_INPUT_MOUSEDEV) += mousedev.o
obj-$(CONFIG_INPUT_JOYDEV) += joydev.o obj-$(CONFIG_INPUT_JOYDEV) += joydev.o
obj-$(CONFIG_INPUT_EVDEV) += evdev.o obj-$(CONFIG_INPUT_EVDEV) += evdev.o
subdir-$(CONFIG_INPUT_JOYSTICK) += joystick
ifeq ($(CONFIG_INPUT_JOYSTICK),y)
obj-y += joystick/joydrv.o
endif
# The global Rules.make. # The global Rules.make.
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
CONFIG_GAMEPORT
Gameport support is for the standard 15-pin PC gameport. If you
have a joystick, gamepad, gameport card, a soundcard with a gameport
or anything else that uses the gameport, say Y or M here and also to
at least one of the hardware specific drivers.
For Ensoniq AudioPCI (ES1370), AudioPCI 97 (ES1371), ESS Solo1,
S3 SonicVibes, Trident 4DWave, SiS7018, and ALi 5451 gameport
support is provided by the sound drivers, so you won't need any
from the below listed modules. You still need to say Y here.
If unsure, say Y.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called gameport.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
CONFIG_GAMEPORT_NS558
Say Y here if you have an ISA or PnP gameport.
If unsure, say Y.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called ns558.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
CONFIG_GAMEPORT_L4
Say Y here if you have a PDPI Lightning 4 gamecard.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called lightning.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
CONFIG_GAMEPORT_EMU10K1
Say Y here if you have a SoundBlaster Live! or SoundBlaster
Audigy card and want to use its gameport.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called emu10k1-gp.o. If you want to compile it as
a module, say M here and read <file:Documentation/modules.txt>.
CONFIG_GAMEPORT_PCIGAME
Say Y here if you have an Aureal Vortex 1 or 2 or a Trident
4DWave NX or DX card and want to use its gameport.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called pcigame.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
CONFIG_GAMEPORT_CS461X
Say Y here if you have a Cirrus CS461x aka "Crystal SoundFusion"
PCI audio accelerator and want to use its gameport.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called cs461x.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
#
# Gameport configuration
#
tristate 'Gameport support' CONFIG_GAMEPORT
if [ "$CONFIG_GAMEPORT" = "m" ]; then
define_tristate CONFIG_SOUND_GAMEPORT m
fi
if [ "$CONFIG_GAMEPORT" != "m" ]; then
define_tristate CONFIG_SOUND_GAMEPORT y
fi
dep_tristate ' Classic ISA and PnP gameport support' CONFIG_GAMEPORT_NS558 $CONFIG_GAMEPORT
dep_tristate ' PDPI Lightning 4 gamecard support' CONFIG_GAMEPORT_L4 $CONFIG_GAMEPORT
dep_tristate ' SB Live and Audigy gameport support' CONFIG_INPUT_EMU10K1 $CONFIG_GAMEPORT
dep_tristate ' Aureal Vortex, Vortex 2 and Trident 4DWave NX/DX gameport support' CONFIG_GAMEPORT_PCIGAME $CONFIG_GAMEPORT
dep_tristate ' ForteMedia FM801 gameport support' CONFIG_GAMEPORT_FM801 $CONFIG_GAMEPORT
dep_tristate ' Crystal SoundFusion gameport support' CONFIG_GAMEPORT_CS461x $CONFIG_GAMEPORT
#
# Makefile for the gameport drivers.
#
# The target object and module list name.
O_TARGET := gamedrv.o
# Objects that export symbols.
export-objs := gameport.o
# Each configuration option enables a list of files.
obj-$(CONFIG_GAMEPORT) += gameport.o
obj-$(CONFIG_GAMEPORT_CS461X) += cs461x.o
obj-$(CONFIG_GAMEPORT_EMU10K1) += emu10k1-gp.o
obj-$(CONFIG_GAMEPORT_L4) += lightning.o
obj-$(CONFIG_GAMEPORT_NS558) += ns558.o
obj-$(CONFIG_GAMEPORT_PCIGAME) += pcigame.o
# The global Rules.make.
include $(TOPDIR)/Rules.make
#
# Joystick driver configuration
#
bool 'Joysticks' CONFIG_INPUT_JOYSTICK
dep_tristate ' Classic PC analog joysticks and gamepads' CONFIG_JOYSTICK_ANALOG $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' Assasin 3D and MadCatz Panther devices' CONFIG_JOYSTICK_A3D $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' Logitech ADI digital joysticks and gamepads' CONFIG_JOYSTICK_ADI $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' Creative Labs Blaster Cobra gamepad' CONFIG_JOYSTICK_COBRA $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' Genius Flight2000 Digital joysticks and gamepads' CONFIG_JOYSTICK_GF2K $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' Gravis GrIP joysticks and gamepads' CONFIG_JOYSTICK_GRIP $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' InterAct digital joysticks and gamepads' CONFIG_JOYSTICK_INTERACT $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' Microsoft SideWinder digital joysticks and gamepads' CONFIG_JOYSTICK_SIDEWINDER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' ThrustMaster DirectConnect joysticks and gamepads' CONFIG_JOYSTICK_TMDC $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_GAMEPORT
dep_tristate ' I-Force USB joysticks and wheels' CONFIG_JOYSTICK_IFORCE_USB $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_USB
dep_tristate ' I-Force Serial joysticks and wheels' CONFIG_JOYSTICK_IFORCE_232 $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
dep_tristate ' Logitech WingMan Warrior joystick' CONFIG_JOYSTICK_WARRIOR $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
dep_tristate ' LogiCad3d Magellan/SpaceMouse 6dof controllers' CONFIG_JOYSTICK_MAGELLAN $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
dep_tristate ' SpaceTec SpaceOrb/Avenger 6dof controllers' CONFIG_JOYSTICK_SPACEORB $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
dep_tristate ' SpaceTec SpaceBall 6dof controllers' CONFIG_JOYSTICK_SPACEBALL $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
dep_tristate ' Gravis Stinger gamepad' CONFIG_JOYSTICK_STINGER $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_SERIO
dep_tristate ' Multisystem, Sega Genesis, Saturn joysticks and gamepads' CONFIG_JOYSTICK_DB9 $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT
dep_tristate ' Multisystem, NES, SNES, N64, PSX joysticks and gamepads' CONFIG_JOYSTICK_GAMECON $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT
dep_tristate ' Multisystem joysticks via TurboGraFX device' CONFIG_JOYSTICK_TURBOGRAFX $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK $CONFIG_PARPORT
if [ "$CONFIG_AMIGA" = "y" ]; then
dep_tristate ' Amiga joysticks' CONFIG_JOYSTICK_AMIJOY $CONFIG_INPUT $CONFIG_INPUT_JOYSTICK
fi
#
# Makefile for the input core drivers.
#
# The target object and module list name.
O_TARGET := joydrv.o
# I-Force may need both USB and RS-232
CONFIG_JOYSTICK_IFORCE := n
ifeq ($(CONFIG_JOYSTICK_IFORCE_232),y)
ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),y)
CONFIG_JOYSTICK_IFORCE := y
endif
endif
ifeq ($(CONFIG_JOYSTICK_IFORCE_232),m)
CONFIG_JOYSTICK_IFORCE := m
endif
ifeq ($(CONFIG_JOYSTICK_IFORCE_USB),m)
CONFIG_JOYSTICK_IFORCE := m
endif
# Each configuration option enables a list of files.
obj-$(CONFIG_JOYSTICK_A3D) += a3d.o
obj-$(CONFIG_JOYSTICK_ADI) += adi.o
obj-$(CONFIG_JOYSTICK_AMIGA) += amijoy.o
obj-$(CONFIG_JOYSTICK_ANALOG) += analog.o
obj-$(CONFIG_JOYSTICK_COBRA) += cobra.o
obj-$(CONFIG_JOYSTICK_DB9) += db9.o
obj-$(CONFIG_JOYSTICK_GAMECON) += gamecon.o
obj-$(CONFIG_JOYSTICK_GF2K) += gf2k.o
obj-$(CONFIG_JOYSTICK_GRIP) += grip.o
obj-$(CONFIG_JOYSTICK_IFORCE) += iforce.o
obj-$(CONFIG_JOYSTICK_INTERACT) += interact.o
obj-$(CONFIG_JOYSTICK_MAGELLAN) += magellan.o
obj-$(CONFIG_JOYSTICK_SIDEWINDER) += sidewinder.o
obj-$(CONFIG_JOYSTICK_SPACEBALL) += spaceball.o
obj-$(CONFIG_JOYSTICK_SPACEORB) += spaceorb.o
obj-$(CONFIG_JOYSTICK_STINGER) += stinger.o
obj-$(CONFIG_JOYSTICK_TMDC) += tmdc.o
obj-$(CONFIG_JOYSTICK_TURBOGRAFX) += turbografx.o
obj-$(CONFIG_JOYSTICK_WARRIOR) += warrior.o
# The global Rules.make.
include $(TOPDIR)/Rules.make
...@@ -51,10 +51,10 @@ MODULE_LICENSE("GPL"); ...@@ -51,10 +51,10 @@ MODULE_LICENSE("GPL");
#define IFORCE_MAX_LENGTH 16 #define IFORCE_MAX_LENGTH 16
#if defined(CONFIG_INPUT_IFORCE_232) || defined(CONFIG_INPUT_IFORCE_232_MODULE) #if defined(CONFIG_JOYSTICK_IFORCE_232) || defined(CONFIG_JOYSTICK_IFORCE_232_MODULE)
#define IFORCE_232 1 #define IFORCE_232 1
#endif #endif
#if defined(CONFIG_INPUT_IFORCE_USB) || defined(CONFIG_INPUT_IFORCE_USB_MODULE) #if defined(CONFIG_JOYSTICK_IFORCE_USB) || defined(CONFIG_JOYSTICK_IFORCE_USB_MODULE)
#define IFORCE_USB 2 #define IFORCE_USB 2
#endif #endif
......
CONFIG_SERIO
Say Yes here if you have any input device that uses serial I/O to
communicate with the system. This includes the
* standard AT keyboard and PS/2 mouse *
as well as serial mice, Sun keyboards, some joysticks and 6dof
devices and more.
If unsure, say Y.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called serio.o. If you want to compile it
as a module, say M here and read <file:Documentation/modules.txt>.
CONFIG_SERIO_SERPORT
Say Y here if you plan to use an input device (mouse, joystick,
tablet, 6dof) that communicates over the RS232 serial (COM) port.
More information is available: <file:Documentation/input/input.txt>
If unsure, say Y.
This driver is also available as a module ( = code which can be
inserted in and removed from the running kernel whenever you want).
The module will be called serport.o. If you want to compile it as a
module, say M here and read <file:Documentation/modules.txt>.
#
# Input core configuration
#
tristate 'Serial i/o support' CONFIG_SERIO
dep_tristate ' Serial port line discipline' CONFIG_SERIO_SERPORT $CONFIG_SERIO
#
# Makefile for the input core drivers.
#
# The target object and module list name.
O_TARGET := seriodrv.o
# Objects that export symbols.
export-objs := serio.o
# Each configuration option enables a list of files.
obj-$(CONFIG_SERIO) += serio.o
obj-$(CONFIG_SERIO_SERPORT) += serport.o
# The global Rules.make.
include $(TOPDIR)/Rules.make
...@@ -34,14 +34,14 @@ dep_tristate ' Creative SBLive! (EMU10K1)' CONFIG_SOUND_EMU10K1 $CONFIG_SOUND $ ...@@ -34,14 +34,14 @@ dep_tristate ' Creative SBLive! (EMU10K1)' CONFIG_SOUND_EMU10K1 $CONFIG_SOUND $
dep_mbool ' Creative SBLive! MIDI' CONFIG_MIDI_EMU10K1 $CONFIG_SOUND_EMU10K1 $CONFIG_EXPERIMENTAL dep_mbool ' Creative SBLive! MIDI' CONFIG_MIDI_EMU10K1 $CONFIG_SOUND_EMU10K1 $CONFIG_EXPERIMENTAL
dep_tristate ' Crystal SoundFusion (CS4280/461x)' CONFIG_SOUND_FUSION $CONFIG_SOUND dep_tristate ' Crystal SoundFusion (CS4280/461x)' CONFIG_SOUND_FUSION $CONFIG_SOUND
dep_tristate ' Crystal Sound CS4281' CONFIG_SOUND_CS4281 $CONFIG_SOUND dep_tristate ' Crystal Sound CS4281' CONFIG_SOUND_CS4281 $CONFIG_SOUND
dep_tristate ' Ensoniq AudioPCI (ES1370)' CONFIG_SOUND_ES1370 $CONFIG_SOUND $CONFIG_PCI dep_tristate ' Ensoniq AudioPCI (ES1370)' CONFIG_SOUND_ES1370 $CONFIG_SOUND $CONFIG_PCI $CONFIG_SOUND_GAMEPORT
dep_tristate ' Creative Ensoniq AudioPCI 97 (ES1371)' CONFIG_SOUND_ES1371 $CONFIG_SOUND $CONFIG_PCI dep_tristate ' Creative Ensoniq AudioPCI 97 (ES1371)' CONFIG_SOUND_ES1371 $CONFIG_SOUND $CONFIG_PCI $CONFIG_SOUND_GAMEPORT
dep_tristate ' ESS Technology Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND dep_tristate ' ESS Technology Solo1' CONFIG_SOUND_ESSSOLO1 $CONFIG_SOUND $CONFIG_SOUND_GAMEPORT
dep_tristate ' ESS Maestro, Maestro2, Maestro2E driver' CONFIG_SOUND_MAESTRO $CONFIG_SOUND dep_tristate ' ESS Maestro, Maestro2, Maestro2E driver' CONFIG_SOUND_MAESTRO $CONFIG_SOUND
dep_tristate ' ESS Maestro3/Allegro driver (EXPERIMENTAL)' CONFIG_SOUND_MAESTRO3 $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL dep_tristate ' ESS Maestro3/Allegro driver (EXPERIMENTAL)' CONFIG_SOUND_MAESTRO3 $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL
dep_tristate ' Intel ICH (i8xx) audio support' CONFIG_SOUND_ICH $CONFIG_PCI dep_tristate ' Intel ICH (i8xx) audio support' CONFIG_SOUND_ICH $CONFIG_PCI
dep_tristate ' RME Hammerfall (RME96XX) support' CONFIG_SOUND_RME96XX $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL dep_tristate ' RME Hammerfall (RME96XX) support' CONFIG_SOUND_RME96XX $CONFIG_SOUND $CONFIG_PCI $CONFIG_EXPERIMENTAL
dep_tristate ' S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND dep_tristate ' S3 SonicVibes' CONFIG_SOUND_SONICVIBES $CONFIG_SOUND $CONFIG_SOUND_GAMEPORT
if [ "$CONFIG_VISWS" = "y" ]; then if [ "$CONFIG_VISWS" = "y" ]; then
dep_tristate ' SGI Visual Workstation Sound' CONFIG_SOUND_VWSND $CONFIG_SOUND dep_tristate ' SGI Visual Workstation Sound' CONFIG_SOUND_VWSND $CONFIG_SOUND
fi fi
......
...@@ -70,7 +70,7 @@ int gameport_open(struct gameport *gameport, struct gameport_dev *dev, int mode) ...@@ -70,7 +70,7 @@ int gameport_open(struct gameport *gameport, struct gameport_dev *dev, int mode)
void gameport_close(struct gameport *gameport); void gameport_close(struct gameport *gameport);
void gameport_rescan(struct gameport *gameport); void gameport_rescan(struct gameport *gameport);
#if defined(CONFIG_INPUT_GAMEPORT) || defined(CONFIG_INPUT_GAMEPORT_MODULE) #if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
void gameport_register_port(struct gameport *gameport); void gameport_register_port(struct gameport *gameport);
void gameport_unregister_port(struct gameport *gameport); void gameport_unregister_port(struct gameport *gameport);
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment