Commit 668d1e60 authored by Adrian Bunk's avatar Adrian Bunk Committed by Dmitry Torokhov

Input:

This patch adds dummy gameport_register_port, gameport_unregister_port
and gameport_set_phys functions to gameport.h for the case when a driver
can't use gameport.

This fixes the compilation of some OSS drivers with GAMEPORT=n without
the need to #if inside every single driver.

This patch also removes the non-working and now obsolete SOUND_GAMEPORT.

This patch is also an alternative solution for ALSA drivers with similar
problems (but #if's inside the drivers might have the advantage of
saving some more bytes of gameport is not available).

The only user-visible change is that for GAMEPORT=m the affected OSS
drivers are now allowed to be built statically (but they won't have
gameport support).
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarVojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 271b74d0
...@@ -68,23 +68,3 @@ config GAMEPORT_CS461X ...@@ -68,23 +68,3 @@ config GAMEPORT_CS461X
depends on PCI depends on PCI
endif endif
# Yes, SOUND_GAMEPORT looks a bit odd. Yes, it ends up being turned on
# in every .config. Please don't touch it. It is here to handle an
# unusual dependency between GAMEPORT and sound drivers.
#
# Some sound drivers call gameport functions. If GAMEPORT is
# not selected, empty stubs are provided for the functions and all is
# well.
# If GAMEPORT is built in, everything is fine.
# If GAMEPORT is a module, however, it would need to be loaded for the
# sound driver to be able to link properly. Therefore, the sound
# driver must be a module as well in that case. Since there's no way
# to express that directly in Kconfig, we use SOUND_GAMEPORT to
# express it. SOUND_GAMEPORT boils down to "if GAMEPORT is 'm',
# anything that depends on SOUND_GAMEPORT must be 'm' as well. if
# GAMEPORT is 'y' or 'n', it can be anything".
config SOUND_GAMEPORT
tristate
default m if GAMEPORT=m
default y
...@@ -67,6 +67,8 @@ int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mo ...@@ -67,6 +67,8 @@ int gameport_open(struct gameport *gameport, struct gameport_driver *drv, int mo
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_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
void __gameport_register_port(struct gameport *gameport, struct module *owner); void __gameport_register_port(struct gameport *gameport, struct module *owner);
static inline void gameport_register_port(struct gameport *gameport) static inline void gameport_register_port(struct gameport *gameport)
{ {
...@@ -75,6 +77,29 @@ static inline void gameport_register_port(struct gameport *gameport) ...@@ -75,6 +77,29 @@ static inline void gameport_register_port(struct gameport *gameport)
void gameport_unregister_port(struct gameport *gameport); void gameport_unregister_port(struct gameport *gameport);
void gameport_set_phys(struct gameport *gameport, const char *fmt, ...)
__attribute__ ((format (printf, 2, 3)));
#else
static inline void gameport_register_port(struct gameport *gameport)
{
return;
}
static inline void gameport_unregister_port(struct gameport *gameport)
{
return;
}
static inline void gameport_set_phys(struct gameport *gameport,
const char *fmt, ...)
{
return;
}
#endif
static inline struct gameport *gameport_allocate_port(void) static inline struct gameport *gameport_allocate_port(void)
{ {
struct gameport *gameport = kcalloc(1, sizeof(struct gameport), GFP_KERNEL); struct gameport *gameport = kcalloc(1, sizeof(struct gameport), GFP_KERNEL);
...@@ -92,9 +117,6 @@ static inline void gameport_set_name(struct gameport *gameport, const char *name ...@@ -92,9 +117,6 @@ static inline void gameport_set_name(struct gameport *gameport, const char *name
strlcpy(gameport->name, name, sizeof(gameport->name)); strlcpy(gameport->name, name, sizeof(gameport->name));
} }
void gameport_set_phys(struct gameport *gameport, const char *fmt, ...)
__attribute__ ((format (printf, 2, 3)));
/* /*
* Use the following fucntions to manipulate gameport's per-port * Use the following fucntions to manipulate gameport's per-port
* driver-specific data. * driver-specific data.
......
...@@ -112,7 +112,7 @@ config SOUND_BCM_CS4297A ...@@ -112,7 +112,7 @@ config SOUND_BCM_CS4297A
config SOUND_ES1370 config SOUND_ES1370
tristate "Ensoniq AudioPCI (ES1370)" tristate "Ensoniq AudioPCI (ES1370)"
depends on SOUND_PRIME!=n && SOUND && PCI && SOUND_GAMEPORT depends on SOUND_PRIME!=n && SOUND && PCI
help help
Say Y or M if you have a PCI sound card utilizing the Ensoniq Say Y or M if you have a PCI sound card utilizing the Ensoniq
ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find ES1370 chipset, such as Ensoniq's AudioPCI (non-97). To find
...@@ -125,7 +125,7 @@ config SOUND_ES1370 ...@@ -125,7 +125,7 @@ config SOUND_ES1370
config SOUND_ES1371 config SOUND_ES1371
tristate "Creative Ensoniq AudioPCI 97 (ES1371)" tristate "Creative Ensoniq AudioPCI 97 (ES1371)"
depends on SOUND_PRIME!=n && SOUND && PCI && SOUND_GAMEPORT depends on SOUND_PRIME!=n && SOUND && PCI
help help
Say Y or M if you have a PCI sound card utilizing the Ensoniq Say Y or M if you have a PCI sound card utilizing the Ensoniq
ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if
...@@ -138,7 +138,7 @@ config SOUND_ES1371 ...@@ -138,7 +138,7 @@ config SOUND_ES1371
config SOUND_ESSSOLO1 config SOUND_ESSSOLO1
tristate "ESS Technology Solo1" tristate "ESS Technology Solo1"
depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT && PCI depends on SOUND_PRIME!=n && SOUND && PCI
help help
Say Y or M if you have a PCI sound card utilizing the ESS Technology Say Y or M if you have a PCI sound card utilizing the ESS Technology
Solo1 chip. To find out if your sound card uses a Solo1 chip. To find out if your sound card uses a
...@@ -179,7 +179,7 @@ config SOUND_HARMONY ...@@ -179,7 +179,7 @@ config SOUND_HARMONY
config SOUND_SONICVIBES config SOUND_SONICVIBES
tristate "S3 SonicVibes" tristate "S3 SonicVibes"
depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT depends on SOUND_PRIME!=n && SOUND
help help
Say Y or M if you have a PCI sound card utilizing the S3 Say Y or M if you have a PCI sound card utilizing the S3
SonicVibes chipset. To find out if your sound card uses a SonicVibes chipset. To find out if your sound card uses a
...@@ -226,7 +226,7 @@ config SOUND_AU1550_AC97 ...@@ -226,7 +226,7 @@ config SOUND_AU1550_AC97
config SOUND_TRIDENT config SOUND_TRIDENT
tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core" tristate "Trident 4DWave DX/NX, SiS 7018 or ALi 5451 PCI Audio Core"
depends on SOUND_PRIME!=n && SOUND && SOUND_GAMEPORT depends on SOUND_PRIME!=n && SOUND
---help--- ---help---
Say Y or M if you have a PCI sound card utilizing the Trident Say Y or M if you have a PCI sound card utilizing the Trident
4DWave-DX/NX chipset or your mother board chipset has SiS 7018 4DWave-DX/NX chipset or your mother board chipset has SiS 7018
...@@ -739,7 +739,7 @@ config SOUND_NM256 ...@@ -739,7 +739,7 @@ config SOUND_NM256
config SOUND_MAD16 config SOUND_MAD16
tristate "OPTi MAD16 and/or Mozart based cards" tristate "OPTi MAD16 and/or Mozart based cards"
depends on SOUND_OSS && SOUND_GAMEPORT depends on SOUND_OSS
---help--- ---help---
Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi Answer Y if your card has a Mozart (OAK OTI-601) or MAD16 (OPTi
82C928 or 82C929 or 82C931) audio interface chip. These chips are 82C928 or 82C929 or 82C931) audio interface chip. These chips are
......
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