patch-2.1.126 linux/drivers/sound/es1370.c

• Lines: 45
• Date: Sat Oct 17 15:33:46 1998
• Orig file: v2.1.125/linux/drivers/sound/es1370.c
• Orig date: Sat Sep 5 16:46:41 1998

diff -u --recursive --new-file v2.1.125/linux/drivers/sound/es1370.c linux/drivers/sound/es1370.c
@@ -24,9 +24,10 @@
  *
  * Module command line parameters:
  *   joystick if 1 enables the joystick interface on the card; but it still
- *            needs a separate joystick driver (presumably PC standard, although
- *            the chip doc doesn't say anything and it looks slightly fishy from
- *            the PCI standpoint...)
+ *            needs a driver for joysticks connected to a standard IBM-PC
+ *	      joyport. It is tested with the joy-analog driver. This 
+ *	      module must be loaded before the joystick driver. Kmod will
+ *	      not ensure that.
  *   lineout  if 1 the LINE jack is used as an output instead of an input.
  *            LINE then contains the unmixed dsp output. This can be used
  *            to make the card a four channel one: use dsp to output two
@@ -76,6 +77,8 @@
  *    22.08.98   0.12  Mixer registers actually have 5 instead of 4 bits
  *                     pointed out by Itai Nahshon
  *    31.08.98   0.13  Fix realplayer problems - dac.count issues
+ *    08.10.98   0.14  Joystick support fixed
+ *		       -- Oliver Neukum <c188@org.chemie.uni-muenchen.de>
  *
  * some important things missing in Ensoniq documentation:
  *
@@ -2242,8 +2245,11 @@
 
 /* maximum number of devices */
 #define NR_DEVICE 5
-
+#ifdef CONFIG_SOUND_ES1370_JOYPORT_BOOT
+static int joystick[NR_DEVICE] = { 1, 0, };
+#else
 static int joystick[NR_DEVICE] = { 0, };
+#endif
 static int lineout[NR_DEVICE] = { 0, };
 static int micz[NR_DEVICE] = { 0, };
 
@@ -2337,8 +2343,6 @@
 			goto err_dev3;
 		if ((s->dev_midi = register_sound_midi(&es1370_midi_fops)) < 0)
 			goto err_dev4;
-		if (s->ctrl & CTRL_JYSTK_EN)
-			request_region(0x200, JOY_EXTENT, "es1370");
 		/* initialize the chips */
 		outl(s->ctrl, s->io+ES1370_REG_CONTROL);
 		outl(s->sctrl, s->io+ES1370_REG_SERIAL_CONTROL);