Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added Atari joystick support (thanks Patrice!)
  • Loading branch information
slouken committed Mar 7, 2002
1 parent 7a9db7f commit 3669a81
Show file tree
Hide file tree
Showing 6 changed files with 681 additions and 10 deletions.
44 changes: 38 additions & 6 deletions README.MiNT
Expand Up @@ -49,19 +49,19 @@ Keyboard (GEMDOS, BIOS, Ikbd)
Mouse (XBIOS, GEM, Ikbd)
Video (XBIOS (Fullscreen), GEM (Windowed and Fullscreen))
Timer (VBL vector)
Joystick and joypad support (Ikbd, Hardware)

- What is missing:
Audio support (TOS)
CDROM support (Metados, /dev/cdrom)
Joystick and joypad support (Hardware)
Threads support (TOS)

- Driver combinations:
Video Kbd Mouse Timer
xbios ikbd ikbd vbl
xbios gemdos xbios vbl
xbios bios xbios vbl
gem gem gem vbl
Video Kbd Mouse Timer Jstick Joypads
xbios ikbd ikbd vbl ikbd hardware
xbios gemdos xbios vbl - hardware
xbios bios xbios vbl - hardware
gem gem gem vbl - hardware

==============================================================================
V. Environment variables:
Expand All @@ -75,6 +75,38 @@ SDL_VIDEODRIVER:
Set to 'xbios' to force xbios video driver
Set to 'gem' to force gem video driver

SDL_JOYSTICK_ATARI:
Use any of these strings in the environment variable to enable or
disable a joystick:

'ikbd-joy1-[on|off]' for IKBD joystick on port 1
'porta-pad-[on|off]' for joypad on port A
'porta-joy0-[on|off]' for joystick 0 on port A
'porta-joy1-[on|off]' for joystick 1 on port A
'porta-lp-[on|off]' for lightpen on port A
'porta-anpad-[on|off]' for analog paddle on port A
'portb-pad-[on|off]' for joypad on port B
'portb-joy0-[on|off]' for joystick 0 on port B
'portb-joy1-[on|off]' for joystick 1 on port B
'portb-anpad-[on|off]' for analog paddle on port B

Default configuration is:
'ikbd-joy1-on' (if IKBD events driver enabled)
'porta-pad-on portb-pad-on' (if available on the machine)

port[a|b]-[pad|joy?|lp|anpad]-* strings are mutually exclusives.
On such a port, you can only use a joypad OR 1 or 2 joysticks OR
a lightpen OR an analog paddle. You must disable joypad before
setting another controller.

IKBD joystick only available when the IKBD events driver is enabled.
The second joystick port on IKBD is used by the mouse, so not usable.

Joypads are multibuttons controller (Atari Jaguar console-like).
Joysticks are 1 button, 2 axis controllers.
Lightpen and analog paddle are 2 buttons, 2 axis controllers. The 2
buttons are those affected to 1 button joysticks on the same port.

--
Patrice Mandin <pmandin@caramail.com>
http://www.multimania.com/pmandin
6 changes: 3 additions & 3 deletions configure.in
Expand Up @@ -2281,10 +2281,9 @@ case "$target" in
AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
fi
# Set up files for the joystick library
# (No joystick support yet)
if test x$enable_joystick = xyes; then
JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS dummy"
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la"
JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS mint"
JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS mint/libjoystick_mint.la"
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
Expand Down Expand Up @@ -2489,6 +2488,7 @@ src/joystick/darwin/Makefile
src/joystick/dummy/Makefile
src/joystick/linux/Makefile
src/joystick/macos/Makefile
src/joystick/mint/Makefile
src/joystick/win32/Makefile
src/cdrom/Makefile
src/cdrom/aix/Makefile
Expand Down
2 changes: 1 addition & 1 deletion src/joystick/Makefile.am
Expand Up @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libjoystick.la

# Define which subdirectories need to be built
SUBDIRS = @JOYSTICK_SUBDIRS@
DIST_SUBDIRS = dummy amigaos beos bsd darwin linux macos win32
DIST_SUBDIRS = dummy amigaos beos bsd darwin linux macos mint win32

DRIVERS = @JOYSTICK_DRIVERS@

Expand Down
6 changes: 6 additions & 0 deletions src/joystick/mint/.cvsignore
@@ -0,0 +1,6 @@
Makefile.in
Makefile
.libs
*.o
*.lo
*.la
8 changes: 8 additions & 0 deletions src/joystick/mint/Makefile.am
@@ -0,0 +1,8 @@

## Makefile.am for the MiNT joystick driver for SDL

noinst_LTLIBRARIES = libjoystick_mint.la
libjoystick_mint_la_SOURCES = $(SRCS)

# The SDL joystick driver sources
SRCS = SDL_sysjoystick.c

0 comments on commit 3669a81

Please sign in to comment.