[PATCH] for 2.5.7pre2

- add joystick support for CS46xx driver
- Audigy code updates
- fix sound/core/Config.in (wrong dep_tristate usage)
- rawmidi interface fixes (memory leak)
- chang spinlock to rwlock in pcm_native.c (streams linking)
- further fixes of dependencies in Makefiles
- remove experimental time-sync support from sequencer
- fix/update for 32-bit -> 64-bit ioctl converter code
- wavefront driver cleanups
- CMIPCI driver updates
- update joystick support in CS4281
- add detection (not support) of M Audio Delta1010LT
- add AMD768 PCI ID to intel8x0 driver
- add joystick code to trident driver
- remove static variable initialization to zero

7 files changed, 29 insertions, 8 deletions

diff --git a/include/sound/asoundef.h b/include/sound/asoundef.h
index d52f2416b709..e8b894586387 100644
--- a/include/sound/asoundef.h
+++ b/include/sound/asoundef.h
@@ -155,7 +155,7 @@
 #define MIDI_CTL_MSB_MODWHEEL         	0x01
 #define MIDI_CTL_MSB_BREATH           	0x02
 #define MIDI_CTL_MSB_FOOT             	0x04
-#define MIDI_CTL_MSB_PORTNAMENTO_TIME 	0x05
+#define MIDI_CTL_MSB_PORTAMENTO_TIME 	0x05
 #define MIDI_CTL_MSB_DATA_ENTRY		0x06
 #define MIDI_CTL_MSB_MAIN_VOLUME      	0x07
 #define MIDI_CTL_MSB_BALANCE          	0x08
@@ -171,7 +171,7 @@
 #define MIDI_CTL_LSB_MODWHEEL        	0x21
 #define MIDI_CTL_LSB_BREATH           	0x22
 #define MIDI_CTL_LSB_FOOT             	0x24
-#define MIDI_CTL_LSB_PORTNAMENTO_TIME 	0x25
+#define MIDI_CTL_LSB_PORTAMENTO_TIME 	0x25
 #define MIDI_CTL_LSB_DATA_ENTRY		0x26
 #define MIDI_CTL_LSB_MAIN_VOLUME      	0x27
 #define MIDI_CTL_LSB_BALANCE          	0x28
@@ -203,7 +203,7 @@
 #define MIDI_CTL_GENERAL_PURPOSE6     	0x51
 #define MIDI_CTL_GENERAL_PURPOSE7     	0x52
 #define MIDI_CTL_GENERAL_PURPOSE8     	0x53
-#define MIDI_CTL_PORNAMENTO_CONTROL	0x54
+#define MIDI_CTL_PORTAMENTO_CONTROL	0x54
 #define MIDI_CTL_E1_REVERB_DEPTH	0x5b
 #define MIDI_CTL_E2_TREMOLO_DEPTH	0x5c
 #define MIDI_CTL_E3_CHORUS_DEPTH	0x5d
