| [AD] Patch for multisystem joysticks |
[ Thread Index |
Date Index
| More lists.liballeg.org/allegro-developers Archives
]
Hi to everyone.
Attached is a patch, which applies to Allegro 3.9.31 WIP, which adds
support for multisystem joysticks with 9-pin connectors (Atari,
Commodore 64, MSX etc.)
JOY_TYPE_DB9_LPT[123]
It supports 2 two-button joysticks. Interface's port 1 is compatible
with Atari interface for DirectPad Pro, and port 2 is compatible with
Linux joy-db9 driver (multisystem 2-button).
JOY_TYPE_TURBOGRAFX_LPT[123]
It supports Steffen Schwenke's TurboGraFX controller
(http://www-burg-halle.de/~schwenke/parport.html), thus allowing up to 7
joysticks, each one with up to 5 buttons.
diff -ruN allegro3931/allegro/include/allegro/aldos.h allegro-patched/allegro/include/allegro/aldos.h
--- allegro3931/allegro/include/allegro/aldos.h Thu Feb 3 20:12:46 2000
+++ allegro-patched/allegro/include/allegro/aldos.h Thu Feb 3 20:28:28 2000
@@ -81,6 +81,12 @@
#define JOY_TYPE_N64PAD_LPT1 AL_ID('N','6','4','1')
#define JOY_TYPE_N64PAD_LPT2 AL_ID('N','6','4','2')
#define JOY_TYPE_N64PAD_LPT3 AL_ID('N','6','4','3')
+#define JOY_TYPE_DB9_LPT1 AL_ID('D','B','9','1')
+#define JOY_TYPE_DB9_LPT2 AL_ID('D','B','9','2')
+#define JOY_TYPE_DB9_LPT3 AL_ID('D','B','9','3')
+#define JOY_TYPE_TURBOGRAFX_LPT1 AL_ID('T','G','X','1')
+#define JOY_TYPE_TURBOGRAFX_LPT2 AL_ID('T','G','X','2')
+#define JOY_TYPE_TURBOGRAFX_LPT3 AL_ID('T','G','X','3')
#define JOY_TYPE_WINGWARRIOR AL_ID('W','W','A','R')
@@ -104,6 +110,12 @@
AL_VAR(JOYSTICK_DRIVER, joystick_n641);
AL_VAR(JOYSTICK_DRIVER, joystick_n642);
AL_VAR(JOYSTICK_DRIVER, joystick_n643);
+AL_VAR(JOYSTICK_DRIVER, joystick_db91);
+AL_VAR(JOYSTICK_DRIVER, joystick_db92);
+AL_VAR(JOYSTICK_DRIVER, joystick_db93);
+AL_VAR(JOYSTICK_DRIVER, joystick_tgx1);
+AL_VAR(JOYSTICK_DRIVER, joystick_tgx2);
+AL_VAR(JOYSTICK_DRIVER, joystick_tgx3);
AL_VAR(JOYSTICK_DRIVER, joystick_ww);
@@ -141,6 +153,16 @@
{ JOY_TYPE_N64PAD_LPT2, &joystick_n642, FALSE }, \
{ JOY_TYPE_N64PAD_LPT3, &joystick_n643, FALSE },
+#define JOYSTICK_DRIVER_DB9 \
+ { JOY_TYPE_DB9_LPT1, &joystick_db91, FALSE }, \
+ { JOY_TYPE_DB9_LPT2, &joystick_db92, FALSE }, \
+ { JOY_TYPE_DB9_LPT3, &joystick_db93, FALSE },
+
+#define JOYSTICK_DRIVER_TURBOGRAFX \
+ { JOY_TYPE_TURBOGRAFX_LPT1,&joystick_tgx1, FALSE }, \
+ { JOY_TYPE_TURBOGRAFX_LPT2,&joystick_tgx2, FALSE }, \
+ { JOY_TYPE_TURBOGRAFX_LPT3,&joystick_tgx3, FALSE },
+
#define JOYSTICK_DRIVER_WINGWARRIOR \
{ JOY_TYPE_WINGWARRIOR, &joystick_ww, TRUE },
diff -ruN allegro3931/allegro/makefile.lst allegro-patched/allegro/makefile.lst
--- allegro3931/allegro/makefile.lst Fri Feb 4 19:30:06 2000
+++ allegro-patched/allegro/makefile.lst Thu Feb 3 20:24:28 2000
@@ -125,6 +125,7 @@
src/dos/gripjoy.c \
src/dos/gripfnc.s \
src/dos/joystd.c \
+ src/dos/multijoy.c \
src/dos/mpu.c \
src/dos/n64pad.c \
src/dos/pic.c \
diff -ruN allegro3931/allegro/obj/djgpp/alld/makefile.dep allegro-patched/allegro/obj/djgpp/alld/makefile.dep
--- allegro3931/allegro/obj/djgpp/alld/makefile.dep Thu Feb 3 20:12:46 2000
+++ allegro-patched/allegro/obj/djgpp/alld/makefile.dep Fri Feb 4 19:53:10 2000
@@ -300,6 +300,10 @@
include/allegro/al386gcc.h include/allegro/aldos.h \
include/allegro/aintern.h include/allegro/aintdos.h \
include/allegro/aintvga.h
+obj/djgpp/alld/multijoy.o: src/dos/multijoy.c include/allegro.h \
+ include/allegro/alconfig.h include/allegro/aldjgpp.h \
+ include/allegro/alinline.h include/allegro/al386gcc.h \
+ include/allegro/aldos.h
obj/djgpp/alld/n64pad.o: src/dos/n64pad.c include/allegro.h \
include/allegro/alconfig.h include/allegro/aldjgpp.h \
include/allegro/alinline.h include/allegro/al386gcc.h \
diff -ruN allegro3931/allegro/obj/djgpp/alleg/makefile.dep allegro-patched/allegro/obj/djgpp/alleg/makefile.dep
--- allegro3931/allegro/obj/djgpp/alleg/makefile.dep Thu Feb 3 20:12:46 2000
+++ allegro-patched/allegro/obj/djgpp/alleg/makefile.dep Fri Feb 4 19:53:10 2000
@@ -300,6 +300,10 @@
include/allegro/al386gcc.h include/allegro/aldos.h \
include/allegro/aintern.h include/allegro/aintdos.h \
include/allegro/aintvga.h
+obj/djgpp/alleg/multijoy.o: src/dos/multijoy.c include/allegro.h \
+ include/allegro/alconfig.h include/allegro/aldjgpp.h \
+ include/allegro/alinline.h include/allegro/al386gcc.h \
+ include/allegro/aldos.h
obj/djgpp/alleg/n64pad.o: src/dos/n64pad.c include/allegro.h \
include/allegro/alconfig.h include/allegro/aldjgpp.h \
include/allegro/alinline.h include/allegro/al386gcc.h \
diff -ruN allegro3931/allegro/obj/djgpp/allp/makefile.dep allegro-patched/allegro/obj/djgpp/allp/makefile.dep
--- allegro3931/allegro/obj/djgpp/allp/makefile.dep Thu Feb 3 20:12:46 2000
+++ allegro-patched/allegro/obj/djgpp/allp/makefile.dep Fri Feb 4 19:53:10 2000
@@ -300,6 +300,10 @@
include/allegro/al386gcc.h include/allegro/aldos.h \
include/allegro/aintern.h include/allegro/aintdos.h \
include/allegro/aintvga.h
+obj/djgpp/allp/multijoy.o: src/dos/multijoy.c include/allegro.h \
+ include/allegro/alconfig.h include/allegro/aldjgpp.h \
+ include/allegro/alinline.h include/allegro/al386gcc.h \
+ include/allegro/aldos.h
obj/djgpp/allp/n64pad.o: src/dos/n64pad.c include/allegro.h \
include/allegro/alconfig.h include/allegro/aldjgpp.h \
include/allegro/alinline.h include/allegro/al386gcc.h \
diff -ruN allegro3931/allegro/src/dos/djoydrv.c allegro-patched/allegro/src/dos/djoydrv.c
--- allegro3931/allegro/src/dos/djoydrv.c Thu Feb 3 20:12:44 2000
+++ allegro-patched/allegro/src/dos/djoydrv.c Thu Feb 3 20:28:16 2000
@@ -34,4 +34,6 @@
JOYSTICK_DRIVER_SNESPAD
JOYSTICK_DRIVER_PSXPAD
JOYSTICK_DRIVER_N64PAD
+ JOYSTICK_DRIVER_DB9
+ JOYSTICK_DRIVER_TURBOGRAFX
END_JOYSTICK_DRIVER_LIST
diff -ruN allegro3931/allegro/src/dos/multijoy.c allegro-patched/allegro/src/dos/multijoy.c
--- allegro3931/allegro/src/dos/multijoy.c Thu Jan 1 00:00:00 1970
+++ allegro-patched/allegro/src/dos/multijoy.c Sat Feb 5 11:43:12 2000
@@ -0,0 +1,407 @@
+/* ______ ___ ___
+ * /\ _ \ /\_ \ /\_ \
+ * \ \ \L\ \\//\ \ \//\ \ __ __ _ __ ___
+ * \ \ __ \ \ \ \ \ \ \ /'__`\ /'_ `\/\`'__\/ __`\
+ * \ \ \/\ \ \_\ \_ \_\ \_/\ __//\ \L\ \ \ \//\ \L\ \
+ * \ \_\ \_\/\____\/\____\ \____\ \____ \ \_\\ \____/
+ * \/_/\/_/\/____/\/____/\/____/\/___L\ \/_/ \/___/
+ * /\____/
+ * \_/__/
+ *
+ * Drivers for multisystem joysticks (Atari, Commodore 64 etc.)
+ with 9-pin connectors
+
+ By Fabrizio Gennari
+
+ JOY_TYPE_DB9_LPT[123]
+
+ Supports 2 two-button joysticks. Port 1 is compatible with Linux
+ joy-db9 driver (multisystem 2-button), and port 2 is compatible
+ with Atari interface for DirectPad Pro.
+
+ Based on joy-db9 driver for Linux by Vojtech Pavlik
+ and on Atari interface for DirectPad Pro by Earle F. Philhower, III
+
+ Interface pinout
+
+
+ Parallel port Joystick port 1
+ 1----------------------------------------------------1
+ 14----------------------------------------------------2
+ 16----------------------------------------------------3
+ 17----------------------------------------------------4
+ 11----------------------------------------------------6
+ 12----------------------------------------------------7 (button 2)
+ 18----------------------------------------------------8
+
+ Joystick port 2
+ 2----------------------------------------------------1
+ 3----------------------------------------------------2
+ 4----------------------------------------------------3
+ 5----------------------------------------------------4
+ 6----------------------------------------------------6
+ 7----------------------------------------------------7 (button 2)
+ 19----------------------------------------------------8
+
+ Advantages
+
+ * Simpler to build (no diodes required)
+ * Autofire will work (if joystick supports it)
+
+ Drawbacks
+
+ * The parallel port must be in SPP (PS/2) mode in order for this
+ driver to work. In Normal mode, port 2 won't work because data
+ pins are not inputs. In EPP/ECP PS/2 mode, directions for
+ port 1 won't work (buttons will) beacuse control pins are not
+ inputs.
+
+ * The parallel port should not require pull-up resistors
+ (however, newer ones don't)
+
+ JOY_TYPE_TURBOGRAFX_LPT[123]
+
+ Supports up to 7 joysticks, each one with up to 5 buttons.
+
+ Original interface and driver by Steffen Schwenke
+ See <http://www.burg-halle.de/~schwenke/parport.html> for details
+ on how to build the interface
+
+ Advantages
+
+ * Exploits the parallel port to its limits
+
+ Drawbacks
+
+ * Autofire will not work
+
+ */
+
+#include "allegro.h"
+
+#ifndef ALLEGRO_DOS
+ #error something is wrong with the makefile
+#endif
+
+#define LPT1_BASE 0x378
+#define LPT2_BASE 0x278
+#define LPT3_BASE 0x3bc
+
+/* driver functions */
+static int db91_init();
+static int db92_init();
+static int db93_init();
+static void db91_exit();
+static void db92_exit();
+static void db93_exit();
+static int db91_poll();
+static int db92_poll();
+static int db93_poll();
+
+static int tgx1_init();
+static int tgx2_init();
+static int tgx3_init();
+static void tgx1_exit();
+static void tgx2_exit();
+static void tgx3_exit();
+static int tgx1_poll();
+static int tgx2_poll();
+static int tgx3_poll();
+
+JOYSTICK_DRIVER joystick_db91 =
+{
+ JOY_TYPE_DB9_LPT1,
+ NULL,
+ NULL,
+ "DB9-LPT1",
+ db91_init,
+ db91_exit,
+ db91_poll,
+ NULL, NULL,
+ NULL, NULL
+};
+
+JOYSTICK_DRIVER joystick_db92 =
+{
+ JOY_TYPE_DB9_LPT2,
+ NULL,
+ NULL,
+ "DB9-LPT2",
+ db92_init,
+ db92_exit,
+ db92_poll,
+ NULL, NULL,
+ NULL, NULL
+};
+
+JOYSTICK_DRIVER joystick_db93 =
+{
+ JOY_TYPE_DB9_LPT3,
+ NULL,
+ NULL,
+ "DB9-LPT3",
+ db93_init,
+ db93_exit,
+ db93_poll,
+ NULL, NULL,
+ NULL, NULL
+};
+
+JOYSTICK_DRIVER joystick_tgx1 =
+{
+ JOY_TYPE_TURBOGRAFX_LPT1,
+ NULL,
+ NULL,
+ "TGX-LPT1",
+ tgx1_init,
+ tgx1_exit,
+ tgx1_poll,
+ NULL, NULL,
+ NULL, NULL
+};
+
+JOYSTICK_DRIVER joystick_tgx2 =
+{
+ JOY_TYPE_TURBOGRAFX_LPT2,
+ NULL,
+ NULL,
+ "TGX-LPT2",
+ tgx2_init,
+ tgx2_exit,
+ tgx2_poll,
+ NULL, NULL,
+ NULL, NULL
+};
+
+JOYSTICK_DRIVER joystick_tgx3 =
+{
+ JOY_TYPE_TURBOGRAFX_LPT3,
+ NULL,
+ NULL,
+ "TGX-LPT3",
+ tgx3_init,
+ tgx3_exit,
+ tgx3_poll,
+ NULL, NULL,
+ NULL, NULL
+};
+
+#define STATUS_PORT_INVERT 0x80
+#define CONTROL_PORT_INVERT 0x0B
+
+static int db9_init (int base)
+{
+ num_joysticks = 2;
+
+ joy[0].flags = joy[1].flags = JOYFLAG_DIGITAL | JOYFLAG_SIGNED;
+ joy[0].num_sticks = joy[1].num_sticks = 1;
+ joy[0].num_buttons = joy[1].num_buttons = 2;
+ joy[0].stick[0].flags =
+ joy[1].stick[0].flags = JOYFLAG_DIGITAL | JOYFLAG_SIGNED;
+ joy[0].stick[0].num_axis =
+ joy[1].stick[0].num_axis = 2;
+ joy[0].stick[0].axis[0].name =
+ joy[1].stick[0].axis[0].name = get_config_text("Position x");
+ joy[0].stick[0].axis[1].name =
+ joy[1].stick[0].axis[1].name = get_config_text("Position y");
+ joy[0].stick[0].name =
+ joy[1].stick[0].name = get_config_text("Position");
+ joy[0].button[0].name =
+ joy[1].button[0].name = get_config_text("Button 1");
+ joy[0].button[1].name =
+ joy[1].button[0].name = get_config_text("Button 2");
+
+ /* turns the 4 control bits and the 8 data bits into inputs */
+
+ outportb(base + 2, 0x2F ^ CONTROL_PORT_INVERT);
+
+ return 0;
+}
+
+static int db91_init()
+{
+ return db9_init(LPT1_BASE);
+}
+
+static int db92_init()
+{
+ return db9_init(LPT2_BASE);
+}
+
+static int db93_init()
+{
+ return db9_init(LPT3_BASE);
+}
+
+static void db91_exit()
+{
+ outportb(LPT1_BASE + 2 , 0 ^ CONTROL_PORT_INVERT);
+ outportb(LPT1_BASE + 0x402, 0x15);
+}
+
+static void db92_exit()
+{
+ outportb(LPT2_BASE + 2 , 0 ^ CONTROL_PORT_INVERT);
+ outportb(LPT2_BASE + 0x402, 0x15);
+}
+
+static void db93_exit()
+{
+ outportb(LPT3_BASE + 2 , 0 ^ CONTROL_PORT_INVERT);
+ outportb(LPT3_BASE + 0x402, 0x15);
+}
+
+static void db9_poll(int base)
+{
+ unsigned char data, control, status;
+
+ data = inportb (base);
+ status = inportb (base + 1) ^ STATUS_PORT_INVERT;
+ control = inportb (base + 2) ^ CONTROL_PORT_INVERT;
+
+ joy[1].stick[0].axis[0].d1 = (data & 4) ? 0 : 1;
+ joy[1].stick[0].axis[0].d2 = (data & 8) ? 0 : 1;
+ joy[1].stick[0].axis[1].d1 = (data & 1) ? 0 : 1;
+ joy[1].stick[0].axis[1].d2 = (data & 2) ? 0 : 1;
+
+ joy[1].stick[0].axis[0].pos = ((data & 8) ? 0 : 128) - ((data & 4) ? 0 : 128);
+ joy[1].stick[0].axis[1].pos = ((data & 2) ? 0 : 128) - ((data & 1) ? 0 : 128);
+
+ joy[1].button[0].b = (data & 16) ? 0 : 1;
+ joy[1].button[1].b = (data & 32) ? 0 : 1;
+
+ joy[0].stick[0].axis[0].d1 = (control & 4) ? 0 : 1;
+ joy[0].stick[0].axis[0].d2 = (control & 8) ? 0 : 1;
+ joy[0].stick[0].axis[1].d1 = (control & 1) ? 0 : 1;
+ joy[0].stick[0].axis[1].d2 = (control & 2) ? 0 : 1;
+
+ joy[0].stick[0].axis[0].pos = ((control & 8) ? 0 : 128) - ((control & 4) ? 0 : 128);
+ joy[0].stick[0].axis[1].pos = ((control & 2) ? 0 : 128) - ((control & 1) ? 0 : 128);
+
+ joy[0].button[0].b = (status & 128) ? 0 : 1;
+ joy[0].button[1].b = (status & 32 ) ? 0 : 1;
+}
+
+static int db91_poll()
+{
+ db9_poll (LPT1_BASE);
+ return 0;
+}
+
+static int db92_poll()
+{
+ db9_poll (LPT2_BASE);
+ return 0;
+}
+
+static int db93_poll()
+{
+ db9_poll (LPT3_BASE);
+ return 0;
+}
+
+static int tgx_init(int base)
+{
+ int number;
+ num_joysticks=7;
+ for (number=0;number<7;number++){
+ joy[number].flags = JOYFLAG_DIGITAL | JOYFLAG_SIGNED;
+ joy[number].num_sticks = 1;
+ joy[number].num_buttons = 5;
+ joy[number].stick[0].flags = JOYFLAG_DIGITAL | JOYFLAG_SIGNED;
+ joy[number].stick[0].num_axis = 2;
+ joy[number].stick[0].axis[0].name = get_config_text ("Position x");
+ joy[number].stick[0].axis[1].name = get_config_text ("Position y");
+ joy[number].stick[0].name = get_config_text ("Position");
+ joy[number].button[0].name = get_config_text("Button 1");
+ joy[number].button[1].name = get_config_text("Button 2");
+ joy[number].button[2].name = get_config_text("Button 3");
+ joy[number].button[3].name = get_config_text("Button 4");
+ joy[number].button[4].name = get_config_text("Button 5");
+ }
+
+ /* turns the 4 control bits into inputs */
+
+ outportb(base + 2, 0x0F ^ CONTROL_PORT_INVERT);
+
+ /* If the parallel port is ECP, ensure it is in standard mode */
+
+ outportb(base + 0x402, 0x04);
+
+ return 0;
+}
+
+static int tgx1_init()
+{
+ return tgx_init(LPT1_BASE);
+}
+
+static int tgx2_init()
+{
+ return tgx_init(LPT2_BASE);
+}
+
+static int tgx3_init()
+{
+ return tgx_init(LPT3_BASE);
+}
+
+static void tgx1_exit()
+{
+ outportb (LPT1_BASE + 2, 0 ^ CONTROL_PORT_INVERT);
+}
+
+static void tgx2_exit()
+{
+ outportb (LPT2_BASE + 2, 0 ^ CONTROL_PORT_INVERT);
+}
+
+static void tgx3_exit()
+{
+ outportb (LPT3_BASE + 2, 0 ^ CONTROL_PORT_INVERT);
+}
+
+static void tgx_poll(int base)
+{
+ unsigned char control, status;
+ int number;
+
+ for (number=0;number<7;number++){
+
+ outportb (base, ~(1 << number));
+
+ status = inportb (base + 1) ^ STATUS_PORT_INVERT;
+ control = inportb (base + 2) ^ CONTROL_PORT_INVERT;
+
+ joy[number].stick[0].axis[0].d1 = (status & 64 ) ? 0 : 1;
+ joy[number].stick[0].axis[0].d2 = (status & 128) ? 0 : 1;
+ joy[number].stick[0].axis[1].d1 = (status & 16 ) ? 0 : 1;
+ joy[number].stick[0].axis[1].d2 = (status & 32 ) ? 0 : 1;
+
+ joy[number].stick[0].axis[0].pos = ((status & 128) ? 0 : 128) - ((status & 64) ? 0 : 128);
+ joy[number].stick[0].axis[1].pos = ((status & 32 ) ? 0 : 128) - ((status & 16) ? 0 : 128);
+
+ joy[number].button[0].b = (status & 8) ? 0 : 1;
+ joy[number].button[1].b = (control & 2) ? 0 : 1;
+ joy[number].button[2].b = (control & 4) ? 0 : 1;
+ joy[number].button[3].b = (control & 1) ? 0 : 1;
+ joy[number].button[4].b = (control & 8) ? 0 : 1;
+ }
+}
+static int tgx1_poll()
+{
+ tgx_poll (LPT1_BASE);
+ return 0;
+}
+
+static int tgx2_poll()
+{
+ tgx_poll (LPT2_BASE);
+ return 0;
+}
+
+static int tgx3_poll()
+{
+ tgx_poll (LPT3_BASE);
+ return 0;
+}