diff --git a/include/sound/cs46xx.h b/include/sound/cs46xx.h
index f900efa6b8c4..08f62c25df32 100644
--- a/include/sound/cs46xx.h
+++ b/include/sound/cs46xx.h
@@ -1697,6 +1697,9 @@ struct _snd_cs46xx {
 	struct pci_dev *acpi_dev;
 	int acpi_port;
 	snd_kcontrol_t *eapd_switch; /* for amplifier hack */
+	int accept_valid;	/* accept mmap valid (for OSS) */
+
+	struct snd_cs46xx_gameport *gameport;
 
 #ifdef CONFIG_PM
 	struct pm_dev *pm_dev;
@@ -1711,6 +1714,7 @@ int snd_cs46xx_create(snd_card_t *card,
 int snd_cs46xx_pcm(cs46xx_t *chip, int device, snd_pcm_t **rpcm);
 int snd_cs46xx_mixer(cs46xx_t *chip);
 int snd_cs46xx_midi(cs46xx_t *chip, int device, snd_rawmidi_t **rmidi);
+void snd_cs46xx_gameport(cs46xx_t *chip);
 
 #ifdef CONFIG_PM
 void snd_cs46xx_suspend(cs46xx_t *chip);
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 3f03bec0cf41..96a3185ccba0 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -687,6 +687,12 @@
 #define A_MUCMD2		0x73
 #define A_MUSTAT2		A_MUCMD2	
 
+/* The next two are the Audigy equivalent of FXWC						*/
+/* the Audigy can record any output (16bit, 48kHz, up to 64 channel simultaneously) 		*/
+/* Each bit selects a channel for recording */
+#define A_FXWC1			0x74            /* Selects 0x7f-0x60 for FX recording           */
+#define A_FXWC2			0x75		/* Selects 0x9f-0x80 for FX recording           */
+
 #define A_SPDIF_SAMPLERATE	0x76		/* Set the sample rate of SPDIF output		*/
 #define A_SPDIF_48000		0x00000080
 #define A_SPDIF_44100		0x00000000
@@ -797,6 +803,7 @@ struct _snd_emu10k1_pcm {
 	unsigned int capture_bs_reg;	/* buffer size register */
 	unsigned int capture_idx_reg;	/* buffer index register */
 	unsigned int capture_cr_val;	/* control value */
+	unsigned int capture_cr_val2;	/* control value2 (for audigy) */
 	unsigned int capture_bs_val;	/* buffer size value */
 	unsigned int capture_bufsize;	/* buffer size in bytes */
 };
@@ -982,7 +989,7 @@ struct _snd_emu10k1 {
 	emu10k1_midi_t midi;
 	emu10k1_midi_t midi2; /* for audigy */
 
-	unsigned int efx_voices_mask;
+	unsigned int efx_voices_mask[2];
 
 	snd_info_entry_t *proc_entry;
 	snd_info_entry_t *proc_entry_fx8010_gpr;
@@ -1209,8 +1216,8 @@ int snd_emu10k1_proc_done(emu10k1_t * emu);
 #define A_EXTOUT_AREAR_R	0x0f	/*             right */
 #define A_EXTOUT_AC97_L		0x10	/* AC97 left (front) */
 #define A_EXTOUT_AC97_R		0x11	/*      right */
-#define A_EXTOUT_ADC_CAP_L	0x12	/* ADC capture buffer left */
-#define A_EXTOUT_ADC_CAP_R	0x13	/*                    right */
+#define A_EXTOUT_ADC_CAP_L	0x16	/* ADC capture buffer left */
+#define A_EXTOUT_ADC_CAP_R	0x17	/*                    right */
 
 /* Audigy constants */
 #define A_C_00000000	0xc0
diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h
index 34bbf0c21801..1cb793e55594 100644
--- a/include/sound/rawmidi.h
+++ b/include/sound/rawmidi.h
@@ -158,7 +158,7 @@ int snd_rawmidi_control_ioctl(snd_card_t * card,
 /* callbacks */
 
 void snd_rawmidi_receive_reset(snd_rawmidi_substream_t * substream);
-int snd_rawmidi_receive(snd_rawmidi_substream_t * substream, unsigned char *buffer, int count);
+int snd_rawmidi_receive(snd_rawmidi_substream_t * substream, const unsigned char *buffer, int count);
 void snd_rawmidi_transmit_reset(snd_rawmidi_substream_t * substream);
 int snd_rawmidi_transmit_empty(snd_rawmidi_substream_t * substream);
 int snd_rawmidi_transmit_peek(snd_rawmidi_substream_t * substream, unsigned char *buffer, int count);
diff --git a/include/sound/sndmagic.h b/include/sound/sndmagic.h
index 760651da578f..c2398e775e07 100644
--- a/include/sound/sndmagic.h
+++ b/include/sound/sndmagic.h
@@ -131,6 +131,7 @@ static inline int _snd_magic_bad(void *obj, unsigned long magic)
 #define mtpav_port_t_magic			0xa15a3702
 #define korg1212_t_magic			0xa15a3800
 #define opl3sa2_t_magic				0xa15a3900
+#define serialmidi_t_magic			0xa15a3a00
 
 #else
 
diff --git a/include/sound/trident.h b/include/sound/trident.h
index 1d8b1c3d7931..56bf20a14a03 100644
--- a/include/sound/trident.h
+++ b/include/sound/trident.h
@@ -161,6 +161,12 @@ enum miscint_bits {
 #define NX_SPESO                    0x2c
 #define NX_SPCSTATUS                0x64
 
+/* Joystick */
+#define GAMEPORT_GCR                0x30
+#define GAMEPORT_MODE_ADC           0x80
+#define GAMEPORT_LEGACY             0x31
+#define GAMEPORT_AXES               0x34
+
 /* NX Specific Registers */
 #define NX_TLBC                     0x6c
 
@@ -437,6 +443,8 @@ struct _snd_trident {
 
 	spinlock_t reg_lock;
 	snd_info_entry_t *proc_entry;
+
+	struct snd_trident_gameport *gameport;
 };
 
 int snd_trident_create(snd_card_t * card,
@@ -446,6 +454,7 @@ int snd_trident_create(snd_card_t * card,
 		       int max_wavetable_size,
 		       trident_t ** rtrident);
 int snd_trident_free(trident_t *trident);
+void snd_trident_gameport(trident_t *trident);
 
 int snd_trident_pcm(trident_t * trident, int device, snd_pcm_t **rpcm);
 int snd_trident_foldback_pcm(trident_t * trident, int device, snd_pcm_t **rpcm);
diff --git a/include/sound/version.h b/include/sound/version.h
index 21ced3f5bc47..f3f1456b8567 100644
--- a/include/sound/version.h
+++ b/include/sound/version.h
@@ -1,3 +1,3 @@
 /* include/version.h.  Generated automatically by configure.  */
 #define CONFIG_SND_VERSION "0.9.0beta12"
-#define CONFIG_SND_DATE " (Wed Mar 06 07:56:20 2002 UTC)"
+#define CONFIG_SND_DATE " (Mon Mar 18 15:44:40 2002 UTC)"