2002-10-18 17:13:36

by Osamu Tomita

Subject: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

This is part 23/26 of patchset for add support NEC PC-9800 architecture,
against 2.5.43.

Summary:
ALSA sound driver related modules.
- add feature to support CS4231+OPL3 (not PNP)
- add hardware specific initialization.

diffstat:
include/sound/mpu401.h | 4
include/sound/pc9801_118_magic.h | 411 +++++++++++++++++++++++++++++++++++++
include/sound/sound_pc9800.h | 23 ++
sound/core/Makefile | 4
sound/core/seq/Makefile | 4
sound/core/seq/instr/Makefile | 3
sound/drivers/Config.in | 3
sound/drivers/mpu401/mpu401_uart.c | 173 +++++++++++++++
sound/drivers/opl3/Makefile | 6
sound/drivers/opl3/opl3_lib.c | 29 ++
sound/isa/cs423x/cs4231.c | 32 ++
sound/isa/cs423x/cs4231_lib.c | 74 ++++++
12 files changed, 765 insertions(+), 1 deletion(-)

patch:
diff -urN linux/sound/core/Makefile linux98/sound/core/Makefile
--- linux/sound/core/Makefile Tue Oct 8 10:56:22 2002
+++ linux98/sound/core/Makefile Tue Oct 8 11:01:42 2002
@@ -53,7 +53,11 @@
obj-$(CONFIG_SND_SGALAXY) += snd-pcm.o snd-timer.o snd.o
obj-$(CONFIG_SND_AD1816A) += snd-pcm.o snd-timer.o snd.o snd-rawmidi.o snd-hwdep.o
obj-$(CONFIG_SND_AD1848) += snd-pcm.o snd-timer.o snd.o
+ifeq ($(CONFIG_PC9800),y)
+obj-$(CONFIG_SND_CS4231) += snd-pcm.o snd-timer.o snd.o snd-rawmidi.o snd-hwdep.o
+else
obj-$(CONFIG_SND_CS4231) += snd-pcm.o snd-timer.o snd.o snd-rawmidi.o
+endif
obj-$(CONFIG_SND_CS4232) += snd-pcm.o snd-timer.o snd.o snd-rawmidi.o snd-hwdep.o
obj-$(CONFIG_SND_CS4236) += snd-pcm.o snd-timer.o snd.o snd-rawmidi.o snd-hwdep.o
obj-$(CONFIG_SND_ES1688) += snd-pcm.o snd-timer.o snd.o snd-rawmidi.o snd-hwdep.o
diff -urN linux/sound/core/seq/Makefile linux98/sound/core/seq/Makefile
--- linux/sound/core/seq/Makefile Sun Sep 1 07:05:34 2002
+++ linux98/sound/core/seq/Makefile Fri Sep 6 15:52:01 2002
@@ -39,7 +39,11 @@
obj-$(CONFIG_SND_ES18XX) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
obj-$(CONFIG_SND_OPL3SA2) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
obj-$(CONFIG_SND_AD1816A) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
+ifeq ($(CONFIG_PC9800),y)
+obj-$(CONFIG_SND_CS4231) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
+else
obj-$(CONFIG_SND_CS4231) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o
+endif
obj-$(CONFIG_SND_CS4232) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
obj-$(CONFIG_SND_CS4236) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
obj-$(CONFIG_SND_ES1688) += snd-seq-midi.o snd-seq.o snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
diff -urN linux/sound/core/seq/instr/Makefile linux98/sound/core/seq/instr/Makefile
--- linux/sound/core/seq/instr/Makefile Sun Sep 1 07:04:53 2002
+++ linux98/sound/core/seq/instr/Makefile Fri Sep 6 15:55:28 2002
@@ -17,6 +17,9 @@
obj-$(CONFIG_SND_ES18XX) += snd-ainstr-fm.o
obj-$(CONFIG_SND_OPL3SA2) += snd-ainstr-fm.o
obj-$(CONFIG_SND_AD1816A) += snd-ainstr-fm.o
+ifeq ($(CONFIG_PC9800),y)
+ obj-$(CONFIG_SND_CS4231) += snd-ainstr-fm.o
+endif
obj-$(CONFIG_SND_CS4232) += snd-ainstr-fm.o
obj-$(CONFIG_SND_CS4236) += snd-ainstr-fm.o
obj-$(CONFIG_SND_ES1688) += snd-ainstr-fm.o
diff -urN linux/sound/drivers/Config.in linux98/sound/drivers/Config.in
--- linux/sound/drivers/Config.in Tue Sep 10 02:35:08 2002
+++ linux98/sound/drivers/Config.in Thu Sep 12 11:56:08 2002
@@ -8,5 +8,8 @@
dep_tristate 'MOTU MidiTimePiece AV multiport MIDI' CONFIG_SND_MTPAV $CONFIG_SND
dep_tristate 'UART16550 - MIDI only driver' CONFIG_SND_SERIAL_U16550 $CONFIG_SND
dep_tristate 'Generic MPU-401 UART driver' CONFIG_SND_MPU401 $CONFIG_SND
+if [ "$CONFIG_SND_MPU401" != "n" -a "$CONFIG_PC9800" = "y" ]; then
+ dep_bool ' Roland MPU-PC98II support' CONFIG_MPU_PC98II y
+fi

endmenu
diff -urN linux/sound/drivers/mpu401/mpu401_uart.c linux98/sound/drivers/mpu401/mpu401_uart.c
--- linux/sound/drivers/mpu401/mpu401_uart.c Tue Sep 10 02:35:08 2002
+++ linux98/sound/drivers/mpu401/mpu401_uart.c Thu Sep 12 22:59:27 2002
@@ -181,7 +181,12 @@
if (mpu->open_input && (err = mpu->open_input(mpu)) < 0)
return err;
if (! test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode)) {
+#ifndef CONFIG_PC9800x
snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1);
+#else
+ snd_mpu401_uart_cmd(mpu, MPU401_RESET, 0);
+ mdelay(10);
+#endif
snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 1);
}
mpu->substream_input = substream;
@@ -198,7 +203,12 @@
if (mpu->open_output && (err = mpu->open_output(mpu)) < 0)
return err;
if (! test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode)) {
+#ifndef CONFIG_PC9800x
snd_mpu401_uart_cmd(mpu, MPU401_RESET, 1);
+#else
+ snd_mpu401_uart_cmd(mpu, MPU401_RESET, 0);
+ mdelay(10);
+#endif
snd_mpu401_uart_cmd(mpu, MPU401_ENTER_UART, 1);
}
mpu->substream_output = substream;
@@ -400,7 +410,12 @@
spin_lock_init(&mpu->timer_lock);
mpu->hardware = hardware;
if (!integrated) {
- if ((mpu->res = request_region(port, 2, "MPU401 UART")) == NULL) {
+#ifndef CONFIG_MPU_PC98II
+ if ((mpu->res = request_region(port, 2, "MPU401 UART")) == NULL)
+#else
+ if ((mpu->res = request_region(port, 4, "MPU401 UART")) == NULL)
+#endif
+ {
snd_device_free(card, rmidi);
return -EBUSY;
}
@@ -415,6 +430,162 @@
mpu->irq = irq;
mpu->irq_flags = irq_flags;
}
+
+#ifdef CONFIG_PC9800
+ {
+ #include <sound/pc9801_118_magic.h>
+ #define outp118(reg,data) outb((reg),0x148e);outb((data),0x148f)
+ #define WAIT118 outb(0x00,0x5f)
+ int mpu_intr, count;
+#ifdef OOKUBO_ORIGINAL
+ int err = 0;
+#endif /* OOKUBO_ORIGINAL */
+
+ switch (irq)
+ {
+ case 3:
+ mpu_intr = 3;
+ break;
+ case 5:
+ mpu_intr = 2;
+ break;
+ case 6:
+ mpu_intr = 1;
+ break;
+ case 10:
+ mpu_intr = 0;
+ break;
+ default:
+ snd_printk("Bad IRQ %d\n", irq);
+ snd_device_free(card, rmidi);
+ return -EBUSY;
+ }
+
+ outp118(0x21, mpu_intr);
+ WAIT118;
+ outb(0x00, 0x148e);
+ if (inb(0x148f) & 0x08)
+ {
+ snd_printk("No MIDI daughter board found\n");
+ goto skip118;
+ }
+
+ outp118(0x20, 0x00);
+ outp118(0x05, 0x04);
+ for (count = 0; count < 35000; count ++)
+ WAIT118;
+ outb(0x05, 0x148e);
+ for (count = 0; count < 65000; count ++)
+ if (inb(0x148f) == 0x04)
+ goto set_mode_118;
+ snd_printk("MIDI daughter board initalize failed at stage1\n\n");
+ snd_device_free(card, rmidi);
+ return -EBUSY;
+
+ set_mode_118:
+ outp118(0x05, 0x0c);
+ outb(0xaa, 0x485);
+ outb(0x99, 0x485);
+ outb(0x2a, 0x485);
+ for (count = 0; count < sizeof(Data0485_99); count ++)
+ {
+ outb(Data0485_99[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x9e, 0x485);
+ outb(0x2a, 0x485);
+ for (count = 0; count < sizeof(Data0485_9E); count ++)
+ if (inb(0x485) != Data0485_9E[count])
+ {
+#ifdef OOKUBO_ORIGINAL
+ err = 1;
+#endif /* OOKUBO_ORIGINAL */
+ break;
+ }
+ outb(0x00, 0x486);
+ for (count = 0; count < 2000; count ++)
+ WAIT118;
+#ifdef OOKUBO_ORIGINAL
+ if (!err)
+ {
+ outb(0xaa, 0x485);
+ outb(0x36, 0x485);
+ outb(0x28, 0x485);
+ for (count = 0; count < sizeof(Data0485_36); count ++)
+ outb(Data0485_36[count], 0x485);
+ outb(0x00, 0x486);
+ for (count = 0; count < 1500; count ++)
+ WAIT118;
+ outp118(0x05, inb(0x148f) | 0x08);
+ outb(0xff, 0x148c);
+ outp118(0x05, inb(0x148f) & 0xf7);
+ for (count = 0; count < 1500; count ++)
+ WAIT118;
+ }
+#endif /* OOKUBO_ORIGINAL */
+
+ outb(0xaa, 0x485);
+ outb(0xa9, 0x485);
+ outb(0x21, 0x485);
+ for (count = 0; count < sizeof(Data0485_A9); count ++)
+ {
+ outb(Data0485_A9[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x0c, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_0C); count ++)
+ {
+ outb(Data0485_0C[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x66, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_66); count ++)
+ {
+ outb(Data0485_66[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x60, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_60); count ++)
+ {
+ outb(Data0485_60[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outp118(0x05, 0x04);
+ outp118(0x05, 0x00);
+ for (count = 0; count < 35000; count ++)
+ WAIT118;
+ outb(0x05, 0x148e);
+ for (count = 0; count < 65000; count ++)
+ if (inb(0x148f) == 0x00)
+ goto end_mode_118;
+ snd_printk("MIDI daughter board initalize failed at stage2\n\n");
+ snd_device_free(card, rmidi);
+ return -EBUSY;
+
+ end_mode_118:
+ outb(0x3f, 0x148d);
+ snd_printk("MIDI daughter board initalized\n");
+ skip118:
+ }
+#endif /* CONFIG_PC9800 */
+
strcpy(rmidi->name, "MPU-401 (UART)");
snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_mpu401_uart_output);
snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_mpu401_uart_input);
diff -urN linux/sound/drivers/opl3/Makefile linux98/sound/drivers/opl3/Makefile
--- linux/sound/drivers/opl3/Makefile Sun Sep 1 07:04:47 2002
+++ linux98/sound/drivers/opl3/Makefile Fri Sep 6 15:20:50 2002
@@ -38,6 +38,9 @@
obj-$(CONFIG_SND_FM801) += snd-opl3-lib.o
obj-$(CONFIG_SND_SONICVIBES) += snd-opl3-lib.o
obj-$(CONFIG_SND_YMFPCI) += snd-opl3-lib.o
+ifeq ($(CONFIG_PC9800),y)
+ obj-$(CONFIG_SND_CS4231) += snd-opl3-lib.o
+endif
ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_ALS100) += snd-opl3-synth.o
obj-$(CONFIG_SND_AZT2320) += snd-opl3-synth.o
@@ -63,6 +66,9 @@
obj-$(CONFIG_SND_FM801) += snd-opl3-synth.o
obj-$(CONFIG_SND_SONICVIBES) += snd-opl3-synth.o
obj-$(CONFIG_SND_YMFPCI) += snd-opl3-synth.o
+ ifeq ($(CONFIG_PC9800),y)
+ obj-$(CONFIG_SND_CS4231) += snd-opl3-synth.o
+ endif
endif

obj-m := $(sort $(obj-m))
diff -urN linux/sound/drivers/opl3/opl3_lib.c linux98/sound/drivers/opl3/opl3_lib.c
--- linux/sound/drivers/opl3/opl3_lib.c Tue Oct 8 10:56:24 2002
+++ linux98/sound/drivers/opl3/opl3_lib.c Tue Oct 8 11:01:42 2002
@@ -31,6 +31,10 @@
#include <linux/ioport.h>
#include <sound/minors.h>

+#ifdef CONFIG_PC9800
+#include <sound/sound_pc9800.h>
+#endif
+
MODULE_AUTHOR("Jaroslav Kysela <[email protected]>, Hannu Savolainen 1993-1996, Rob Hooft");
MODULE_DESCRIPTION("Routines for control of AdLib FM cards (OPL2/OPL3/OPL4 chips)");
MODULE_LICENSE("GPL");
@@ -438,6 +442,31 @@
opl3->command = &snd_opl3_command;
}
}
+
+#ifdef CONFIG_PC9800
+ /* ??? */
+ outb(0x00, opl3->l_port + 6);
+ inb(opl3->l_port + 7);
+ /* Enable OPL-3 Function */
+ outb(inb(PC9800_SOUND_IO_ID) | 0x03, PC9800_SOUND_IO_ID);
+
+ /* Initialize? */
+ opl3->command(opl3, OPL3_RIGHT | 0x05, 0x05);
+ opl3->command(opl3, OPL3_RIGHT | 0x08, 0x04);
+ opl3->command(opl3, OPL3_RIGHT | 0x08, 0x00);
+ opl3->command(opl3, OPL3_LEFT | 0xf7, 0x00);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x60);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x80);
+ inb(opl3->l_port);
+
+ opl3->command(opl3, OPL3_LEFT | 0x02, 0xff);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x21);
+ inb(opl3->l_port);
+
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x60);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x80);
+#endif
+
opl3->command(opl3, OPL3_LEFT | OPL3_REG_TEST, OPL3_ENABLE_WAVE_SELECT);
opl3->command(opl3, OPL3_LEFT | OPL3_REG_PERCUSSION, 0x00); /* Melodic mode */

diff -urN linux/sound/isa/cs423x/cs4231.c linux98/sound/isa/cs423x/cs4231.c
--- linux/sound/isa/cs423x/cs4231.c Sun Sep 1 07:04:46 2002
+++ linux98/sound/isa/cs423x/cs4231.c Fri Sep 6 19:09:31 2002
@@ -27,6 +27,9 @@
#include <sound/core.h>
#include <sound/cs4231.h>
#include <sound/mpu401.h>
+#ifdef CONFIG_PC9800
+#include <sound/opl3.h>
+#endif
#define SNDRV_GET_ID
#include <sound/initval.h>

@@ -42,6 +45,9 @@
static char *snd_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */
static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
static long snd_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+#ifdef CONFIG_PC9800
+static long snd_fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+#endif
static long snd_mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,11,12,15 */
static int snd_mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 9,11,12,15 */
@@ -63,6 +69,11 @@
MODULE_PARM(snd_mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
MODULE_PARM_DESC(snd_mpu_port, "MPU-401 port # for CS4231 driver.");
MODULE_PARM_SYNTAX(snd_mpu_port, SNDRV_PORT12_DESC);
+#ifdef CONFIG_PC9800
+MODULE_PARM(snd_fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(snd_fm_port, "FM port # for CS4231 driver.");
+MODULE_PARM_SYNTAX(snd_fm_port, SNDRV_PORT12_DESC);
+#endif
MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
MODULE_PARM_DESC(snd_irq, "IRQ # for CS4231 driver.");
MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
@@ -85,6 +96,9 @@
struct snd_card_cs4231 *acard;
snd_pcm_t *pcm = NULL;
cs4231_t *chip;
+#ifdef CONFIG_PC9800
+ opl3_t *opl3;
+#endif
int err;

if (snd_port[dev] == SNDRV_AUTO_PORT) {
@@ -128,6 +142,21 @@
return err;
}

+#ifdef CONFIG_PC9800
+ if (snd_fm_port[dev] >=0 && snd_fm_port[dev] != SNDRV_AUTO_PORT) {
+ if (snd_opl3_create(card,
+ snd_fm_port[dev], snd_fm_port[dev] + 2,
+ OPL3_HW_OPL3_CS, 0, &opl3) < 0) {
+ printk(KERN_ERR "CS4231: OPL3 not detected\n");
+ } else {
+ if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+ }
+ }
+#endif
+
if (snd_mpu_irq[dev] >= 0 && snd_mpu_irq[dev] != SNDRV_AUTO_IRQ) {
if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
snd_mpu_port[dev], 0,
@@ -196,6 +225,9 @@
get_option(&str,&pnp) == 2 &&
get_option(&str,(int *)&snd_port[nr_dev]) == 2 &&
get_option(&str,(int *)&snd_mpu_port[nr_dev]) == 2 &&
+#ifdef CONFIG_PC9800
+ get_option(&str,(int *)&snd_fm_port[nr_dev]) == 2 &&
+#endif
get_option(&str,&snd_irq[nr_dev]) == 2 &&
get_option(&str,&snd_mpu_irq[nr_dev]) == 2 &&
get_option(&str,&snd_dma1[nr_dev]) == 2 &&
diff -urN linux/sound/isa/cs423x/cs4231_lib.c linux98/sound/isa/cs423x/cs4231_lib.c
--- linux/sound/isa/cs423x/cs4231_lib.c Tue Oct 8 10:56:24 2002
+++ linux98/sound/isa/cs423x/cs4231_lib.c Tue Oct 8 11:01:42 2002
@@ -37,6 +37,10 @@
#include <sound/cs4231.h>
#include <sound/pcm_params.h>

+#ifdef CONFIG_PC9800
+#include <sound/sound_pc9800.h>
+#endif
+
MODULE_AUTHOR("Jaroslav Kysela <[email protected]>");
MODULE_DESCRIPTION("Routines for control of CS4231(A)/CS4232/InterWave & compatible chips");
MODULE_LICENSE("GPL");
@@ -1405,6 +1409,10 @@
};
cs4231_t *chip;
int err;
+#ifdef CONFIG_PC9800
+ int intr_bits, intr_bits2, dma_bits;
+ unsigned long flags;
+#endif

*rchip = NULL;
chip = snd_magic_kcalloc(cs4231_t, 0, GFP_KERNEL);
@@ -1436,6 +1444,13 @@
return -EBUSY;
}
chip->dma1 = dma1;
+#ifdef CONFIG_PC9800
+ if (dma2 > 3 || dma2 == 2) {
+ snd_cs4231_free(chip);
+ snd_printk("Bad DMA %d\n", dma2);
+ return -EBUSY;
+ }
+#endif
if (!(hwshare & CS4231_HWSHARE_DMA2) && dma1 != dma2 && dma2 >= 0 && request_dma(dma2, "CS4231 - 2")) {
snd_cs4231_free(chip);
return -EBUSY;
@@ -1456,6 +1471,65 @@
memcpy(&chip->image, &snd_cs4231_original_image, sizeof(snd_cs4231_original_image));

/* global setup */
+
+#ifdef CONFIG_PC9800
+ switch (irq) {
+ case 3:
+ intr_bits = 0x08;
+ intr_bits2 = 0x03;
+ break;
+ case 5:
+ intr_bits = 0x10;
+ intr_bits2 = 0x08;
+ break;
+ case 10:
+ intr_bits = 0x18;
+ intr_bits2 = 0x02;
+ break;
+ case 12:
+ intr_bits = 0x20;
+ intr_bits2 = 0x00;
+ break;
+ default:
+ snd_cs4231_free(chip);
+ snd_printk("Bad IRQ %d\n", irq);
+ return -EBUSY;
+ }
+
+ switch (dma1) {
+ case 0:
+ dma_bits = 0x01;
+ break;
+ case 1:
+ dma_bits = 0x02;
+ break;
+ case 3:
+ dma_bits = 0x03;
+ break;
+ default:
+ snd_cs4231_free(chip);
+ snd_printk("Bad DMA %d\n", dma1);
+ return -EBUSY;
+ }
+
+ if (chip->single_dma != 1)
+ intr_bits |= 0x04;
+
+ if (PC9800_SOUND_ID() == PC9800_SOUND_ID_118) {
+ /* Set up CanBe control registers. */
+ snd_printk("Setting up CanBe Sound System\n");
+ spin_lock_irqsave(&chip->reg_lock, flags);
+ outb(inb(PC9800_SOUND_IO_ID) | 0x03, PC9800_SOUND_IO_ID);
+ outb(0x01, 0x0f4a);
+ outb(intr_bits2, 0x0f4b);
+ } else {
+ spin_lock_irqsave(&chip->reg_lock, flags);
+ }
+
+ outb(intr_bits | dma_bits, 0xf40);
+ spin_unlock_irqrestore(&chip->reg_lock, flags);
+#endif /* CONFIG_PC9800 */
+
if (snd_cs4231_probe(chip) < 0) {
snd_cs4231_free(chip);
return -ENODEV;
diff -urN linux/include/sound/mpu401.h linux98/include/sound/mpu401.h
--- linux/include/sound/mpu401.h Tue Oct 8 10:56:20 2002
+++ linux98/include/sound/mpu401.h Tue Oct 8 11:01:42 2002
@@ -89,7 +89,11 @@

/* I/O ports */

+#ifndef CONFIG_MPU_PC98II
#define MPU401C(mpu) ((mpu)->port + 1)
+#else
+#define MPU401C(mpu) ((mpu)->port + 2)
+#endif
#define MPU401D(mpu) ((mpu)->port + 0)

/*
diff -urN linux/include/sound/pc9801_118_magic.h linux98/include/sound/pc9801_118_magic.h
--- linux/include/sound/pc9801_118_magic.h Thu Jan 1 09:00:00 1970
+++ linux98/include/sound/pc9801_118_magic.h Sat Apr 27 13:01:29 2002
@@ -0,0 +1,411 @@
+ static unsigned char Data0485_A9[] = {
+ 0x12, 0x03, 0x90, 0xc2, 0x2a, 0x75, 0x1e, 0x20,
+ 0xe4, 0x12, 0x2b, 0x9b, 0x22, 0xa9, 0x16, 0x77,
+ 0x33, 0xe9, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf5,
+ 0x16, 0xc2, 0x2f, 0x22, 0xa9, 0x16, 0x77, 0x42,
+ 0xe9, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf9, 0x77,
+ 0xf8, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf5, 0x16,
+ 0xc2, 0x2f, 0x22, 0x90, 0x25, 0x9f, 0x30, 0x04,
+ 0x05, 0xc2, 0x04, 0x12, 0x1f, 0x62, 0x30, 0x00,
+ 0x05, 0xc2, 0x00, 0x12, 0x15, 0xe6, 0x30, 0x01,
+ 0x05, 0xc2, 0x01, 0x12, 0x29, 0xaf, 0x30, 0x02,
+ 0x05, 0xc2, 0x02, 0x12, 0x29, 0xaf, 0x30, 0x05,
+ 0x05, 0xc2, 0x05, 0x12, 0x16, 0x65, 0x30, 0x06,
+ 0x08, 0xc2, 0x06, 0x12, 0x16, 0xb1, 0x12, 0x29,
+ 0xaf, 0x30, 0x07, 0x08, 0xc2, 0x07, 0x12, 0x16,
+ 0xe9, 0x12, 0x29, 0xaf, 0x22, 0x20, 0x97, 0x09,
+ 0x53, 0xa8, 0xfb, 0x12, 0x04, 0x2c, 0x43, 0xa8,
+ 0x04, 0x22, 0x71, 0xb8, 0x71, 0xb8, 0x71, 0xb8,
+ 0x22, 0x20, 0x4b, 0x04, 0x75, 0x4e, 0x02, 0x22,
+ 0xe5, 0x35, 0x24, 0xff, 0xf5, 0x35, 0xe5, 0x36,
+ 0x34, 0xff, 0xf5, 0x36, 0x75, 0x4e, 0x02, 0x22,
+ 0x10, 0x19, 0x02, 0x80, 0x08, 0x78, 0x00, 0xe2,
+ 0x78, 0x07, 0xf2, 0x61, 0x9b, 0x78, 0x11, 0xe2,
+ 0xc0, 0x01, 0xc0, 0xf0, 0xc0, 0xd0, 0xc0, 0x02,
+ 0x71, 0x14, 0xe5, 0x30, 0xb4, 0x01, 0x02, 0x61,
+ 0x93, 0x43, 0x08, 0x40, 0x12, 0x2a, 0x53, 0x61,
+ 0x93, 0x79, 0x03, 0xe3, 0xa2, 0xe2, 0x92, 0x26,
+ 0xa2, 0xe3, 0x92, 0x27, 0x22, 0xad, 0x2b, 0xbd,
+ 0x04, 0x07, 0xf5, 0x72, 0x78, 0x27, 0x02, 0x11,
+ 0x76, 0x02, 0x11, 0x30, 0x00, 0x00, 0x00, 0x12,
+ 0x28, 0xba, 0x79, 0x01, 0xe3, 0x75, 0x21, 0x3f,
+ 0x75, 0x49, 0x11, 0x75, 0x4c, 0x11, 0x31, 0xdc,
+ 0x75, 0x1a, 0x80, 0x51, 0x72, 0x75, 0x81, 0xe3,
+ 0x12, 0x25, 0xc9, 0x43, 0xa8, 0x01, 0x00, 0x53,
+ 0xa8, 0xfe, 0x10, 0x50, 0x02, 0x80, 0x03, 0x12,
+ 0x1a, 0x8d, 0xd1, 0x28, 0x12, 0x03, 0xd9, 0xd1,
+ 0xf2, 0x12, 0x2d, 0xf0, 0xb0, 0x11, 0x92, 0xe0,
+ 0xa2, 0x2a, 0xa0, 0xb5, 0x82, 0xe0, 0x50, 0x03,
+ 0x79, 0x0f, 0xe3, 0x71, 0xca, 0x51, 0x1e, 0x91,
+ 0xe4, 0x53, 0xa8, 0xfb, 0x10, 0x10, 0x02, 0x80,
+ 0x26, 0xc2, 0x8e, 0xd2, 0xab, 0xa2, 0x1c, 0x40,
+ 0x13, 0xa2, 0x1d, 0x50, 0x0a, 0x43, 0x08, 0x40,
+ 0x12, 0x1a, 0x01, 0xd1, 0xd7, 0x80, 0x0b, 0x12,
+ 0x26, 0x04, 0x61, 0x08, 0x43, 0x08, 0x40, 0x12,
+ 0x1a, 0x01, 0xd2, 0x1f, 0x12, 0x17, 0x7f, 0x43,
+ 0xa8, 0x04, 0x51, 0x1e, 0x91, 0xe4, 0x12, 0x13,
+ 0x34, 0x80, 0x98, 0xa2, 0x17, 0x72, 0x16, 0x72,
+ 0x15, 0x72, 0x2d, 0x50, 0x06, 0xfa, 0x12, 0x13,
+ 0x66, 0x80, 0x25, 0xc2, 0x13, 0x30, 0x28, 0x05,
+ 0x12, 0x02, 0xbe, 0x80, 0x1b, 0xb4, 0x10, 0x12,
+ 0x78, 0x00, 0xf2, 0xe5, 0x30, 0xb4, 0x01, 0x06,
+ 0x12, 0x03, 0x90, 0xd2, 0x19, 0x22, 0x12, 0x00,
+ 0xdd, 0x22, 0x75, 0x30, 0x00, 0x12, 0x00, 0xa1,
+ 0x22, 0x00, 0x00, 0x75, 0x1e, 0x00, 0x74, 0x0c,
+ 0x12, 0x2b, 0x9b, 0x74, 0x40, 0x79, 0x05, 0xf3,
+ 0x74, 0x49, 0x12, 0x2b, 0x9b, 0x74, 0x04, 0x79,
+ 0x05, 0xf3, 0x75, 0x15, 0x04, 0x74, 0x10, 0x12,
+ 0x2b, 0x9b, 0x74, 0x00, 0x79, 0x05, 0xf3, 0x74,
+ 0x17, 0x12, 0x2b, 0x9b, 0x74, 0x00, 0x79, 0x05,
+ 0xf3, 0x74, 0x1a, 0x12, 0x2b, 0x9b, 0x74, 0x00,
+ 0x79, 0x05, 0xf3, 0x74, 0x0a, 0x12, 0x2b, 0x9b,
+ 0x74, 0x20, 0x79, 0x05, 0xf3, 0x79, 0xe0, 0x77,
+ 0x20, 0x22, 0xd0, 0x02, 0xd0, 0xd0, 0xd0, 0xf0,
+ 0xd0, 0x01, 0xe5, 0x5f, 0xd0, 0xa8, 0x22, 0x00,
+ 0x00, 0x90, 0x25, 0x9f, 0x75, 0x26, 0xff, 0x75,
+ 0x27, 0xff, 0x75, 0x28, 0x03, 0x75, 0x13, 0xff,
+ 0x75, 0x1f, 0x00, 0x75, 0x14, 0xff, 0x22, 0x79,
+ 0x06, 0xe5, 0x29, 0x60, 0x0b, 0xe3, 0x30, 0xe1,
+ 0xf8, 0xe5, 0x4f, 0x64, 0x80, 0x79, 0x07, 0xf3,
+ 0x22, 0x10, 0x4c, 0x01, 0x22, 0x30, 0x4b, 0x0a,
+ 0xc2, 0x4b, 0xe5, 0x4d, 0x64, 0x80, 0xf5, 0x4f,
+ 0x80, 0x1d, 0xe5, 0x15, 0xa2, 0xe0, 0x82, 0xe6,
+ 0x40, 0x02, 0x80, 0x35, 0x30, 0x4a, 0x04, 0xb1,
+ 0xe6, 0x80, 0x0c, 0x30, 0x49, 0x04, 0x51, 0x2b,
+ 0x80, 0x05, 0x30, 0x48, 0x24, 0x91, 0x7e, 0x79,
+ 0x06, 0xe3, 0x30, 0xe0, 0x1a, 0x79, 0x06, 0xf3,
+ 0xe5, 0x4e, 0x24, 0xff, 0x50, 0x04, 0xf5, 0x4e,
+ 0x80, 0x0d, 0x79, 0x0f, 0xf3, 0x20, 0x2a, 0x07,
+ 0x12, 0x2b, 0x32, 0x75, 0x29, 0x00, 0x22, 0x91,
+ 0x1b, 0x22, 0x79, 0x0f, 0xe3, 0xc0, 0xa8, 0x75,
+ 0xa8, 0x00, 0x30, 0x2b, 0x03, 0xd0, 0xa8, 0x22,
+ 0x79, 0x0e, 0xf3, 0xd0, 0xa8, 0x22, 0x8a, 0xf0,
+ 0xe5, 0x50, 0x10, 0xf3, 0x10, 0x23, 0x23, 0x23,
+ 0x25, 0xf0, 0x12, 0x2c, 0xb8, 0xa2, 0xe7, 0x92,
+ 0xe4, 0xc2, 0xe7, 0x80, 0x08, 0x23, 0x23, 0x23,
+ 0x25, 0xf0, 0x12, 0x2c, 0x19, 0x25, 0x4f, 0x20,
+ 0xd2, 0x04, 0xf5, 0x4f, 0x80, 0x0a, 0x40, 0x05,
+ 0x75, 0x4f, 0x7f, 0x80, 0x03, 0x75, 0x4f, 0xff,
+ 0xea, 0x12, 0x2c, 0x3c, 0x25, 0x50, 0x20, 0xe7,
+ 0x05, 0xb4, 0x03, 0x07, 0x80, 0x0c, 0x75, 0x50,
+ 0x00, 0x80, 0x09, 0x40, 0x05, 0x75, 0x50, 0x03,
+ 0x80, 0x02, 0xf5, 0x50, 0x22, 0xe5, 0x4d, 0xc4,
+ 0x54, 0x0c, 0x03, 0x03, 0xfa, 0x91, 0xa9, 0x71,
+ 0xb8, 0xe5, 0x4d, 0xc4, 0x54, 0x03, 0xfa, 0x91,
+ 0xa9, 0x71, 0xb8, 0xe5, 0x4d, 0x54, 0x0c, 0x03,
+ 0x03, 0xfa, 0x91, 0xa9, 0x71, 0xb8, 0xe5, 0x4d,
+ 0x54, 0x03, 0xfa, 0x91, 0xa9, 0x71, 0xb8, 0x22,
+ 0x8a, 0xf0, 0xe5, 0x50, 0x23, 0x23, 0x25, 0xf0,
+ 0x12, 0x2b, 0xf6, 0x25, 0x4f, 0x20, 0xd2, 0x04,
+ 0xf5, 0x4f, 0x80, 0x0a, 0x40, 0x05, 0x75, 0x4f,
+ 0x7f, 0x80, 0x03, 0x75, 0x4f, 0xff, 0xea, 0x12,
+ 0x2c, 0x40, 0x25, 0x50, 0x20, 0xe7, 0x05, 0xb4,
+ 0x05, 0x07, 0x80, 0x0c, 0x75, 0x50, 0x00, 0x80,
+ 0x09, 0x40, 0x05, 0x75, 0x50, 0x05, 0x80, 0x02,
+ 0xf5, 0x50, 0x22, 0x30, 0x26, 0x03, 0x12, 0x1e,
+ 0xf5, 0x30, 0x27, 0x03, 0x12, 0x1f, 0x37, 0x30,
+ 0x25, 0x09, 0x12, 0x1f, 0x4e, 0x30, 0x23, 0x03,
+ 0x12, 0x1f, 0x1e, 0x10, 0x22, 0x02, 0x80, 0x0a,
+ 0xe5, 0x3b, 0xb4, 0xff, 0x02, 0xc2, 0x20, 0x12,
+ 0x1e, 0x79, 0x22, 0x78, 0x11, 0xe2, 0x20, 0xe0,
+ 0x07, 0xc0, 0x01, 0x12, 0x28, 0xba, 0xd0, 0x01,
+ 0x78, 0x00, 0xf2, 0x61, 0x9b, 0x12, 0x2b, 0x32,
+ 0x12, 0x17, 0x7f, 0x78, 0x00, 0xf2, 0xaa, 0x35,
+ 0xab, 0x36, 0xea, 0x24, 0xff, 0xfa, 0xeb, 0x34,
+ 0xff, 0xfb, 0x50, 0x03, 0xd2, 0x10, 0x22, 0x75,
+ 0x37, 0x01, 0x75, 0x38, 0x00, 0x75, 0x39, 0x00,
+ 0x12, 0x04, 0x04, 0xd2, 0x8e, 0x22, 0xa8, 0x2b,
+ 0xb8, 0x00, 0x02, 0x80, 0x03, 0x02, 0x11, 0xbd,
+ 0xf5, 0x74, 0x78, 0x2a, 0x12, 0x11, 0xec, 0xe5,
+ 0x74, 0x78, 0x29, 0x12, 0x11, 0xec, 0x22, 0xfa,
+ 0xe5, 0x2b, 0x60, 0x01, 0x22, 0xea, 0x78, 0x2b,
+ 0xf5, 0x75, 0x12, 0x11, 0xec, 0x22, 0x74, 0x10,
+ 0x12, 0x2b, 0x9b, 0x74, 0x20, 0x78, 0x05, 0xf2,
+ 0x74, 0x09, 0x12, 0x17, 0x75, 0xe5, 0x15, 0x44,
+ 0x80, 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x12, 0x17,
+ 0x7f, 0x22, 0x12, 0x03, 0x84, 0x79, 0x0f, 0xe3,
+ 0x78, 0x00, 0xf2, 0x12, 0x2b, 0x28, 0xe5, 0x81,
+ 0x24, 0xfc, 0xf5, 0x81, 0x61, 0x93, 0xd2, 0x07,
+ 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x4c, 0xc2,
+ 0x0f, 0x12, 0x29, 0xa3, 0x61, 0x93, 0x02, 0x1b,
+ 0x77, 0x00, 0xe1, 0x81, 0xe1, 0x9a, 0xd2, 0x2c,
+ 0xa1, 0x0c, 0x20, 0x20, 0x02, 0xd2, 0x26, 0x02,
+ 0x1e, 0x35, 0x02, 0x1e, 0x61, 0x02, 0x1d, 0x8f,
+ 0xc2, 0x8e, 0x75, 0xa8, 0x9e, 0x22, 0x41, 0x49,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x29, 0x91, 0x00, 0x00, 0x00, 0xa1, 0xbb,
+ 0xa1, 0xc3, 0x02, 0x1e, 0x6b, 0xe5, 0x4d, 0xc4,
+ 0x54, 0x0f, 0xfa, 0x91, 0x2f, 0x71, 0xb8, 0xe5,
+ 0x4d, 0x54, 0x0f, 0xfa, 0x91, 0x2f, 0x71, 0xb8,
+ 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1, 0xc6,
+ 0x02, 0x1d, 0x8f, 0xc2, 0x8e, 0xd2, 0xab, 0xc2,
+ 0x10, 0x79, 0x0f, 0xf3, 0x22, 0x00, 0x02, 0x2a,
+ 0x84, 0x00, 0xe1, 0xbc, 0xe1, 0xc8, 0x02, 0x1e,
+ 0x27, 0x00, 0x78, 0x00, 0xf2, 0x78, 0x0b, 0xe2,
+ 0xf4, 0xf5, 0x4d, 0xd2, 0x4c, 0x61, 0x9b, 0x30,
+ 0xb5, 0x02, 0xc2, 0x11, 0x22, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x79, 0xbd, 0xf1, 0x3d, 0x83,
+ 0x22, 0xdd, 0xbd, 0xbd, 0xbd, 0x61, 0xbd, 0x8d,
+ 0x7a, 0xbd, 0xbd, 0xbd, 0xbd, 0x30, 0xbd, 0xbd,
+ 0xbd, 0x55, 0xbd, 0xbd, 0xbd, 0x52, 0xbd, 0xb6,
+ 0xb6, 0xbd, 0xbd, 0xbd, 0xbd, 0x00, 0xbd, 0xbd,
+ 0xbd, 0xe8, 0xda, 0xbd, 0xbd, 0xcf, 0xb9, 0xbd,
+ 0xc4, 0xf1, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0x7b, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0x70, 0x6a, 0x57, 0x47, 0x34, 0xbd, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x29, 0xbd,
+ 0xbd, 0xbd, 0xb6, 0xb6, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x2e, 0x25,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xfe, 0xf5,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x19, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x21, 0x8f,
+ 0x09, 0xbd, 0xf9, 0x86, 0xbd, 0xbd, 0xbd, 0xd7,
+ 0xbd, 0xa9, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x9b,
+ 0xd1, 0x9d, 0xbd, 0xae, 0xbd, 0xbd, 0xbd, 0xcb,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xb6, 0xa5, 0xbd, 0xc5, 0xbd, 0xbd, 0xbd, 0xc3,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x74, 0x10,
+ 0x12, 0x2b, 0x9b, 0xe4, 0x78, 0x05, 0xf2, 0x74,
+ 0x09, 0x12, 0x17, 0x75, 0xe5, 0x15, 0x54, 0x7f,
+ 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x12, 0x17, 0x7f,
+ 0x22, 0x30, 0x51, 0x01, 0x22, 0x53, 0xa8, 0xfb,
+ 0x12, 0x2d, 0xf0, 0x50, 0x22, 0x79, 0x03, 0xe3,
+ 0x20, 0xe4, 0x1c, 0xaa, 0x35, 0xab, 0x36, 0xea,
+ 0x24, 0xf0, 0xfa, 0xeb, 0x34, 0xff, 0xfb, 0x50,
+ 0x0e, 0x10, 0x1f, 0x02, 0x80, 0x09, 0x20, 0x2a,
+ 0x03, 0x12, 0x2b, 0x32, 0x12, 0x2d, 0xd6, 0x43,
+ 0xa8, 0x04, 0x22, 0xa2, 0x1c, 0x72, 0x1d, 0x40,
+ 0x07, 0x53, 0x08, 0xbf, 0x78, 0x00, 0xf2, 0x22,
+ 0xb1, 0x1e, 0x22, 0x00, 0x79, 0x02, 0x12, 0x27,
+ 0x3d, 0x02, 0x2d, 0x37, 0x14, 0x54, 0xf0, 0x60,
+ 0x21, 0xe5, 0xf0, 0x24, 0xb6, 0xe5, 0xf0, 0x50,
+ 0x16, 0x24, 0x8b, 0x50, 0x15, 0xe5, 0xf0, 0x24,
+ 0x56, 0xe5, 0xf0, 0x50, 0x08, 0x24, 0x2f, 0x50,
+ 0x09, 0xe5, 0xf0, 0x24, 0xd9, 0x24, 0xd5, 0x24,
+ 0xf0, 0x22, 0x15, 0x81, 0x15, 0x81, 0xe9, 0x22,
+ 0x78, 0x13, 0x74, 0x00, 0xf2, 0x75, 0x2e, 0x01,
+ 0xd2, 0x6a, 0xc2, 0x69, 0xc2, 0x68, 0xc2, 0x6c,
+ 0x90, 0x25, 0x9f, 0x75, 0xb8, 0x07, 0x41, 0xa4,
+ 0xc0, 0x01, 0xc0, 0xf0, 0xc0, 0xd0, 0xc0, 0x02,
+ 0xe5, 0x3d, 0x54, 0x7d, 0x03, 0x10, 0xe5, 0x05,
+ 0x90, 0x28, 0x4b, 0x80, 0x03, 0x90, 0x2b, 0x7c,
+ 0x73, 0xe5, 0x3d, 0x30, 0xe5, 0x07, 0x74, 0xfd,
+ 0x78, 0x00, 0xf2, 0x61, 0x9b, 0x90, 0x1a, 0x97,
+ 0x74, 0xb6, 0xc0, 0xe0, 0x74, 0x27, 0xc0, 0xe0,
+ 0xc0, 0xa8, 0x02, 0x1b, 0xab, 0x90, 0x25, 0x9f,
+ 0xd0, 0xa8, 0x22, 0x90, 0x27, 0xb6, 0xc0, 0x82,
+ 0xc0, 0x83, 0xc0, 0xa8, 0x02, 0x1d, 0xa6, 0x90,
+ 0x27, 0xb6, 0xc0, 0x82, 0xc0, 0x83, 0xc0, 0xa8,
+ 0x02, 0x1e, 0x0a, 0xea, 0x24, 0xf0, 0xfa, 0xeb,
+ 0x34, 0xff, 0xfb, 0x50, 0x2e, 0x20, 0x0b, 0x05,
+ 0x85, 0x44, 0xe0, 0x80, 0x03, 0x75, 0xe0, 0x00,
+ 0x30, 0xe1, 0x20, 0xe5, 0x35, 0x24, 0xff, 0xf5,
+ 0x35, 0xe5, 0x36, 0x34, 0xff, 0xf5, 0x36, 0xc3,
+ 0xe5, 0x36, 0x13, 0xf5, 0x36, 0xe5, 0x35, 0x13,
+ 0xf5, 0x35, 0x75, 0x3a, 0x10, 0x12, 0x1a, 0x77,
+ 0x02, 0x18, 0x77, 0x75, 0x3a, 0x00, 0x12, 0x1a,
+ 0x77, 0x02, 0x18, 0x1b, 0x20, 0x4b, 0x04, 0x75,
+ 0x4e, 0x03, 0x22, 0xe5, 0x35, 0x24, 0xff, 0xf5,
+ 0x35, 0xe5, 0x36, 0x34, 0xff, 0xf5, 0x36, 0x75,
+ 0x4e, 0x03, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x02, 0x2c,
+ 0x70, 0xd2, 0x00, 0x78, 0x11, 0xe2, 0x44, 0x11,
+ 0xf5, 0x3f, 0xc2, 0x08, 0x12, 0x29, 0xa3, 0x02,
+ 0x23, 0x93, 0x21, 0x62, 0x61, 0x40, 0x01, 0x3a,
+ 0x01, 0x73, 0x21, 0x76, 0x61, 0xa8, 0x21, 0x39,
+ 0x21, 0x4a, 0x02, 0x2a, 0x7b, 0x79, 0x06, 0xf3,
+ 0xc0, 0xd0, 0x12, 0x03, 0xd9, 0x78, 0x00, 0xf2,
+ 0xd0, 0xd0, 0x22, 0x00, 0x00, 0x00, 0x00, 0x02,
+ 0x2c, 0xb4, 0x78, 0x11, 0xe2, 0x44, 0x11, 0x54,
+ 0x0f, 0xf8, 0xc4, 0x48, 0xd2, 0x05, 0xf5, 0x48,
+ 0xc2, 0x0d, 0x31, 0xa3, 0x02, 0x23, 0x93, 0x20,
+ 0x4b, 0x04, 0x75, 0x4e, 0x01, 0x22, 0xe5, 0x35,
+ 0x24, 0xff, 0xf5, 0x35, 0xe5, 0x36, 0x34, 0xff,
+ 0xf5, 0x36, 0x75, 0x4e, 0x01, 0x22, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x79, 0xd0, 0x77, 0x1b, 0x79, 0xd1, 0x77, 0x18,
+ 0x79, 0xd2, 0x77, 0x77, 0x79, 0xd3, 0x77, 0x18,
+ 0x22, 0x75, 0x29, 0x00, 0x75, 0x25, 0x00, 0x75,
+ 0x34, 0x03, 0x75, 0x22, 0x00, 0x75, 0x23, 0x05,
+ 0x75, 0x4f, 0x00, 0x75, 0x50, 0x00, 0x75, 0x30,
+ 0x00, 0x79, 0xdc, 0x77, 0x03, 0xc2, 0x8e, 0x75,
+ 0x17, 0xa8, 0x75, 0x16, 0xa8, 0x74, 0xaa, 0x79,
+ 0x01, 0xf3, 0x79, 0xd7, 0x77, 0x74, 0x79, 0xd8,
+ 0x77, 0xff, 0x79, 0xd9, 0x77, 0x07, 0x79, 0xda,
+ 0x77, 0x00, 0x12, 0x25, 0x6f, 0x43, 0x08, 0x40,
+ 0x71, 0x32, 0x79, 0x0e, 0xe3, 0x10, 0x51, 0x1c,
+ 0x74, 0x06, 0x71, 0x9b, 0xe5, 0x11, 0x44, 0x80,
+ 0x79, 0x05, 0xf3, 0xf5, 0x11, 0x74, 0x07, 0x71,
+ 0x9b, 0xe5, 0x12, 0x44, 0x80, 0x79, 0x05, 0xf3,
+ 0xf5, 0x12, 0x80, 0x18, 0x53, 0x27, 0xa0, 0x53,
+ 0x28, 0x01, 0x75, 0x20, 0xf7, 0x12, 0x23, 0x4c,
+ 0x75, 0x11, 0x80, 0x75, 0x12, 0x80, 0x12, 0x1f,
+ 0xc0, 0x12, 0x21, 0xdc, 0x79, 0x06, 0xf3, 0x22,
+ 0xd2, 0x02, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5,
+ 0x43, 0xc2, 0x0a, 0x12, 0x29, 0xa3, 0x02, 0x23,
+ 0x93, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x44,
+ 0xc2, 0x0b, 0x12, 0x29, 0xa3, 0x02, 0x23, 0x93,
+ 0x78, 0x00, 0xe2, 0x90, 0x25, 0x9f, 0x02, 0x23,
+ 0x93, 0x78, 0x11, 0xe2, 0x75, 0x20, 0xf7, 0x75,
+ 0x21, 0x3f, 0x75, 0x49, 0x11, 0x75, 0x4c, 0x11,
+ 0x31, 0xa3, 0x02, 0x23, 0x93, 0x78, 0x11, 0xe2,
+ 0x44, 0x11, 0x54, 0x0f, 0xf8, 0xc4, 0x48, 0xf8,
+ 0xe5, 0x49, 0x45, 0x3f, 0x58, 0xf5, 0x49, 0xd2,
+ 0x06, 0xc2, 0x0e, 0x31, 0xa3, 0x02, 0x23, 0x93,
+ 0xc0, 0x01, 0x20, 0x2a, 0x04, 0x71, 0x32, 0xc2,
+ 0x11, 0x11, 0x5e, 0xc2, 0x1f, 0xd0, 0x01, 0x02,
+ 0x23, 0x9b, 0x12, 0x21, 0xdc, 0x78, 0x00, 0xf2,
+ 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0xda,
+ 0xe7, 0x70, 0x2b, 0x20, 0x0a, 0x05, 0x85, 0x43,
+ 0xe0, 0x80, 0x03, 0x75, 0xe0, 0x00, 0x30, 0xe1,
+ 0x1d, 0x20, 0xe2, 0x1f, 0x74, 0xe0, 0xca, 0x74,
+ 0x00, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3, 0xf5,
+ 0x09, 0xca, 0x74, 0x01, 0x71, 0x9b, 0xca, 0x79,
+ 0x05, 0xf3, 0xf5, 0x0a, 0x80, 0x43, 0x12, 0x15,
+ 0x3e, 0x80, 0x3e, 0xe5, 0x0b, 0xb4, 0x17, 0x02,
+ 0x80, 0x0b, 0x50, 0x09, 0x74, 0x17, 0xc3, 0x95,
+ 0x0b, 0x44, 0x60, 0x80, 0x02, 0x74, 0x60, 0xca,
+ 0x74, 0x00, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3,
+ 0xf5, 0x09, 0xe5, 0x0c, 0xb4, 0x17, 0x02, 0x80,
+ 0x0b, 0x50, 0x09, 0x74, 0x17, 0xc3, 0x95, 0x0c,
+ 0x44, 0x60, 0x80, 0x02, 0x74, 0x60, 0xca, 0x74,
+ 0x01, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3, 0xf5,
+ 0x0a, 0x22, 0xd2, 0x04, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x46, 0xc2, 0x0c, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0xd2, 0x05, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x48, 0xc2, 0x0d, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0xd2, 0x06, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x49, 0xc2, 0x0e, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0x30, 0x1c, 0x21, 0x20, 0x4d, 0x1e,
+ 0xe5, 0x29, 0x60, 0x1a, 0xc2, 0x1c, 0x12, 0x19,
+ 0xec, 0x12, 0x13, 0xcf, 0xd2, 0x4d, 0x12, 0x17,
+ 0x7f, 0x78, 0x00, 0xf2, 0x79, 0x06, 0xf3, 0x43,
+ 0xa8, 0x04, 0x12, 0x24, 0x1b, 0x22, 0x12, 0x27,
+ 0x24, 0x22, 0x78, 0x00, 0xe2, 0x90, 0x25, 0x9f,
+ 0x02, 0x23, 0x93, 0x78, 0x00, 0xe2, 0xa2, 0xe7,
+ 0x72, 0xe3, 0x92, 0xe7, 0x02, 0x1d, 0x85, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x79, 0x04, 0xe3, 0x54, 0x80, 0x70, 0xf9, 0x22,
+ 0xe5, 0x29, 0x79, 0xde, 0xf7, 0x75, 0x29, 0x00,
+ 0x70, 0x12, 0xe5, 0x15, 0x79, 0xdd, 0xf7, 0x12,
+ 0x2d, 0xf0, 0x40, 0x08, 0x20, 0x1c, 0x07, 0x20,
+ 0x1d, 0x04, 0x80, 0x02, 0x71, 0x32, 0x30, 0xb5,
+ 0x0c, 0x79, 0x06, 0xf3, 0x20, 0x2a, 0x06, 0x79,
+ 0xdd, 0xe7, 0x54, 0xfc, 0xf7, 0xd2, 0x2b, 0x12,
+ 0x25, 0x6f, 0x22, 0x00, 0x00, 0x00, 0x00, 0xe5,
+ 0x15, 0xa2, 0xe0, 0xb0, 0xe6, 0x40, 0x31, 0xa2,
+ 0xe1, 0xb0, 0xe7, 0x40, 0x38, 0x10, 0x2b, 0x02,
+ 0x80, 0x26, 0x79, 0xde, 0xe7, 0x70, 0x0b, 0x79,
+ 0xdd, 0xe7, 0x20, 0xe0, 0x12, 0x20, 0xe1, 0x28,
+ 0x80, 0x16, 0xf5, 0x29, 0x30, 0x4d, 0x11, 0x20,
+ 0x4c, 0x0e, 0x12, 0x24, 0x1b, 0x80, 0x09, 0x43,
+ 0x08, 0x40, 0x12, 0x13, 0xcf, 0x12, 0x17, 0x7f,
+ 0xe5, 0x13, 0x20, 0xe4, 0x05, 0x12, 0x18, 0x1b,
+ 0x80, 0x03, 0x12, 0x18, 0x77, 0xc2, 0x2b, 0x22,
+ 0x12, 0x26, 0xd7, 0x12, 0x13, 0xb7, 0x22, 0x78,
+ 0x04, 0x79, 0x00, 0xd9, 0xfe, 0xd8, 0xfa, 0x22,
+ 0x00, 0x74, 0x09, 0x71, 0x9b, 0xe5, 0x15, 0x54,
+ 0xfc, 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x22, 0x78,
+ 0x11, 0xe2, 0x44, 0x11, 0x54, 0x0f, 0xf8, 0xc4,
+ 0x48, 0xf5, 0x46, 0xc2, 0x0c, 0xd2, 0x04, 0x31,
+ 0xa3, 0x02, 0x23, 0x93, 0x12, 0x26, 0xd7, 0x12,
+ 0x00, 0xb7, 0x22, 0x00, 0x79, 0x06, 0xf3, 0x74,
+ 0x0a, 0x71, 0x9b, 0x79, 0xe0, 0xe7, 0x44, 0x02,
+ 0xf7, 0x79, 0x05, 0xf3, 0x22, 0x74, 0x0a, 0x71,
+ 0x9b, 0x79, 0xe0, 0xe7, 0x54, 0xfd, 0xf7, 0x79,
+ 0x05, 0xf3, 0x22, 0x21, 0x59, 0x41, 0x23, 0x21,
+ 0x59, 0x41, 0x33, 0x41, 0x43, 0x21, 0x59, 0x21,
+ 0x59, 0x02, 0x25, 0x9f, 0x00, 0x74, 0x0d, 0x71,
+ 0x9b, 0x74, 0x4d, 0x79, 0x05, 0xf3, 0xd2, 0x52,
+ 0x22, 0x00, 0x53, 0x08, 0x40, 0x45, 0x08, 0x45,
+ 0x1e, 0x79, 0x04, 0xf3, 0xf5, 0x08, 0x22, 0xd2,
+ 0x01, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x42,
+ 0xc2, 0x09, 0x31, 0xa3, 0x02, 0x23, 0x93, 0x00,
+ 0x00, 0x00, 0x00, 0x71, 0x6e, 0x74, 0x09, 0x12,
+ 0x17, 0x75, 0xe5, 0x15, 0x44, 0x40, 0x79, 0x05,
+ 0xf3, 0xf5, 0x15, 0x75, 0x3a, 0x00, 0x12, 0x1a,
+ 0x77, 0x02, 0x18, 0x1b, 0xf5, 0x38, 0xe5, 0x37,
+ 0x24, 0x01, 0xf5, 0x37, 0xe5, 0x38, 0x34, 0x00,
+ 0xf5, 0x38, 0x40, 0x05, 0x75, 0x39, 0x00, 0x80,
+ 0x03, 0x75, 0x39, 0x01, 0x12, 0x04, 0x04, 0xd2,
+ 0x8e, 0x02, 0x03, 0x8d, 0x00, 0xb4, 0x0d, 0x03,
+ 0x74, 0x14, 0x22, 0x04, 0x83, 0x22, 0x00, 0x02,
+ 0xff, 0x01, 0x00, 0x05, 0xfe, 0xff, 0x00, 0x0a,
+ 0xfc, 0xfe, 0x00, 0xc0, 0xf8, 0xfc, 0x00, 0x28,
+ 0xf0, 0xf8, 0x00, 0x30, 0xe0, 0xd0, 0x01, 0x88,
+ 0x04, 0x83, 0x22, 0x00, 0xff, 0xfe, 0xfd, 0xfc,
+ 0xfc, 0xfb, 0xfa, 0xfe, 0xfd, 0xfb, 0xf9, 0xf7,
+ 0xf7, 0xf5, 0xf3, 0xfc, 0xfa, 0xf6, 0xf2, 0xee,
+ 0xee, 0xea, 0xe6, 0xf8, 0xf4, 0xec, 0xe4, 0xdc,
+ 0xd4, 0xcc, 0xc4, 0x24, 0x21, 0x83, 0x22, 0x04,
+ 0x83, 0x22, 0xff, 0x01, 0xff, 0x01, 0x00, 0x00,
+ 0x00, 0x02, 0x22, 0x32, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x83,
+ 0x22, 0x8a, 0x01, 0x20, 0x01, 0x0b, 0xea, 0xf3,
+ 0xf9, 0x8b, 0x7e, 0x6b, 0xd5, 0x01, 0x00, 0x01,
+ 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x01, 0x3a, 0x01, 0x38, 0x01, 0x4b, 0x01,
+ 0x49, 0x01, 0x5c, 0x01, 0x5a, 0x01, 0x08, 0x08,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x01, 0x15, 0x24, 0x48, 0x83, 0x22, 0x04,
+ 0x83, 0x22, 0x00, 0x01, 0x02, 0x03, 0x04, 0x06,
+ 0x07, 0x08, 0x00, 0x03, 0x05, 0x07, 0x09, 0x0d,
+ 0x0f, 0x81, 0x00, 0x06, 0x0a, 0x0e, 0x82, 0x8a,
+ 0x8e, 0x22, 0x00, 0x0c, 0x84, 0x8c, 0x24, 0x2c,
+ 0xa4, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xaa, 0x35, 0xab, 0x36,
+ 0x02, 0x27, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x25,
+ 0x03, 0x03, 0x2b, 0x03, 0x00, 0x03, 0x00, 0x03,
+ 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x83, 0x22,
+ 0x00, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x2b, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02,
+ 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x21, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x00,
+ 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x21,
+ 0x01, 0x02, 0x21, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x20, 0xb5, 0x05,
+ 0x79, 0x0f, 0xf3, 0xc2, 0x11, 0x22, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5,
+ 0x15, 0xa2, 0xe0, 0xb0, 0xe6, 0x50, 0x01, 0x22,
+ 0xa2, 0xe1, 0xb0, 0xe7, 0x22, 0x02, 0x00};
+ static unsigned char Data0485_0C[] = {
+ 0x02, 0x27, 0x69};
+ static unsigned char Data0485_66[] = {
+ 0x02, 0x25, 0x47, 0x02, 0x25, 0x60};
+ static unsigned char Data0485_60[] = {
+ 0x02, 0x22, 0x7e};
+ static unsigned char Data0485_99[] = {
+ 0xc2, 0x53, 0x02, 0x12, 0x86};
+ static unsigned char Data0485_9E[] = {
+ 0x70, 0xf9, 0x22};
+#ifdef OOKUBO_ORIGINAL
+ static unsigned char Data0485_36[] = {
+ 0x78, 0x00, 0xf2, 0xc2, 0x53, 0x74, 0x86, 0xc0,
+ 0xe0, 0x74, 0x12, 0xc0, 0xe0, 0x32};
+#endif /* OOKUBO_ORIGINAL */
diff -urN linux/include/sound/sound_pc9800.h linux98/include/sound/sound_pc9800.h
--- linux/include/sound/sound_pc9800.h Thu Jan 1 09:00:00 1970
+++ linux98/include/sound/sound_pc9800.h Fri Aug 17 22:33:07 2001
@@ -0,0 +1,23 @@
+#ifndef _SOUND_PC9800_H_
+#define _SOUND_PC9800_H_
+
+#include <asm/io.h>
+
+#define PC9800_SOUND_IO_ID 0xa460
+
+/* Sound Functions ID. */
+#define PC9800_SOUND_ID() ((inb(PC9800_SOUND_IO_ID) >> 4) & 0x0f)
+
+#define PC9800_SOUND_ID_DO 0x0 /* PC-98DO+ Internal */
+#define PC9800_SOUND_ID_GS 0x1 /* PC-98GS Internal */
+#define PC9800_SOUND_ID_73 0x2 /* PC-9801-73 (base 0x18x) */
+#define PC9800_SOUND_ID_73A 0x3 /* PC-9801-73/76 (base 0x28x) */
+#define PC9800_SOUND_ID_86 0x4 /* PC-9801-86 and compatible (base 0x18x) */
+#define PC9800_SOUND_ID_86A 0x5 /* PC-9801-86 (base 0x28x) */
+#define PC9800_SOUND_ID_NF 0x6 /* PC-9821Nf/Np Internal */
+#define PC9800_SOUND_ID_XMATE 0x7 /* X-Mate Internal and compatible */
+#define PC9800_SOUND_ID_118 0x8 /* PC-9801-118 and compatible(CanBe Internal, etc.) */
+
+#define PC9800_SOUND_ID_UNKNOWN 0xf /* Unknown (No Sound System or PC-9801-26) */
+
+#endif

2002-10-23 10:55:17

by Takashi Iwai

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

Hi,

At Sat, 19 Oct 2002 01:56:53 +0900,
Osamu Tomita wrote:
>
> This is part 23/26 of patchset for add support NEC PC-9800 architecture,
> against 2.5.43.
>
> Summary:
> ALSA sound driver related modules.
> - add feature to support CS4231+OPL3 (not PNP)

Are you sure that it's really CS4231?
If it's a higher model, such as cs4232, cs4235 or cs4236, FM OPL3 is
already supported (although additional codes to opl3 module are
necessary for PC9800).

> - add hardware specific initialization.

The MPU401 hack looks odd.
I'd propose to split a PC9800 specific driver up, rather than
including bunch of ifdefs...


Regards,
--
Takashi Iwai <[email protected]> SuSE Linux AG - http://www.suse.de
ALSA Developer ALSA Project - http://www.alsa-project.org

2002-10-23 15:29:28

by Osamu Tomita

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

Thanks for comments.

Takashi Iwai wrote:
> At Sat, 19 Oct 2002 01:56:53 +0900,
> Osamu Tomita wrote:
> >
> > This is part 23/26 of patchset for add support NEC PC-9800 architecture,
> > against 2.5.43.
> >
> > Summary:
> > ALSA sound driver related modules.
> > - add feature to support CS4231+OPL3 (not PNP)
>
> Are you sure that it's really CS4231?
> If it's a higher model, such as cs4232, cs4235 or cs4236, FM OPL3 is
> already supported (although additional codes to opl3 module are
> necessary for PC9800).
Your comment is reasonable. Some card has CS4232. But CS4232 is used
as CS4231. I guess there is some hardwired circuit. And some card has
CS4231. CS4231 driver works fine for ether chip on PC-9800.
So I choose CS4231 driver for PC-9800.

> > - add hardware specific initialization.
>
> The MPU401 hack looks odd.
> I'd propose to split a PC9800 specific driver up, rather than
> including bunch of ifdefs...
I see. I'll split MPU401 driver.

Regards
Osamu Tomita

2002-10-23 15:40:42

by Takashi Iwai

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

Hi,

At Thu, 24 Oct 2002 00:35:25 +0900,
Osamu Tomita wrote:
>
> Thanks for comments.
>
> Takashi Iwai wrote:
> > At Sat, 19 Oct 2002 01:56:53 +0900,
> > Osamu Tomita wrote:
> > >
> > > This is part 23/26 of patchset for add support NEC PC-9800 architecture,
> > > against 2.5.43.
> > >
> > > Summary:
> > > ALSA sound driver related modules.
> > > - add feature to support CS4231+OPL3 (not PNP)
> >
> > Are you sure that it's really CS4231?
> > If it's a higher model, such as cs4232, cs4235 or cs4236, FM OPL3 is
> > already supported (although additional codes to opl3 module are
> > necessary for PC9800).
> Your comment is reasonable. Some card has CS4232. But CS4232 is used
> as CS4231. I guess there is some hardwired circuit. And some card has
> CS4231. CS4231 driver works fine for ether chip on PC-9800.
> So I choose CS4231 driver for PC-9800.

well, in fact, cs4232 is backward compatible to cs4231.

the question is, whether cs4232 module works on PC9800, or not.
i guess the control-port is not used on this card. in such a case,
you can deactivate the control-port via module option (or even add
ifdef for the specific kernel config).

if cs4232 doesn't work, we'll apply your patch to cs4231.


> > > - add hardware specific initialization.
> >
> > The MPU401 hack looks odd.
> > I'd propose to split a PC9800 specific driver up, rather than
> > including bunch of ifdefs...
> I see. I'll split MPU401 driver.

thanks.

please send me the new patch to me, too, so that i can merge it also
to ALSA tree.


Takashi

2002-10-23 16:06:39

by Alan

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

On Wed, 2002-10-23 at 16:46, Takashi Iwai wrote:
> the question is, whether cs4232 module works on PC9800, or not.
> i guess the control-port is not used on this card. in such a case,
> you can deactivate the control-port via module option (or even add
> ifdef for the specific kernel config).

In the longer run it may well be much cleaner to make pc98 a variable
just like eisa, mca are. On a non pc98 box it might happen to be a
constant 0 and optimised but that is a detail.

Its much easier to follow

if(!pc98)
outb(a,b);

2002-10-23 16:06:51

by Osamu Tomita

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

Takashi Iwai wrote:
>
> Hi,
>
> At Thu, 24 Oct 2002 00:35:25 +0900,
> Osamu Tomita wrote:
> >
> > Thanks for comments.
> >
> > Takashi Iwai wrote:
> > > At Sat, 19 Oct 2002 01:56:53 +0900,
> > > Osamu Tomita wrote:
> > > >
> > > > This is part 23/26 of patchset for add support NEC PC-9800 architecture,
> > > > against 2.5.43.
> > > >
> > > > Summary:
> > > > ALSA sound driver related modules.
> > > > - add feature to support CS4231+OPL3 (not PNP)
> > >
> > > Are you sure that it's really CS4231?
> > > If it's a higher model, such as cs4232, cs4235 or cs4236, FM OPL3 is
> > > already supported (although additional codes to opl3 module are
> > > necessary for PC9800).
> > Your comment is reasonable. Some card has CS4232. But CS4232 is used
> > as CS4231. I guess there is some hardwired circuit. And some card has
> > CS4231. CS4231 driver works fine for ether chip on PC-9800.
> > So I choose CS4231 driver for PC-9800.
>
> well, in fact, cs4232 is backward compatible to cs4231.
>
> the question is, whether cs4232 module works on PC9800, or not.
> i guess the control-port is not used on this card. in such a case,
> you can deactivate the control-port via module option (or even add
> ifdef for the specific kernel config).
>
> if cs4232 doesn't work, we'll apply your patch to cs4231.
>
> > > > - add hardware specific initialization.
> > >
> > > The MPU401 hack looks odd.
> > > I'd propose to split a PC9800 specific driver up, rather than
> > > including bunch of ifdefs...
> > I see. I'll split MPU401 driver.
>
> thanks.
>
> please send me the new patch to me, too, so that i can merge it also
> to ALSA tree.
Thanks! I'll do everythig.

Regard
Osamu Tomita

2002-10-26 02:48:27

by Osamu Tomita

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

This is part 22/25 of patchset for add support NEC PC-9800 architecture,
against 2.5.44.

Thanks Alan cox and Takashi Iwai.
I rewite this patch.

Summary:
ALSA sound driver related modules.
- add MPU-401 UART driver for PC-9800.
- add hardware specific initialization.

diffstat:
include/sound/mpu401.h | 13
include/sound/pc9801_118_magic.h | 411 ++++++++++++++++++++++++
include/sound/sound_pc9800.h | 23 +
sound/drivers/Config.in | 4
sound/drivers/mpu401/Makefile | 9
sound/drivers/mpu401/mpu401.c | 8
sound/drivers/mpu401/mpu401_pc98.c | 615 +++++++++++++++++++++++++++++++++++++
sound/drivers/opl3/opl3_lib.c | 29 +
sound/isa/cs423x/cs4231.c | 7
sound/isa/cs423x/cs4231_lib.c | 74 ++++
sound/isa/cs423x/cs4236.c | 7
11 files changed, 1196 insertions(+), 4 deletions(-)

patch:
diff -urN linux/sound/drivers/Config.in linux98/sound/drivers/Config.in
--- linux/sound/drivers/Config.in Sat Oct 19 13:02:31 2002
+++ linux98/sound/drivers/Config.in Sat Oct 26 10:11:20 2002
@@ -8,5 +8,9 @@
dep_tristate 'MOTU MidiTimePiece AV multiport MIDI' CONFIG_SND_MTPAV $CONFIG_SND
dep_tristate 'UART16550 - MIDI only driver' CONFIG_SND_SERIAL_U16550 $CONFIG_SND
dep_tristate 'Generic MPU-401 UART driver' CONFIG_SND_MPU401 $CONFIG_SND
+dep_tristate 'NEC PC-9801 MPU-401 UART driver' CONFIG_SND_MPU98 $CONFIG_SND
+if [ "$CONFIG_SND_MPU98" != "n" ]; then
+ bool ' Roland MPU-PC98II support' CONFIG_MPU_PC98II
+fi

endmenu
diff -urN linux/sound/drivers/mpu401/Makefile linux98/sound/drivers/mpu401/Makefile
--- linux/sound/drivers/mpu401/Makefile Sat Oct 19 13:02:35 2002
+++ linux98/sound/drivers/mpu401/Makefile Fri Oct 25 00:39:14 2002
@@ -3,21 +3,28 @@
# Copyright (c) 2001 by Jaroslav Kysela <[email protected]>
#

-export-objs := mpu401_uart.o
+export-objs := mpu401_uart.o mpu401_pc98.o

snd-mpu401-objs := mpu401.o
snd-mpu401-uart-objs := mpu401_uart.o
+snd-mpu401-pc98-objs := mpu401_pc98.o

# Toplevel Module Dependency
obj-$(CONFIG_SND_MPU401) += snd-mpu401.o snd-mpu401-uart.o
+obj-$(CONFIG_SND_MPU98) += snd-mpu401.o snd-mpu401-pc98.o
obj-$(CONFIG_SND_ALS100) += snd-mpu401-uart.o
obj-$(CONFIG_SND_AZT2320) += snd-mpu401-uart.o
obj-$(CONFIG_SND_DT019X) += snd-mpu401-uart.o
obj-$(CONFIG_SND_ES18XX) += snd-mpu401-uart.o
obj-$(CONFIG_SND_OPL3SA2) += snd-mpu401-uart.o
obj-$(CONFIG_SND_AD1816A) += snd-mpu401-uart.o
+ifneq ($(CONFIG_PC9800),y)
obj-$(CONFIG_SND_CS4231) += snd-mpu401-uart.o
obj-$(CONFIG_SND_CS4232) += snd-mpu401-uart.o
+else
+obj-$(CONFIG_SND_CS4231) += snd-mpu401-pc98.o
+obj-$(CONFIG_SND_CS4232) += snd-mpu401-pc98.o
+endif
obj-$(CONFIG_SND_CS4236) += snd-mpu401-uart.o
obj-$(CONFIG_SND_ES1688) += snd-mpu401-uart.o
obj-$(CONFIG_SND_GUSEXTREME) += snd-mpu401-uart.o
diff -urN linux/sound/drivers/mpu401/mpu401.c linux98/sound/drivers/mpu401/mpu401.c
--- linux/sound/drivers/mpu401/mpu401.c Sat Oct 19 13:02:26 2002
+++ linux98/sound/drivers/mpu401/mpu401.c Sat Oct 26 10:53:11 2002
@@ -76,7 +76,13 @@
card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
- if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
+
+#if defined(CONFIG_SND_MPU98) || defined(CONFIG_SND_MPU98_MODULE)
+#define SND_MPU401_UART_NEW snd_mpu401_pc98_new
+#else
+#define SND_MPU401_UART_NEW snd_mpu401_uart_new
+#endif
+ if (SND_MPU401_UART_NEW(card, 0, MPU401_HW_MPU401,
snd_port[dev], 0,
snd_irq[dev], snd_irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0) {
printk(KERN_ERR "MPU401 not detected at 0x%lx\n", snd_port[dev]);
diff -urN linux/sound/drivers/mpu401/mpu401_pc98.c linux98/sound/drivers/mpu401/mpu401_pc98.c
--- linux/sound/drivers/mpu401/mpu401_pc98.c Thu Jan 1 09:00:00 1970
+++ linux98/sound/drivers/mpu401/mpu401_pc98.c Fri Oct 25 01:03:41 2002
@@ -0,0 +1,615 @@
+/*
+ * Copyright (c) Osamu Tomita <[email protected]>
+ * Based on mpu401_uart.c written by Jaroslav Kysela <[email protected]>
+ * Routines for control of MPU-401 in UART mode
+ *
+ * MPU-401 supports UART mode which is not capable generate transmit
+ * interrupts thus output is done via polling. Also, if irq < 0, then
+ * input is done also via polling. Do not expect good performance.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <sound/driver.h>
+#include <asm/io.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/sched.h>
+#include <linux/errno.h>
+#include <sound/core.h>
+#include <sound/mpu401.h>
+
+MODULE_AUTHOR("Osamu Tomita <[email protected]>");
+MODULE_DESCRIPTION("MPU-401 control routines for PC-9801");
+MODULE_LICENSE("GPL");
+
+/* I/O ports */
+
+#ifndef CONFIG_MPU_PC98II
+#define MPU401C_98(mpu) ((mpu)->port + 1)
+#else
+#define MPU401C_98(mpu) ((mpu)->port + 2)
+#endif
+
+static void snd_mpu401_pc98_input_read(mpu401_t * mpu);
+static void snd_mpu401_pc98_output_write(mpu401_t * mpu);
+
+/*
+
+ */
+
+#define snd_mpu401_98_input_avail(mpu) (!(inb(MPU401C_98(mpu)) & 0x80))
+#define snd_mpu401_98_output_ready(mpu) (!(inb(MPU401C_98(mpu)) & 0x40))
+
+#define MPU401_98_RESET 0xff
+#define MPU401_98_ENTER_UART 0x3f
+#define MPU401_98_ACK 0xfe
+
+static void snd_mpu401_pc98_clear_rx(mpu401_t *mpu)
+{
+ int timeout = 100000;
+ for (; timeout > 0 && snd_mpu401_98_input_avail(mpu); timeout--)
+ inb(MPU401D(mpu));
+#ifdef CONFIG_SND_DEBUG
+ if (timeout <= 0)
+ snd_printk("cmd: clear rx timeout (status = 0x%x)\n", inb(MPU401C_98(mpu)));
+#endif
+}
+
+static void _snd_mpu401_pc98_interrupt(mpu401_t *mpu)
+{
+ if (test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode))
+ snd_mpu401_pc98_input_read(mpu);
+ else
+ snd_mpu401_pc98_clear_rx(mpu);
+ /* ok. for better Tx performance try do some output when input is done */
+ if (test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode))
+ snd_mpu401_pc98_output_write(mpu);
+}
+
+void snd_mpu401_pc98_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+{
+ mpu401_t *mpu = snd_magic_cast(mpu401_t, dev_id, return);
+
+ if (mpu == NULL)
+ return;
+ _snd_mpu401_pc98_interrupt(mpu);
+}
+
+static void snd_mpu401_pc98_timer(unsigned long data)
+{
+ unsigned long flags;
+ mpu401_t *mpu = snd_magic_cast(mpu401_t, (void *)data, return);
+
+ spin_lock_irqsave(&mpu->timer_lock, flags);
+ /*mpu->mode |= MPU401_MODE_TIMER;*/
+ mpu->timer.expires = 1 + jiffies;
+ add_timer(&mpu->timer);
+ spin_unlock_irqrestore(&mpu->timer_lock, flags);
+ if (mpu->rmidi)
+ _snd_mpu401_pc98_interrupt(mpu);
+}
+
+static void snd_mpu401_pc98_add_timer (mpu401_t *mpu, int input)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave (&mpu->timer_lock, flags);
+ if (mpu->timer_invoked == 0) {
+ mpu->timer.data = (unsigned long)mpu;
+ mpu->timer.function = snd_mpu401_pc98_timer;
+ mpu->timer.expires = 1 + jiffies;
+ add_timer(&mpu->timer);
+ }
+ mpu->timer_invoked |= input ? MPU401_MODE_INPUT_TIMER : MPU401_MODE_OUTPUT_TIMER;
+ spin_unlock_irqrestore (&mpu->timer_lock, flags);
+}
+
+static void snd_mpu401_pc98_remove_timer (mpu401_t *mpu, int input)
+{
+ unsigned long flags;
+
+ spin_lock_irqsave (&mpu->timer_lock, flags);
+ if (mpu->timer_invoked) {
+ mpu->timer_invoked &= input ? ~MPU401_MODE_INPUT_TIMER : ~MPU401_MODE_OUTPUT_TIMER;
+ if (! mpu->timer_invoked)
+ del_timer(&mpu->timer);
+ }
+ spin_unlock_irqrestore (&mpu->timer_lock, flags);
+}
+
+/*
+
+ */
+
+static void snd_mpu401_pc98_cmd(mpu401_t * mpu, unsigned char cmd, int ack)
+{
+ unsigned long flags;
+ int timeout, ok;
+
+ spin_lock_irqsave(&mpu->input_lock, flags);
+ if (mpu->hardware != MPU401_HW_TRID4DWAVE) {
+ outb(0x00, MPU401D(mpu));
+ /*snd_mpu401_pc98_clear_rx(mpu);*/
+ }
+ /* ok. standard MPU-401 initialization */
+ if (mpu->hardware != MPU401_HW_SB) {
+ for (timeout = 1000; timeout > 0 && !snd_mpu401_98_output_ready(mpu); timeout--)
+ udelay(10);
+#ifdef CONFIG_SND_DEBUG
+ if (!timeout)
+ snd_printk("cmd: tx timeout (status = 0x%x)\n", inb(MPU401C_98(mpu)));
+#endif
+ }
+ outb(cmd, MPU401C_98(mpu));
+ if (ack) {
+ ok = 0;
+ timeout = 10000;
+ while (!ok && timeout-- > 0) {
+ if (snd_mpu401_98_input_avail(mpu)) {
+ if (inb(MPU401D(mpu)) == MPU401_98_ACK)
+ ok = 1;
+ }
+ }
+ if (!ok && inb(MPU401D(mpu)) == MPU401_98_ACK)
+ ok = 1;
+ } else {
+ ok = 1;
+ }
+ spin_unlock_irqrestore(&mpu->input_lock, flags);
+ if (! ok)
+ snd_printk("cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)\n", cmd, mpu->port, inb(MPU401C_98(mpu)), inb(MPU401D(mpu)));
+ // snd_printk("cmd: 0x%x at 0x%lx (status = 0x%x, data = 0x%x)\n", cmd, mpu->port, inb(MPU401C_98(mpu)), inb(MPU401D(mpu)));
+}
+
+/*
+ * input/output open/close - protected by open_mutex in rawmidi.c
+ */
+static int snd_mpu401_pc98_input_open(snd_rawmidi_substream_t * substream)
+{
+ mpu401_t *mpu;
+ int err;
+
+ mpu = snd_magic_cast(mpu401_t, substream->rmidi->private_data, return -ENXIO);
+ if (mpu->open_input && (err = mpu->open_input(mpu)) < 0)
+ return err;
+ if (! test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode)) {
+ snd_mpu401_pc98_cmd(mpu, MPU401_98_RESET, 1);
+ snd_mpu401_pc98_cmd(mpu, MPU401_98_ENTER_UART, 1);
+ }
+ mpu->substream_input = substream;
+ set_bit(MPU401_MODE_BIT_INPUT, &mpu->mode);
+ return 0;
+}
+
+static int snd_mpu401_pc98_output_open(snd_rawmidi_substream_t * substream)
+{
+ mpu401_t *mpu;
+ int err;
+
+ mpu = snd_magic_cast(mpu401_t, substream->rmidi->private_data, return -ENXIO);
+ if (mpu->open_output && (err = mpu->open_output(mpu)) < 0)
+ return err;
+ if (! test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode)) {
+ snd_mpu401_pc98_cmd(mpu, MPU401_98_RESET, 1);
+ snd_mpu401_pc98_cmd(mpu, MPU401_98_ENTER_UART, 1);
+ }
+ mpu->substream_output = substream;
+ set_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode);
+ return 0;
+}
+
+static int snd_mpu401_pc98_input_close(snd_rawmidi_substream_t * substream)
+{
+ mpu401_t *mpu;
+
+ mpu = snd_magic_cast(mpu401_t, substream->rmidi->private_data, return -ENXIO);
+ clear_bit(MPU401_MODE_BIT_INPUT, &mpu->mode);
+ mpu->substream_input = NULL;
+ if (! test_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode))
+ snd_mpu401_pc98_cmd(mpu, MPU401_98_RESET, 0);
+ if (mpu->close_input)
+ mpu->close_input(mpu);
+ return 0;
+}
+
+static int snd_mpu401_pc98_output_close(snd_rawmidi_substream_t * substream)
+{
+ mpu401_t *mpu;
+
+ mpu = snd_magic_cast(mpu401_t, substream->rmidi->private_data, return -ENXIO);
+ clear_bit(MPU401_MODE_BIT_OUTPUT, &mpu->mode);
+ mpu->substream_output = NULL;
+ if (! test_bit(MPU401_MODE_BIT_INPUT, &mpu->mode))
+ snd_mpu401_pc98_cmd(mpu, MPU401_98_RESET, 0);
+ if (mpu->close_output)
+ mpu->close_output(mpu);
+ return 0;
+}
+
+/*
+ * trigger input
+ */
+static void snd_mpu401_pc98_input_trigger(snd_rawmidi_substream_t * substream, int up)
+{
+ unsigned long flags;
+ mpu401_t *mpu;
+ int max = 64;
+
+ mpu = snd_magic_cast(mpu401_t, substream->rmidi->private_data, return);
+ spin_lock_irqsave(&mpu->input_lock, flags);
+ if (up) {
+ if (! test_and_set_bit(MPU401_MODE_BIT_INPUT_TRIGGER, &mpu->mode)) {
+ /* flush FIFO */
+ while (max-- > 0)
+ inb(MPU401D(mpu));
+ }
+ if (mpu->irq < 0)
+ snd_mpu401_pc98_add_timer(mpu, 1);
+ } else {
+ if (mpu->irq < 0)
+ snd_mpu401_pc98_remove_timer(mpu, 1);
+ clear_bit(MPU401_MODE_BIT_INPUT_TRIGGER, &mpu->mode);
+ }
+ spin_unlock_irqrestore(&mpu->input_lock, flags);
+ if (up)
+ snd_mpu401_pc98_input_read(mpu);
+}
+
+static void snd_mpu401_pc98_input_read(mpu401_t * mpu)
+{
+ int max = 128;
+ unsigned char byte;
+
+ /* prevent double enter via event callback */
+ if (test_and_set_bit(MPU401_MODE_BIT_RX_LOOP, &mpu->mode))
+ return;
+ spin_lock(&mpu->input_lock);
+ while (max-- > 0) {
+ if (snd_mpu401_98_input_avail(mpu)) {
+ byte = inb(MPU401D(mpu));
+ if (test_bit(MPU401_MODE_BIT_INPUT_TRIGGER, &mpu->mode)) {
+ spin_unlock(&mpu->input_lock);
+ snd_rawmidi_receive(mpu->substream_input, &byte, 1);
+ spin_lock(&mpu->input_lock);
+ }
+ } else {
+ break; /* input not available */
+ }
+ }
+ spin_unlock(&mpu->input_lock);
+ clear_bit(MPU401_MODE_BIT_RX_LOOP, &mpu->mode);
+}
+
+/*
+ * Tx FIFO sizes:
+ * CS4237B - 16 bytes
+ * AudioDrive ES1688 - 12 bytes
+ * S3 SonicVibes - 8 bytes
+ * SoundBlaster AWE 64 - 2 bytes (ugly hardware)
+ */
+
+static void snd_mpu401_pc98_output_write(mpu401_t * mpu)
+{
+ unsigned char byte;
+ int max = 256, timeout;
+
+ if (!test_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &mpu->mode))
+ return;
+ /* prevent double enter */
+ if (test_and_set_bit(MPU401_MODE_BIT_TX_LOOP, &mpu->mode))
+ return;
+ do {
+ spin_lock(&mpu->output_lock);
+ if (snd_rawmidi_transmit_peek(mpu->substream_output, &byte, 1) == 1) {
+ for (timeout = 100; timeout > 0; timeout--) {
+ if (snd_mpu401_98_output_ready(mpu)) {
+ outb(byte, MPU401D(mpu));
+ snd_rawmidi_transmit_ack(mpu->substream_output, 1);
+ break;
+ }
+ }
+ } else {
+ snd_mpu401_pc98_remove_timer (mpu, 0);
+ max = 1; /* no other data - leave the tx loop */
+ }
+ spin_unlock(&mpu->output_lock);
+ } while (--max > 0);
+ clear_bit(MPU401_MODE_BIT_TX_LOOP, &mpu->mode);
+}
+
+static void snd_mpu401_pc98_output_trigger(snd_rawmidi_substream_t * substream, int up)
+{
+ unsigned long flags;
+ mpu401_t *mpu;
+
+ mpu = snd_magic_cast(mpu401_t, substream->rmidi->private_data, return);
+ spin_lock_irqsave(&mpu->output_lock, flags);
+ if (up) {
+ set_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &mpu->mode);
+ snd_mpu401_pc98_add_timer(mpu, 0);
+ } else {
+ snd_mpu401_pc98_remove_timer(mpu, 0);
+ clear_bit(MPU401_MODE_BIT_OUTPUT_TRIGGER, &mpu->mode);
+ }
+ spin_unlock_irqrestore(&mpu->output_lock, flags);
+ if (up)
+ snd_mpu401_pc98_output_write(mpu);
+}
+
+/*
+
+ */
+
+static snd_rawmidi_ops_t snd_mpu401_pc98_output =
+{
+ .open = snd_mpu401_pc98_output_open,
+ .close = snd_mpu401_pc98_output_close,
+ .trigger = snd_mpu401_pc98_output_trigger,
+};
+
+static snd_rawmidi_ops_t snd_mpu401_pc98_input =
+{
+ .open = snd_mpu401_pc98_input_open,
+ .close = snd_mpu401_pc98_input_close,
+ .trigger = snd_mpu401_pc98_input_trigger,
+};
+
+static void snd_mpu401_pc98_free(snd_rawmidi_t *rmidi)
+{
+ mpu401_t *mpu = snd_magic_cast(mpu401_t, rmidi->private_data, return);
+ if (mpu->irq_flags && mpu->irq >= 0)
+ free_irq(mpu->irq, (void *) mpu);
+ if (mpu->res) {
+ release_resource(mpu->res);
+ kfree_nocheck(mpu->res);
+ }
+ snd_magic_kfree(mpu);
+}
+
+int snd_mpu401_pc98_new(snd_card_t * card, int device,
+ unsigned short hardware,
+ unsigned long port, int integrated,
+ int irq, int irq_flags,
+ snd_rawmidi_t ** rrawmidi)
+{
+ mpu401_t *mpu;
+ snd_rawmidi_t *rmidi;
+ int err;
+
+ if (rrawmidi)
+ *rrawmidi = NULL;
+ if ((err = snd_rawmidi_new(card, "MPU-401U", device, 1, 1, &rmidi)) < 0)
+ return err;
+ mpu = snd_magic_kcalloc(mpu401_t, 0, GFP_KERNEL);
+ if (mpu == NULL) {
+ snd_device_free(card, rmidi);
+ return -ENOMEM;
+ }
+ rmidi->private_data = mpu;
+ rmidi->private_free = snd_mpu401_pc98_free;
+ spin_lock_init(&mpu->input_lock);
+ spin_lock_init(&mpu->output_lock);
+ spin_lock_init(&mpu->timer_lock);
+ mpu->hardware = hardware;
+ if (!integrated) {
+#ifndef CONFIG_MPU_PC98II
+ if ((mpu->res = request_region(port, 2, "MPU401 UART")) == NULL)
+#else
+ if ((mpu->res = request_region(port, 4, "MPU401 UART")) == NULL)
+#endif
+ {
+ snd_device_free(card, rmidi);
+ return -EBUSY;
+ }
+ }
+ mpu->port = port;
+ if (irq >= 0 && irq_flags) {
+ if (request_irq(irq, snd_mpu401_pc98_interrupt, irq_flags, "MPU401 UART", (void *) mpu)) {
+ snd_printk("unable to grab IRQ %d\n", irq);
+ snd_device_free(card, rmidi);
+ return -EBUSY;
+ }
+ mpu->irq = irq;
+ mpu->irq_flags = irq_flags;
+ }
+
+ {
+ #include <sound/pc9801_118_magic.h>
+ #define outp118(reg,data) outb((reg),0x148e);outb((data),0x148f)
+ #define WAIT118 outb(0x00,0x5f)
+ int mpu_intr, count;
+#ifdef OOKUBO_ORIGINAL
+ int err = 0;
+#endif /* OOKUBO_ORIGINAL */
+
+ switch (irq)
+ {
+ case 3:
+ mpu_intr = 3;
+ break;
+ case 5:
+ mpu_intr = 2;
+ break;
+ case 6:
+ mpu_intr = 1;
+ break;
+ case 10:
+ mpu_intr = 0;
+ break;
+ default:
+ snd_printk("Bad IRQ %d\n", irq);
+ snd_device_free(card, rmidi);
+ return -EBUSY;
+ }
+
+ outp118(0x21, mpu_intr);
+ WAIT118;
+ outb(0x00, 0x148e);
+ if (inb(0x148f) & 0x08)
+ {
+ snd_printk("No MIDI daughter board found\n");
+ goto skip118;
+ }
+
+ outp118(0x20, 0x00);
+ outp118(0x05, 0x04);
+ for (count = 0; count < 35000; count ++)
+ WAIT118;
+ outb(0x05, 0x148e);
+ for (count = 0; count < 65000; count ++)
+ if (inb(0x148f) == 0x04)
+ goto set_mode_118;
+ snd_printk("MIDI daughter board initalize failed at stage1\n\n");
+ snd_device_free(card, rmidi);
+ return -EBUSY;
+
+ set_mode_118:
+ outp118(0x05, 0x0c);
+ outb(0xaa, 0x485);
+ outb(0x99, 0x485);
+ outb(0x2a, 0x485);
+ for (count = 0; count < sizeof(Data0485_99); count ++)
+ {
+ outb(Data0485_99[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x9e, 0x485);
+ outb(0x2a, 0x485);
+ for (count = 0; count < sizeof(Data0485_9E); count ++)
+ if (inb(0x485) != Data0485_9E[count])
+ {
+#ifdef OOKUBO_ORIGINAL
+ err = 1;
+#endif /* OOKUBO_ORIGINAL */
+ break;
+ }
+ outb(0x00, 0x486);
+ for (count = 0; count < 2000; count ++)
+ WAIT118;
+#ifdef OOKUBO_ORIGINAL
+ if (!err)
+ {
+ outb(0xaa, 0x485);
+ outb(0x36, 0x485);
+ outb(0x28, 0x485);
+ for (count = 0; count < sizeof(Data0485_36); count ++)
+ outb(Data0485_36[count], 0x485);
+ outb(0x00, 0x486);
+ for (count = 0; count < 1500; count ++)
+ WAIT118;
+ outp118(0x05, inb(0x148f) | 0x08);
+ outb(0xff, 0x148c);
+ outp118(0x05, inb(0x148f) & 0xf7);
+ for (count = 0; count < 1500; count ++)
+ WAIT118;
+ }
+#endif /* OOKUBO_ORIGINAL */
+
+ outb(0xaa, 0x485);
+ outb(0xa9, 0x485);
+ outb(0x21, 0x485);
+ for (count = 0; count < sizeof(Data0485_A9); count ++)
+ {
+ outb(Data0485_A9[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x0c, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_0C); count ++)
+ {
+ outb(Data0485_0C[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x66, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_66); count ++)
+ {
+ outb(Data0485_66[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x60, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_60); count ++)
+ {
+ outb(Data0485_60[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outp118(0x05, 0x04);
+ outp118(0x05, 0x00);
+ for (count = 0; count < 35000; count ++)
+ WAIT118;
+ outb(0x05, 0x148e);
+ for (count = 0; count < 65000; count ++)
+ if (inb(0x148f) == 0x00)
+ goto end_mode_118;
+ snd_printk("MIDI daughter board initalize failed at stage2\n\n");
+ snd_device_free(card, rmidi);
+ return -EBUSY;
+
+ end_mode_118:
+ outb(0x3f, 0x148d);
+ snd_printk("MIDI daughter board initalized\n");
+ skip118:
+ }
+
+ strcpy(rmidi->name, "MPU-401 (UART)");
+ snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_mpu401_pc98_output);
+ snd_rawmidi_set_ops(rmidi, SNDRV_RAWMIDI_STREAM_INPUT, &snd_mpu401_pc98_input);
+ rmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT |
+ SNDRV_RAWMIDI_INFO_INPUT |
+ SNDRV_RAWMIDI_INFO_DUPLEX;
+ mpu->rmidi = rmidi;
+ if (rrawmidi)
+ *rrawmidi = rmidi;
+ return 0;
+}
+
+EXPORT_SYMBOL(snd_mpu401_pc98_interrupt);
+EXPORT_SYMBOL(snd_mpu401_pc98_new);
+
+/*
+ * INIT part
+ */
+
+static int __init alsa_mpu401_pc98_init(void)
+{
+ return 0;
+}
+
+static void __exit alsa_mpu401_pc98_exit(void)
+{
+}
+
+module_init(alsa_mpu401_pc98_init)
+module_exit(alsa_mpu401_pc98_exit)
diff -urN linux/sound/drivers/opl3/opl3_lib.c linux98/sound/drivers/opl3/opl3_lib.c
--- linux/sound/drivers/opl3/opl3_lib.c Tue Oct 8 10:56:24 2002
+++ linux98/sound/drivers/opl3/opl3_lib.c Tue Oct 8 11:01:42 2002
@@ -31,6 +31,10 @@
#include <linux/ioport.h>
#include <sound/minors.h>

+#ifdef CONFIG_PC9800
+#include <sound/sound_pc9800.h>
+#endif
+
MODULE_AUTHOR("Jaroslav Kysela <[email protected]>, Hannu Savolainen 1993-1996, Rob Hooft");
MODULE_DESCRIPTION("Routines for control of AdLib FM cards (OPL2/OPL3/OPL4 chips)");
MODULE_LICENSE("GPL");
@@ -438,6 +442,31 @@
opl3->command = &snd_opl3_command;
}
}
+
+#ifdef CONFIG_PC9800
+ /* ??? */
+ outb(0x00, opl3->l_port + 6);
+ inb(opl3->l_port + 7);
+ /* Enable OPL-3 Function */
+ outb(inb(PC9800_SOUND_IO_ID) | 0x03, PC9800_SOUND_IO_ID);
+
+ /* Initialize? */
+ opl3->command(opl3, OPL3_RIGHT | 0x05, 0x05);
+ opl3->command(opl3, OPL3_RIGHT | 0x08, 0x04);
+ opl3->command(opl3, OPL3_RIGHT | 0x08, 0x00);
+ opl3->command(opl3, OPL3_LEFT | 0xf7, 0x00);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x60);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x80);
+ inb(opl3->l_port);
+
+ opl3->command(opl3, OPL3_LEFT | 0x02, 0xff);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x21);
+ inb(opl3->l_port);
+
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x60);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x80);
+#endif
+
opl3->command(opl3, OPL3_LEFT | OPL3_REG_TEST, OPL3_ENABLE_WAVE_SELECT);
opl3->command(opl3, OPL3_LEFT | OPL3_REG_PERCUSSION, 0x00); /* Melodic mode */

diff -urN linux/sound/isa/cs423x/cs4231.c linux98/sound/isa/cs423x/cs4231.c
--- linux/sound/isa/cs423x/cs4231.c Sat Oct 19 13:01:07 2002
+++ linux98/sound/isa/cs423x/cs4231.c Fri Oct 25 01:23:56 2002
@@ -128,8 +128,13 @@
return err;
}

+#ifndef CONFIG_PC9800
+#define SND_MPU401_UART_NEW snd_mpu401_uart_new
+#else
+#define SND_MPU401_UART_NEW snd_mpu401_pc98_new
+#endif
if (snd_mpu_irq[dev] >= 0 && snd_mpu_irq[dev] != SNDRV_AUTO_IRQ) {
- if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
+ if (SND_MPU401_UART_NEW(card, 0, MPU401_HW_CS4232,
snd_mpu_port[dev], 0,
snd_mpu_irq[dev], SA_INTERRUPT,
NULL) < 0)
diff -urN linux/sound/isa/cs423x/cs4231_lib.c linux98/sound/isa/cs423x/cs4231_lib.c
--- linux/sound/isa/cs423x/cs4231_lib.c Tue Oct 8 10:56:24 2002
+++ linux98/sound/isa/cs423x/cs4231_lib.c Tue Oct 8 11:01:42 2002
@@ -37,6 +37,10 @@
#include <sound/cs4231.h>
#include <sound/pcm_params.h>

+#ifdef CONFIG_PC9800
+#include <sound/sound_pc9800.h>
+#endif
+
MODULE_AUTHOR("Jaroslav Kysela <[email protected]>");
MODULE_DESCRIPTION("Routines for control of CS4231(A)/CS4232/InterWave & compatible chips");
MODULE_LICENSE("GPL");
@@ -1405,6 +1409,10 @@
};
cs4231_t *chip;
int err;
+#ifdef CONFIG_PC9800
+ int intr_bits, intr_bits2, dma_bits;
+ unsigned long flags;
+#endif

*rchip = NULL;
chip = snd_magic_kcalloc(cs4231_t, 0, GFP_KERNEL);
@@ -1436,6 +1444,13 @@
return -EBUSY;
}
chip->dma1 = dma1;
+#ifdef CONFIG_PC9800
+ if (dma2 > 3 || dma2 == 2) {
+ snd_cs4231_free(chip);
+ snd_printk("Bad DMA %d\n", dma2);
+ return -EBUSY;
+ }
+#endif
if (!(hwshare & CS4231_HWSHARE_DMA2) && dma1 != dma2 && dma2 >= 0 && request_dma(dma2, "CS4231 - 2")) {
snd_cs4231_free(chip);
return -EBUSY;
@@ -1456,6 +1471,65 @@
memcpy(&chip->image, &snd_cs4231_original_image, sizeof(snd_cs4231_original_image));

/* global setup */
+
+#ifdef CONFIG_PC9800
+ switch (irq) {
+ case 3:
+ intr_bits = 0x08;
+ intr_bits2 = 0x03;
+ break;
+ case 5:
+ intr_bits = 0x10;
+ intr_bits2 = 0x08;
+ break;
+ case 10:
+ intr_bits = 0x18;
+ intr_bits2 = 0x02;
+ break;
+ case 12:
+ intr_bits = 0x20;
+ intr_bits2 = 0x00;
+ break;
+ default:
+ snd_cs4231_free(chip);
+ snd_printk("Bad IRQ %d\n", irq);
+ return -EBUSY;
+ }
+
+ switch (dma1) {
+ case 0:
+ dma_bits = 0x01;
+ break;
+ case 1:
+ dma_bits = 0x02;
+ break;
+ case 3:
+ dma_bits = 0x03;
+ break;
+ default:
+ snd_cs4231_free(chip);
+ snd_printk("Bad DMA %d\n", dma1);
+ return -EBUSY;
+ }
+
+ if (chip->single_dma != 1)
+ intr_bits |= 0x04;
+
+ if (PC9800_SOUND_ID() == PC9800_SOUND_ID_118) {
+ /* Set up CanBe control registers. */
+ snd_printk("Setting up CanBe Sound System\n");
+ spin_lock_irqsave(&chip->reg_lock, flags);
+ outb(inb(PC9800_SOUND_IO_ID) | 0x03, PC9800_SOUND_IO_ID);
+ outb(0x01, 0x0f4a);
+ outb(intr_bits2, 0x0f4b);
+ } else {
+ spin_lock_irqsave(&chip->reg_lock, flags);
+ }
+
+ outb(intr_bits | dma_bits, 0xf40);
+ spin_unlock_irqrestore(&chip->reg_lock, flags);
+#endif /* CONFIG_PC9800 */
+
if (snd_cs4231_probe(chip) < 0) {
snd_cs4231_free(chip);
return -ENODEV;
diff -urN linux/sound/isa/cs423x/cs4236.c linux98/sound/isa/cs423x/cs4236.c
--- linux/sound/isa/cs423x/cs4236.c Sat Oct 19 13:01:13 2002
+++ linux98/sound/isa/cs423x/cs4236.c Fri Oct 25 01:24:03 2002
@@ -522,8 +522,13 @@
}
}

+#ifndef CONFIG_PC9800
+#define SND_MPU401_UART_NEW snd_mpu401_uart_new
+#else
+#define SND_MPU401_UART_NEW snd_mpu401_pc98_new
+#endif
if (snd_mpu_port[dev] != SNDRV_AUTO_PORT) {
- if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
+ if (SND_MPU401_UART_NEW(card, 0, MPU401_HW_CS4232,
snd_mpu_port[dev], 0,
snd_mpu_irq[dev],
snd_mpu_irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL) < 0)
diff -urN linux/include/sound/mpu401.h linux98/include/sound/mpu401.h
--- linux/include/sound/mpu401.h Sat Oct 19 13:02:29 2002
+++ linux98/include/sound/mpu401.h Fri Oct 25 01:27:19 2002
@@ -96,6 +96,7 @@

*/

+#ifndef CONFIG_PC9800
void snd_mpu401_uart_interrupt(int irq, void *dev_id, struct pt_regs *regs);

int snd_mpu401_uart_new(snd_card_t * card,
@@ -106,5 +107,17 @@
int irq,
int irq_flags,
snd_rawmidi_t ** rrawmidi);
+#else /* CONFIG_PC9800 */
+void snd_mpu401_pc98_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+
+int snd_mpu401_pc98_new(snd_card_t * card,
+ int device,
+ unsigned short hardware,
+ unsigned long port,
+ int integrated,
+ int irq,
+ int irq_flags,
+ snd_rawmidi_t ** rrawmidi);
+#endif /* !CONFIG_PC9800 */

#endif /* __SOUND_MPU401_H */
diff -urN linux/include/sound/pc9801_118_magic.h linux98/include/sound/pc9801_118_magic.h
--- linux/include/sound/pc9801_118_magic.h Thu Jan 1 09:00:00 1970
+++ linux98/include/sound/pc9801_118_magic.h Sat Apr 27 13:01:29 2002
@@ -0,0 +1,411 @@
+ static unsigned char Data0485_A9[] = {
+ 0x12, 0x03, 0x90, 0xc2, 0x2a, 0x75, 0x1e, 0x20,
+ 0xe4, 0x12, 0x2b, 0x9b, 0x22, 0xa9, 0x16, 0x77,
+ 0x33, 0xe9, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf5,
+ 0x16, 0xc2, 0x2f, 0x22, 0xa9, 0x16, 0x77, 0x42,
+ 0xe9, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf9, 0x77,
+ 0xf8, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf5, 0x16,
+ 0xc2, 0x2f, 0x22, 0x90, 0x25, 0x9f, 0x30, 0x04,
+ 0x05, 0xc2, 0x04, 0x12, 0x1f, 0x62, 0x30, 0x00,
+ 0x05, 0xc2, 0x00, 0x12, 0x15, 0xe6, 0x30, 0x01,
+ 0x05, 0xc2, 0x01, 0x12, 0x29, 0xaf, 0x30, 0x02,
+ 0x05, 0xc2, 0x02, 0x12, 0x29, 0xaf, 0x30, 0x05,
+ 0x05, 0xc2, 0x05, 0x12, 0x16, 0x65, 0x30, 0x06,
+ 0x08, 0xc2, 0x06, 0x12, 0x16, 0xb1, 0x12, 0x29,
+ 0xaf, 0x30, 0x07, 0x08, 0xc2, 0x07, 0x12, 0x16,
+ 0xe9, 0x12, 0x29, 0xaf, 0x22, 0x20, 0x97, 0x09,
+ 0x53, 0xa8, 0xfb, 0x12, 0x04, 0x2c, 0x43, 0xa8,
+ 0x04, 0x22, 0x71, 0xb8, 0x71, 0xb8, 0x71, 0xb8,
+ 0x22, 0x20, 0x4b, 0x04, 0x75, 0x4e, 0x02, 0x22,
+ 0xe5, 0x35, 0x24, 0xff, 0xf5, 0x35, 0xe5, 0x36,
+ 0x34, 0xff, 0xf5, 0x36, 0x75, 0x4e, 0x02, 0x22,
+ 0x10, 0x19, 0x02, 0x80, 0x08, 0x78, 0x00, 0xe2,
+ 0x78, 0x07, 0xf2, 0x61, 0x9b, 0x78, 0x11, 0xe2,
+ 0xc0, 0x01, 0xc0, 0xf0, 0xc0, 0xd0, 0xc0, 0x02,
+ 0x71, 0x14, 0xe5, 0x30, 0xb4, 0x01, 0x02, 0x61,
+ 0x93, 0x43, 0x08, 0x40, 0x12, 0x2a, 0x53, 0x61,
+ 0x93, 0x79, 0x03, 0xe3, 0xa2, 0xe2, 0x92, 0x26,
+ 0xa2, 0xe3, 0x92, 0x27, 0x22, 0xad, 0x2b, 0xbd,
+ 0x04, 0x07, 0xf5, 0x72, 0x78, 0x27, 0x02, 0x11,
+ 0x76, 0x02, 0x11, 0x30, 0x00, 0x00, 0x00, 0x12,
+ 0x28, 0xba, 0x79, 0x01, 0xe3, 0x75, 0x21, 0x3f,
+ 0x75, 0x49, 0x11, 0x75, 0x4c, 0x11, 0x31, 0xdc,
+ 0x75, 0x1a, 0x80, 0x51, 0x72, 0x75, 0x81, 0xe3,
+ 0x12, 0x25, 0xc9, 0x43, 0xa8, 0x01, 0x00, 0x53,
+ 0xa8, 0xfe, 0x10, 0x50, 0x02, 0x80, 0x03, 0x12,
+ 0x1a, 0x8d, 0xd1, 0x28, 0x12, 0x03, 0xd9, 0xd1,
+ 0xf2, 0x12, 0x2d, 0xf0, 0xb0, 0x11, 0x92, 0xe0,
+ 0xa2, 0x2a, 0xa0, 0xb5, 0x82, 0xe0, 0x50, 0x03,
+ 0x79, 0x0f, 0xe3, 0x71, 0xca, 0x51, 0x1e, 0x91,
+ 0xe4, 0x53, 0xa8, 0xfb, 0x10, 0x10, 0x02, 0x80,
+ 0x26, 0xc2, 0x8e, 0xd2, 0xab, 0xa2, 0x1c, 0x40,
+ 0x13, 0xa2, 0x1d, 0x50, 0x0a, 0x43, 0x08, 0x40,
+ 0x12, 0x1a, 0x01, 0xd1, 0xd7, 0x80, 0x0b, 0x12,
+ 0x26, 0x04, 0x61, 0x08, 0x43, 0x08, 0x40, 0x12,
+ 0x1a, 0x01, 0xd2, 0x1f, 0x12, 0x17, 0x7f, 0x43,
+ 0xa8, 0x04, 0x51, 0x1e, 0x91, 0xe4, 0x12, 0x13,
+ 0x34, 0x80, 0x98, 0xa2, 0x17, 0x72, 0x16, 0x72,
+ 0x15, 0x72, 0x2d, 0x50, 0x06, 0xfa, 0x12, 0x13,
+ 0x66, 0x80, 0x25, 0xc2, 0x13, 0x30, 0x28, 0x05,
+ 0x12, 0x02, 0xbe, 0x80, 0x1b, 0xb4, 0x10, 0x12,
+ 0x78, 0x00, 0xf2, 0xe5, 0x30, 0xb4, 0x01, 0x06,
+ 0x12, 0x03, 0x90, 0xd2, 0x19, 0x22, 0x12, 0x00,
+ 0xdd, 0x22, 0x75, 0x30, 0x00, 0x12, 0x00, 0xa1,
+ 0x22, 0x00, 0x00, 0x75, 0x1e, 0x00, 0x74, 0x0c,
+ 0x12, 0x2b, 0x9b, 0x74, 0x40, 0x79, 0x05, 0xf3,
+ 0x74, 0x49, 0x12, 0x2b, 0x9b, 0x74, 0x04, 0x79,
+ 0x05, 0xf3, 0x75, 0x15, 0x04, 0x74, 0x10, 0x12,
+ 0x2b, 0x9b, 0x74, 0x00, 0x79, 0x05, 0xf3, 0x74,
+ 0x17, 0x12, 0x2b, 0x9b, 0x74, 0x00, 0x79, 0x05,
+ 0xf3, 0x74, 0x1a, 0x12, 0x2b, 0x9b, 0x74, 0x00,
+ 0x79, 0x05, 0xf3, 0x74, 0x0a, 0x12, 0x2b, 0x9b,
+ 0x74, 0x20, 0x79, 0x05, 0xf3, 0x79, 0xe0, 0x77,
+ 0x20, 0x22, 0xd0, 0x02, 0xd0, 0xd0, 0xd0, 0xf0,
+ 0xd0, 0x01, 0xe5, 0x5f, 0xd0, 0xa8, 0x22, 0x00,
+ 0x00, 0x90, 0x25, 0x9f, 0x75, 0x26, 0xff, 0x75,
+ 0x27, 0xff, 0x75, 0x28, 0x03, 0x75, 0x13, 0xff,
+ 0x75, 0x1f, 0x00, 0x75, 0x14, 0xff, 0x22, 0x79,
+ 0x06, 0xe5, 0x29, 0x60, 0x0b, 0xe3, 0x30, 0xe1,
+ 0xf8, 0xe5, 0x4f, 0x64, 0x80, 0x79, 0x07, 0xf3,
+ 0x22, 0x10, 0x4c, 0x01, 0x22, 0x30, 0x4b, 0x0a,
+ 0xc2, 0x4b, 0xe5, 0x4d, 0x64, 0x80, 0xf5, 0x4f,
+ 0x80, 0x1d, 0xe5, 0x15, 0xa2, 0xe0, 0x82, 0xe6,
+ 0x40, 0x02, 0x80, 0x35, 0x30, 0x4a, 0x04, 0xb1,
+ 0xe6, 0x80, 0x0c, 0x30, 0x49, 0x04, 0x51, 0x2b,
+ 0x80, 0x05, 0x30, 0x48, 0x24, 0x91, 0x7e, 0x79,
+ 0x06, 0xe3, 0x30, 0xe0, 0x1a, 0x79, 0x06, 0xf3,
+ 0xe5, 0x4e, 0x24, 0xff, 0x50, 0x04, 0xf5, 0x4e,
+ 0x80, 0x0d, 0x79, 0x0f, 0xf3, 0x20, 0x2a, 0x07,
+ 0x12, 0x2b, 0x32, 0x75, 0x29, 0x00, 0x22, 0x91,
+ 0x1b, 0x22, 0x79, 0x0f, 0xe3, 0xc0, 0xa8, 0x75,
+ 0xa8, 0x00, 0x30, 0x2b, 0x03, 0xd0, 0xa8, 0x22,
+ 0x79, 0x0e, 0xf3, 0xd0, 0xa8, 0x22, 0x8a, 0xf0,
+ 0xe5, 0x50, 0x10, 0xf3, 0x10, 0x23, 0x23, 0x23,
+ 0x25, 0xf0, 0x12, 0x2c, 0xb8, 0xa2, 0xe7, 0x92,
+ 0xe4, 0xc2, 0xe7, 0x80, 0x08, 0x23, 0x23, 0x23,
+ 0x25, 0xf0, 0x12, 0x2c, 0x19, 0x25, 0x4f, 0x20,
+ 0xd2, 0x04, 0xf5, 0x4f, 0x80, 0x0a, 0x40, 0x05,
+ 0x75, 0x4f, 0x7f, 0x80, 0x03, 0x75, 0x4f, 0xff,
+ 0xea, 0x12, 0x2c, 0x3c, 0x25, 0x50, 0x20, 0xe7,
+ 0x05, 0xb4, 0x03, 0x07, 0x80, 0x0c, 0x75, 0x50,
+ 0x00, 0x80, 0x09, 0x40, 0x05, 0x75, 0x50, 0x03,
+ 0x80, 0x02, 0xf5, 0x50, 0x22, 0xe5, 0x4d, 0xc4,
+ 0x54, 0x0c, 0x03, 0x03, 0xfa, 0x91, 0xa9, 0x71,
+ 0xb8, 0xe5, 0x4d, 0xc4, 0x54, 0x03, 0xfa, 0x91,
+ 0xa9, 0x71, 0xb8, 0xe5, 0x4d, 0x54, 0x0c, 0x03,
+ 0x03, 0xfa, 0x91, 0xa9, 0x71, 0xb8, 0xe5, 0x4d,
+ 0x54, 0x03, 0xfa, 0x91, 0xa9, 0x71, 0xb8, 0x22,
+ 0x8a, 0xf0, 0xe5, 0x50, 0x23, 0x23, 0x25, 0xf0,
+ 0x12, 0x2b, 0xf6, 0x25, 0x4f, 0x20, 0xd2, 0x04,
+ 0xf5, 0x4f, 0x80, 0x0a, 0x40, 0x05, 0x75, 0x4f,
+ 0x7f, 0x80, 0x03, 0x75, 0x4f, 0xff, 0xea, 0x12,
+ 0x2c, 0x40, 0x25, 0x50, 0x20, 0xe7, 0x05, 0xb4,
+ 0x05, 0x07, 0x80, 0x0c, 0x75, 0x50, 0x00, 0x80,
+ 0x09, 0x40, 0x05, 0x75, 0x50, 0x05, 0x80, 0x02,
+ 0xf5, 0x50, 0x22, 0x30, 0x26, 0x03, 0x12, 0x1e,
+ 0xf5, 0x30, 0x27, 0x03, 0x12, 0x1f, 0x37, 0x30,
+ 0x25, 0x09, 0x12, 0x1f, 0x4e, 0x30, 0x23, 0x03,
+ 0x12, 0x1f, 0x1e, 0x10, 0x22, 0x02, 0x80, 0x0a,
+ 0xe5, 0x3b, 0xb4, 0xff, 0x02, 0xc2, 0x20, 0x12,
+ 0x1e, 0x79, 0x22, 0x78, 0x11, 0xe2, 0x20, 0xe0,
+ 0x07, 0xc0, 0x01, 0x12, 0x28, 0xba, 0xd0, 0x01,
+ 0x78, 0x00, 0xf2, 0x61, 0x9b, 0x12, 0x2b, 0x32,
+ 0x12, 0x17, 0x7f, 0x78, 0x00, 0xf2, 0xaa, 0x35,
+ 0xab, 0x36, 0xea, 0x24, 0xff, 0xfa, 0xeb, 0x34,
+ 0xff, 0xfb, 0x50, 0x03, 0xd2, 0x10, 0x22, 0x75,
+ 0x37, 0x01, 0x75, 0x38, 0x00, 0x75, 0x39, 0x00,
+ 0x12, 0x04, 0x04, 0xd2, 0x8e, 0x22, 0xa8, 0x2b,
+ 0xb8, 0x00, 0x02, 0x80, 0x03, 0x02, 0x11, 0xbd,
+ 0xf5, 0x74, 0x78, 0x2a, 0x12, 0x11, 0xec, 0xe5,
+ 0x74, 0x78, 0x29, 0x12, 0x11, 0xec, 0x22, 0xfa,
+ 0xe5, 0x2b, 0x60, 0x01, 0x22, 0xea, 0x78, 0x2b,
+ 0xf5, 0x75, 0x12, 0x11, 0xec, 0x22, 0x74, 0x10,
+ 0x12, 0x2b, 0x9b, 0x74, 0x20, 0x78, 0x05, 0xf2,
+ 0x74, 0x09, 0x12, 0x17, 0x75, 0xe5, 0x15, 0x44,
+ 0x80, 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x12, 0x17,
+ 0x7f, 0x22, 0x12, 0x03, 0x84, 0x79, 0x0f, 0xe3,
+ 0x78, 0x00, 0xf2, 0x12, 0x2b, 0x28, 0xe5, 0x81,
+ 0x24, 0xfc, 0xf5, 0x81, 0x61, 0x93, 0xd2, 0x07,
+ 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x4c, 0xc2,
+ 0x0f, 0x12, 0x29, 0xa3, 0x61, 0x93, 0x02, 0x1b,
+ 0x77, 0x00, 0xe1, 0x81, 0xe1, 0x9a, 0xd2, 0x2c,
+ 0xa1, 0x0c, 0x20, 0x20, 0x02, 0xd2, 0x26, 0x02,
+ 0x1e, 0x35, 0x02, 0x1e, 0x61, 0x02, 0x1d, 0x8f,
+ 0xc2, 0x8e, 0x75, 0xa8, 0x9e, 0x22, 0x41, 0x49,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x29, 0x91, 0x00, 0x00, 0x00, 0xa1, 0xbb,
+ 0xa1, 0xc3, 0x02, 0x1e, 0x6b, 0xe5, 0x4d, 0xc4,
+ 0x54, 0x0f, 0xfa, 0x91, 0x2f, 0x71, 0xb8, 0xe5,
+ 0x4d, 0x54, 0x0f, 0xfa, 0x91, 0x2f, 0x71, 0xb8,
+ 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1, 0xc6,
+ 0x02, 0x1d, 0x8f, 0xc2, 0x8e, 0xd2, 0xab, 0xc2,
+ 0x10, 0x79, 0x0f, 0xf3, 0x22, 0x00, 0x02, 0x2a,
+ 0x84, 0x00, 0xe1, 0xbc, 0xe1, 0xc8, 0x02, 0x1e,
+ 0x27, 0x00, 0x78, 0x00, 0xf2, 0x78, 0x0b, 0xe2,
+ 0xf4, 0xf5, 0x4d, 0xd2, 0x4c, 0x61, 0x9b, 0x30,
+ 0xb5, 0x02, 0xc2, 0x11, 0x22, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x79, 0xbd, 0xf1, 0x3d, 0x83,
+ 0x22, 0xdd, 0xbd, 0xbd, 0xbd, 0x61, 0xbd, 0x8d,
+ 0x7a, 0xbd, 0xbd, 0xbd, 0xbd, 0x30, 0xbd, 0xbd,
+ 0xbd, 0x55, 0xbd, 0xbd, 0xbd, 0x52, 0xbd, 0xb6,
+ 0xb6, 0xbd, 0xbd, 0xbd, 0xbd, 0x00, 0xbd, 0xbd,
+ 0xbd, 0xe8, 0xda, 0xbd, 0xbd, 0xcf, 0xb9, 0xbd,
+ 0xc4, 0xf1, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0x7b, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0x70, 0x6a, 0x57, 0x47, 0x34, 0xbd, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x29, 0xbd,
+ 0xbd, 0xbd, 0xb6, 0xb6, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x2e, 0x25,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xfe, 0xf5,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x19, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x21, 0x8f,
+ 0x09, 0xbd, 0xf9, 0x86, 0xbd, 0xbd, 0xbd, 0xd7,
+ 0xbd, 0xa9, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x9b,
+ 0xd1, 0x9d, 0xbd, 0xae, 0xbd, 0xbd, 0xbd, 0xcb,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xb6, 0xa5, 0xbd, 0xc5, 0xbd, 0xbd, 0xbd, 0xc3,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x74, 0x10,
+ 0x12, 0x2b, 0x9b, 0xe4, 0x78, 0x05, 0xf2, 0x74,
+ 0x09, 0x12, 0x17, 0x75, 0xe5, 0x15, 0x54, 0x7f,
+ 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x12, 0x17, 0x7f,
+ 0x22, 0x30, 0x51, 0x01, 0x22, 0x53, 0xa8, 0xfb,
+ 0x12, 0x2d, 0xf0, 0x50, 0x22, 0x79, 0x03, 0xe3,
+ 0x20, 0xe4, 0x1c, 0xaa, 0x35, 0xab, 0x36, 0xea,
+ 0x24, 0xf0, 0xfa, 0xeb, 0x34, 0xff, 0xfb, 0x50,
+ 0x0e, 0x10, 0x1f, 0x02, 0x80, 0x09, 0x20, 0x2a,
+ 0x03, 0x12, 0x2b, 0x32, 0x12, 0x2d, 0xd6, 0x43,
+ 0xa8, 0x04, 0x22, 0xa2, 0x1c, 0x72, 0x1d, 0x40,
+ 0x07, 0x53, 0x08, 0xbf, 0x78, 0x00, 0xf2, 0x22,
+ 0xb1, 0x1e, 0x22, 0x00, 0x79, 0x02, 0x12, 0x27,
+ 0x3d, 0x02, 0x2d, 0x37, 0x14, 0x54, 0xf0, 0x60,
+ 0x21, 0xe5, 0xf0, 0x24, 0xb6, 0xe5, 0xf0, 0x50,
+ 0x16, 0x24, 0x8b, 0x50, 0x15, 0xe5, 0xf0, 0x24,
+ 0x56, 0xe5, 0xf0, 0x50, 0x08, 0x24, 0x2f, 0x50,
+ 0x09, 0xe5, 0xf0, 0x24, 0xd9, 0x24, 0xd5, 0x24,
+ 0xf0, 0x22, 0x15, 0x81, 0x15, 0x81, 0xe9, 0x22,
+ 0x78, 0x13, 0x74, 0x00, 0xf2, 0x75, 0x2e, 0x01,
+ 0xd2, 0x6a, 0xc2, 0x69, 0xc2, 0x68, 0xc2, 0x6c,
+ 0x90, 0x25, 0x9f, 0x75, 0xb8, 0x07, 0x41, 0xa4,
+ 0xc0, 0x01, 0xc0, 0xf0, 0xc0, 0xd0, 0xc0, 0x02,
+ 0xe5, 0x3d, 0x54, 0x7d, 0x03, 0x10, 0xe5, 0x05,
+ 0x90, 0x28, 0x4b, 0x80, 0x03, 0x90, 0x2b, 0x7c,
+ 0x73, 0xe5, 0x3d, 0x30, 0xe5, 0x07, 0x74, 0xfd,
+ 0x78, 0x00, 0xf2, 0x61, 0x9b, 0x90, 0x1a, 0x97,
+ 0x74, 0xb6, 0xc0, 0xe0, 0x74, 0x27, 0xc0, 0xe0,
+ 0xc0, 0xa8, 0x02, 0x1b, 0xab, 0x90, 0x25, 0x9f,
+ 0xd0, 0xa8, 0x22, 0x90, 0x27, 0xb6, 0xc0, 0x82,
+ 0xc0, 0x83, 0xc0, 0xa8, 0x02, 0x1d, 0xa6, 0x90,
+ 0x27, 0xb6, 0xc0, 0x82, 0xc0, 0x83, 0xc0, 0xa8,
+ 0x02, 0x1e, 0x0a, 0xea, 0x24, 0xf0, 0xfa, 0xeb,
+ 0x34, 0xff, 0xfb, 0x50, 0x2e, 0x20, 0x0b, 0x05,
+ 0x85, 0x44, 0xe0, 0x80, 0x03, 0x75, 0xe0, 0x00,
+ 0x30, 0xe1, 0x20, 0xe5, 0x35, 0x24, 0xff, 0xf5,
+ 0x35, 0xe5, 0x36, 0x34, 0xff, 0xf5, 0x36, 0xc3,
+ 0xe5, 0x36, 0x13, 0xf5, 0x36, 0xe5, 0x35, 0x13,
+ 0xf5, 0x35, 0x75, 0x3a, 0x10, 0x12, 0x1a, 0x77,
+ 0x02, 0x18, 0x77, 0x75, 0x3a, 0x00, 0x12, 0x1a,
+ 0x77, 0x02, 0x18, 0x1b, 0x20, 0x4b, 0x04, 0x75,
+ 0x4e, 0x03, 0x22, 0xe5, 0x35, 0x24, 0xff, 0xf5,
+ 0x35, 0xe5, 0x36, 0x34, 0xff, 0xf5, 0x36, 0x75,
+ 0x4e, 0x03, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x02, 0x2c,
+ 0x70, 0xd2, 0x00, 0x78, 0x11, 0xe2, 0x44, 0x11,
+ 0xf5, 0x3f, 0xc2, 0x08, 0x12, 0x29, 0xa3, 0x02,
+ 0x23, 0x93, 0x21, 0x62, 0x61, 0x40, 0x01, 0x3a,
+ 0x01, 0x73, 0x21, 0x76, 0x61, 0xa8, 0x21, 0x39,
+ 0x21, 0x4a, 0x02, 0x2a, 0x7b, 0x79, 0x06, 0xf3,
+ 0xc0, 0xd0, 0x12, 0x03, 0xd9, 0x78, 0x00, 0xf2,
+ 0xd0, 0xd0, 0x22, 0x00, 0x00, 0x00, 0x00, 0x02,
+ 0x2c, 0xb4, 0x78, 0x11, 0xe2, 0x44, 0x11, 0x54,
+ 0x0f, 0xf8, 0xc4, 0x48, 0xd2, 0x05, 0xf5, 0x48,
+ 0xc2, 0x0d, 0x31, 0xa3, 0x02, 0x23, 0x93, 0x20,
+ 0x4b, 0x04, 0x75, 0x4e, 0x01, 0x22, 0xe5, 0x35,
+ 0x24, 0xff, 0xf5, 0x35, 0xe5, 0x36, 0x34, 0xff,
+ 0xf5, 0x36, 0x75, 0x4e, 0x01, 0x22, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x79, 0xd0, 0x77, 0x1b, 0x79, 0xd1, 0x77, 0x18,
+ 0x79, 0xd2, 0x77, 0x77, 0x79, 0xd3, 0x77, 0x18,
+ 0x22, 0x75, 0x29, 0x00, 0x75, 0x25, 0x00, 0x75,
+ 0x34, 0x03, 0x75, 0x22, 0x00, 0x75, 0x23, 0x05,
+ 0x75, 0x4f, 0x00, 0x75, 0x50, 0x00, 0x75, 0x30,
+ 0x00, 0x79, 0xdc, 0x77, 0x03, 0xc2, 0x8e, 0x75,
+ 0x17, 0xa8, 0x75, 0x16, 0xa8, 0x74, 0xaa, 0x79,
+ 0x01, 0xf3, 0x79, 0xd7, 0x77, 0x74, 0x79, 0xd8,
+ 0x77, 0xff, 0x79, 0xd9, 0x77, 0x07, 0x79, 0xda,
+ 0x77, 0x00, 0x12, 0x25, 0x6f, 0x43, 0x08, 0x40,
+ 0x71, 0x32, 0x79, 0x0e, 0xe3, 0x10, 0x51, 0x1c,
+ 0x74, 0x06, 0x71, 0x9b, 0xe5, 0x11, 0x44, 0x80,
+ 0x79, 0x05, 0xf3, 0xf5, 0x11, 0x74, 0x07, 0x71,
+ 0x9b, 0xe5, 0x12, 0x44, 0x80, 0x79, 0x05, 0xf3,
+ 0xf5, 0x12, 0x80, 0x18, 0x53, 0x27, 0xa0, 0x53,
+ 0x28, 0x01, 0x75, 0x20, 0xf7, 0x12, 0x23, 0x4c,
+ 0x75, 0x11, 0x80, 0x75, 0x12, 0x80, 0x12, 0x1f,
+ 0xc0, 0x12, 0x21, 0xdc, 0x79, 0x06, 0xf3, 0x22,
+ 0xd2, 0x02, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5,
+ 0x43, 0xc2, 0x0a, 0x12, 0x29, 0xa3, 0x02, 0x23,
+ 0x93, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x44,
+ 0xc2, 0x0b, 0x12, 0x29, 0xa3, 0x02, 0x23, 0x93,
+ 0x78, 0x00, 0xe2, 0x90, 0x25, 0x9f, 0x02, 0x23,
+ 0x93, 0x78, 0x11, 0xe2, 0x75, 0x20, 0xf7, 0x75,
+ 0x21, 0x3f, 0x75, 0x49, 0x11, 0x75, 0x4c, 0x11,
+ 0x31, 0xa3, 0x02, 0x23, 0x93, 0x78, 0x11, 0xe2,
+ 0x44, 0x11, 0x54, 0x0f, 0xf8, 0xc4, 0x48, 0xf8,
+ 0xe5, 0x49, 0x45, 0x3f, 0x58, 0xf5, 0x49, 0xd2,
+ 0x06, 0xc2, 0x0e, 0x31, 0xa3, 0x02, 0x23, 0x93,
+ 0xc0, 0x01, 0x20, 0x2a, 0x04, 0x71, 0x32, 0xc2,
+ 0x11, 0x11, 0x5e, 0xc2, 0x1f, 0xd0, 0x01, 0x02,
+ 0x23, 0x9b, 0x12, 0x21, 0xdc, 0x78, 0x00, 0xf2,
+ 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0xda,
+ 0xe7, 0x70, 0x2b, 0x20, 0x0a, 0x05, 0x85, 0x43,
+ 0xe0, 0x80, 0x03, 0x75, 0xe0, 0x00, 0x30, 0xe1,
+ 0x1d, 0x20, 0xe2, 0x1f, 0x74, 0xe0, 0xca, 0x74,
+ 0x00, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3, 0xf5,
+ 0x09, 0xca, 0x74, 0x01, 0x71, 0x9b, 0xca, 0x79,
+ 0x05, 0xf3, 0xf5, 0x0a, 0x80, 0x43, 0x12, 0x15,
+ 0x3e, 0x80, 0x3e, 0xe5, 0x0b, 0xb4, 0x17, 0x02,
+ 0x80, 0x0b, 0x50, 0x09, 0x74, 0x17, 0xc3, 0x95,
+ 0x0b, 0x44, 0x60, 0x80, 0x02, 0x74, 0x60, 0xca,
+ 0x74, 0x00, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3,
+ 0xf5, 0x09, 0xe5, 0x0c, 0xb4, 0x17, 0x02, 0x80,
+ 0x0b, 0x50, 0x09, 0x74, 0x17, 0xc3, 0x95, 0x0c,
+ 0x44, 0x60, 0x80, 0x02, 0x74, 0x60, 0xca, 0x74,
+ 0x01, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3, 0xf5,
+ 0x0a, 0x22, 0xd2, 0x04, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x46, 0xc2, 0x0c, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0xd2, 0x05, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x48, 0xc2, 0x0d, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0xd2, 0x06, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x49, 0xc2, 0x0e, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0x30, 0x1c, 0x21, 0x20, 0x4d, 0x1e,
+ 0xe5, 0x29, 0x60, 0x1a, 0xc2, 0x1c, 0x12, 0x19,
+ 0xec, 0x12, 0x13, 0xcf, 0xd2, 0x4d, 0x12, 0x17,
+ 0x7f, 0x78, 0x00, 0xf2, 0x79, 0x06, 0xf3, 0x43,
+ 0xa8, 0x04, 0x12, 0x24, 0x1b, 0x22, 0x12, 0x27,
+ 0x24, 0x22, 0x78, 0x00, 0xe2, 0x90, 0x25, 0x9f,
+ 0x02, 0x23, 0x93, 0x78, 0x00, 0xe2, 0xa2, 0xe7,
+ 0x72, 0xe3, 0x92, 0xe7, 0x02, 0x1d, 0x85, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x79, 0x04, 0xe3, 0x54, 0x80, 0x70, 0xf9, 0x22,
+ 0xe5, 0x29, 0x79, 0xde, 0xf7, 0x75, 0x29, 0x00,
+ 0x70, 0x12, 0xe5, 0x15, 0x79, 0xdd, 0xf7, 0x12,
+ 0x2d, 0xf0, 0x40, 0x08, 0x20, 0x1c, 0x07, 0x20,
+ 0x1d, 0x04, 0x80, 0x02, 0x71, 0x32, 0x30, 0xb5,
+ 0x0c, 0x79, 0x06, 0xf3, 0x20, 0x2a, 0x06, 0x79,
+ 0xdd, 0xe7, 0x54, 0xfc, 0xf7, 0xd2, 0x2b, 0x12,
+ 0x25, 0x6f, 0x22, 0x00, 0x00, 0x00, 0x00, 0xe5,
+ 0x15, 0xa2, 0xe0, 0xb0, 0xe6, 0x40, 0x31, 0xa2,
+ 0xe1, 0xb0, 0xe7, 0x40, 0x38, 0x10, 0x2b, 0x02,
+ 0x80, 0x26, 0x79, 0xde, 0xe7, 0x70, 0x0b, 0x79,
+ 0xdd, 0xe7, 0x20, 0xe0, 0x12, 0x20, 0xe1, 0x28,
+ 0x80, 0x16, 0xf5, 0x29, 0x30, 0x4d, 0x11, 0x20,
+ 0x4c, 0x0e, 0x12, 0x24, 0x1b, 0x80, 0x09, 0x43,
+ 0x08, 0x40, 0x12, 0x13, 0xcf, 0x12, 0x17, 0x7f,
+ 0xe5, 0x13, 0x20, 0xe4, 0x05, 0x12, 0x18, 0x1b,
+ 0x80, 0x03, 0x12, 0x18, 0x77, 0xc2, 0x2b, 0x22,
+ 0x12, 0x26, 0xd7, 0x12, 0x13, 0xb7, 0x22, 0x78,
+ 0x04, 0x79, 0x00, 0xd9, 0xfe, 0xd8, 0xfa, 0x22,
+ 0x00, 0x74, 0x09, 0x71, 0x9b, 0xe5, 0x15, 0x54,
+ 0xfc, 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x22, 0x78,
+ 0x11, 0xe2, 0x44, 0x11, 0x54, 0x0f, 0xf8, 0xc4,
+ 0x48, 0xf5, 0x46, 0xc2, 0x0c, 0xd2, 0x04, 0x31,
+ 0xa3, 0x02, 0x23, 0x93, 0x12, 0x26, 0xd7, 0x12,
+ 0x00, 0xb7, 0x22, 0x00, 0x79, 0x06, 0xf3, 0x74,
+ 0x0a, 0x71, 0x9b, 0x79, 0xe0, 0xe7, 0x44, 0x02,
+ 0xf7, 0x79, 0x05, 0xf3, 0x22, 0x74, 0x0a, 0x71,
+ 0x9b, 0x79, 0xe0, 0xe7, 0x54, 0xfd, 0xf7, 0x79,
+ 0x05, 0xf3, 0x22, 0x21, 0x59, 0x41, 0x23, 0x21,
+ 0x59, 0x41, 0x33, 0x41, 0x43, 0x21, 0x59, 0x21,
+ 0x59, 0x02, 0x25, 0x9f, 0x00, 0x74, 0x0d, 0x71,
+ 0x9b, 0x74, 0x4d, 0x79, 0x05, 0xf3, 0xd2, 0x52,
+ 0x22, 0x00, 0x53, 0x08, 0x40, 0x45, 0x08, 0x45,
+ 0x1e, 0x79, 0x04, 0xf3, 0xf5, 0x08, 0x22, 0xd2,
+ 0x01, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x42,
+ 0xc2, 0x09, 0x31, 0xa3, 0x02, 0x23, 0x93, 0x00,
+ 0x00, 0x00, 0x00, 0x71, 0x6e, 0x74, 0x09, 0x12,
+ 0x17, 0x75, 0xe5, 0x15, 0x44, 0x40, 0x79, 0x05,
+ 0xf3, 0xf5, 0x15, 0x75, 0x3a, 0x00, 0x12, 0x1a,
+ 0x77, 0x02, 0x18, 0x1b, 0xf5, 0x38, 0xe5, 0x37,
+ 0x24, 0x01, 0xf5, 0x37, 0xe5, 0x38, 0x34, 0x00,
+ 0xf5, 0x38, 0x40, 0x05, 0x75, 0x39, 0x00, 0x80,
+ 0x03, 0x75, 0x39, 0x01, 0x12, 0x04, 0x04, 0xd2,
+ 0x8e, 0x02, 0x03, 0x8d, 0x00, 0xb4, 0x0d, 0x03,
+ 0x74, 0x14, 0x22, 0x04, 0x83, 0x22, 0x00, 0x02,
+ 0xff, 0x01, 0x00, 0x05, 0xfe, 0xff, 0x00, 0x0a,
+ 0xfc, 0xfe, 0x00, 0xc0, 0xf8, 0xfc, 0x00, 0x28,
+ 0xf0, 0xf8, 0x00, 0x30, 0xe0, 0xd0, 0x01, 0x88,
+ 0x04, 0x83, 0x22, 0x00, 0xff, 0xfe, 0xfd, 0xfc,
+ 0xfc, 0xfb, 0xfa, 0xfe, 0xfd, 0xfb, 0xf9, 0xf7,
+ 0xf7, 0xf5, 0xf3, 0xfc, 0xfa, 0xf6, 0xf2, 0xee,
+ 0xee, 0xea, 0xe6, 0xf8, 0xf4, 0xec, 0xe4, 0xdc,
+ 0xd4, 0xcc, 0xc4, 0x24, 0x21, 0x83, 0x22, 0x04,
+ 0x83, 0x22, 0xff, 0x01, 0xff, 0x01, 0x00, 0x00,
+ 0x00, 0x02, 0x22, 0x32, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x83,
+ 0x22, 0x8a, 0x01, 0x20, 0x01, 0x0b, 0xea, 0xf3,
+ 0xf9, 0x8b, 0x7e, 0x6b, 0xd5, 0x01, 0x00, 0x01,
+ 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x01, 0x3a, 0x01, 0x38, 0x01, 0x4b, 0x01,
+ 0x49, 0x01, 0x5c, 0x01, 0x5a, 0x01, 0x08, 0x08,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x01, 0x15, 0x24, 0x48, 0x83, 0x22, 0x04,
+ 0x83, 0x22, 0x00, 0x01, 0x02, 0x03, 0x04, 0x06,
+ 0x07, 0x08, 0x00, 0x03, 0x05, 0x07, 0x09, 0x0d,
+ 0x0f, 0x81, 0x00, 0x06, 0x0a, 0x0e, 0x82, 0x8a,
+ 0x8e, 0x22, 0x00, 0x0c, 0x84, 0x8c, 0x24, 0x2c,
+ 0xa4, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xaa, 0x35, 0xab, 0x36,
+ 0x02, 0x27, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x25,
+ 0x03, 0x03, 0x2b, 0x03, 0x00, 0x03, 0x00, 0x03,
+ 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x83, 0x22,
+ 0x00, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x2b, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02,
+ 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x21, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x00,
+ 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x21,
+ 0x01, 0x02, 0x21, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x20, 0xb5, 0x05,
+ 0x79, 0x0f, 0xf3, 0xc2, 0x11, 0x22, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5,
+ 0x15, 0xa2, 0xe0, 0xb0, 0xe6, 0x50, 0x01, 0x22,
+ 0xa2, 0xe1, 0xb0, 0xe7, 0x22, 0x02, 0x00};
+ static unsigned char Data0485_0C[] = {
+ 0x02, 0x27, 0x69};
+ static unsigned char Data0485_66[] = {
+ 0x02, 0x25, 0x47, 0x02, 0x25, 0x60};
+ static unsigned char Data0485_60[] = {
+ 0x02, 0x22, 0x7e};
+ static unsigned char Data0485_99[] = {
+ 0xc2, 0x53, 0x02, 0x12, 0x86};
+ static unsigned char Data0485_9E[] = {
+ 0x70, 0xf9, 0x22};
+#ifdef OOKUBO_ORIGINAL
+ static unsigned char Data0485_36[] = {
+ 0x78, 0x00, 0xf2, 0xc2, 0x53, 0x74, 0x86, 0xc0,
+ 0xe0, 0x74, 0x12, 0xc0, 0xe0, 0x32};
+#endif /* OOKUBO_ORIGINAL */
diff -urN linux/include/sound/sound_pc9800.h linux98/include/sound/sound_pc9800.h
--- linux/include/sound/sound_pc9800.h Thu Jan 1 09:00:00 1970
+++ linux98/include/sound/sound_pc9800.h Fri Aug 17 22:33:07 2001
@@ -0,0 +1,23 @@
+#ifndef _SOUND_PC9800_H_
+#define _SOUND_PC9800_H_
+
+#include <asm/io.h>
+
+#define PC9800_SOUND_IO_ID 0xa460
+
+/* Sound Functions ID. */
+#define PC9800_SOUND_ID() ((inb(PC9800_SOUND_IO_ID) >> 4) & 0x0f)
+
+#define PC9800_SOUND_ID_DO 0x0 /* PC-98DO+ Internal */
+#define PC9800_SOUND_ID_GS 0x1 /* PC-98GS Internal */
+#define PC9800_SOUND_ID_73 0x2 /* PC-9801-73 (base 0x18x) */
+#define PC9800_SOUND_ID_73A 0x3 /* PC-9801-73/76 (base 0x28x) */
+#define PC9800_SOUND_ID_86 0x4 /* PC-9801-86 and compatible (base 0x18x) */
+#define PC9800_SOUND_ID_86A 0x5 /* PC-9801-86 (base 0x28x) */
+#define PC9800_SOUND_ID_NF 0x6 /* PC-9821Nf/Np Internal */
+#define PC9800_SOUND_ID_XMATE 0x7 /* X-Mate Internal and compatible */
+#define PC9800_SOUND_ID_118 0x8 /* PC-9801-118 and compatible(CanBe Internal, etc.) */
+
+#define PC9800_SOUND_ID_UNKNOWN 0xf /* Unknown (No Sound System or PC-9801-26) */
+
+#endif

2002-10-28 17:52:20

by Takashi Iwai

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

Hi,

At Sat, 26 Oct 2002 11:54:17 +0900,
Osamu Tomita wrote:
>
> This is part 22/25 of patchset for add support NEC PC-9800 architecture,
> against 2.5.44.
>
> Thanks Alan cox and Takashi Iwai.
> I rewite this patch.
>
> Summary:
> ALSA sound driver related modules.
> - add MPU-401 UART driver for PC-9800.
> - add hardware specific initialization.

thanks for rewriting the patch.

as i mentioned in another mail, my intension was to create another
"card" module for pc98. sorry if my comment confused you.

as far as i understand, the mpu401 changes are necessary only for pc98
onboard chips. if so, i'd like to see such like snd-pc98-cs4232
module which have both pc98-specific hardware initialization and
roland pc98-II mpu401 support, so that other parts can be kept as
clean (original) as possible.

or, if i misunderstand this (i.e. the patch is necessary for _all_
cards on pc98), please let me know.

anyway, i'll try to rewrite the patch (for alsa cvs tree) and send you
(perhaps) tomorrow.

ciao,

--
Takashi Iwai <[email protected]> SuSE Linux AG - http://www.suse.de
ALSA Developer ALSA Project - http://www.alsa-project.org

2002-10-29 10:02:57

by Takashi Iwai

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

Hi,

the attached is a patch to create a new driver module,
snd-pc98-cs4232, which supports CS4232 on PC9800 and PC98II MPU
daughterboard. (if you find the module name weird, please change as
you like. the name is tentative :)
in this patch, almost all pc98-specific hardware initialization is
done in the card module, hence the changes to common modules become
minimum.

the new module accepts the following module options.
please note that "snd_" prefix for module options (not module name)
is removed from the newest alsa drivers.

port mandatory
fm_port optional
mpu_port optional
mpu_irq optional
dma1 mandatory
dma2 optional
pc98ii optional, bool (0 or 1)

the MPU401 type is specified via pc98ii module option, not via the
kernel config, so that the module binary can be shared among different
machines.

since the chip on pc98 seems like non-isapnp, i removed isapnp stuff
from the module. also, control-port is disabled.

please check whether it works for you. if it's ok, i'd like to merge
it into alsa cvs, so the changes will be sent as ALSA update patches
later.


thanks,

Takashi

Attachments:

2002-10-29 17:37:00

by Osamu Tomita

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

Takashi Iwai wrote:
>
> Hi,
>
> the attached is a patch to create a new driver module,
> snd-pc98-cs4232, which supports CS4232 on PC9800 and PC98II MPU
> daughterboard. (if you find the module name weird, please change as
> you like. the name is tentative :)
> in this patch, almost all pc98-specific hardware initialization is
> done in the card module, hence the changes to common modules become
> minimum.
(snip)
> please check whether it works for you. if it's ok, i'd like to merge
> it into alsa cvs, so the changes will be sent as ALSA update patches
> later.
Thank you very much. I'm testing patch. And found some problems.
sound/drivers/opl3/Makefile, sound/core/Makefile, sound/core/seq/Makefile
and sound/core/seq/instr/Makefile needed additional patch for compile.
PCM works fine. But mpu401 plays very slow tempo. I can't find reason
yet.

Regards,
Osamu Tomita

2002-10-30 17:46:33

by Takashi Iwai

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

At Wed, 30 Oct 2002 02:43:22 +0900,
Osamu Tomita wrote:
>
> Takashi Iwai wrote:
> >
> > Hi,
> >
> > the attached is a patch to create a new driver module,
> > snd-pc98-cs4232, which supports CS4232 on PC9800 and PC98II MPU
> > daughterboard. (if you find the module name weird, please change as
> > you like. the name is tentative :)
> > in this patch, almost all pc98-specific hardware initialization is
> > done in the card module, hence the changes to common modules become
> > minimum.
> (snip)
> > please check whether it works for you. if it's ok, i'd like to merge
> > it into alsa cvs, so the changes will be sent as ALSA update patches
> > later.
> Thank you very much. I'm testing patch. And found some problems.
> sound/drivers/opl3/Makefile, sound/core/Makefile, sound/core/seq/Makefile
> and sound/core/seq/instr/Makefile needed additional patch for compile.

oops, yes, thanks.

> PCM works fine. But mpu401 plays very slow tempo. I can't find reason
> yet.

do you mean that the interrupts are generated too slowly?
you can measure how many UART interrupts are generated per second by
checking /proc/interrupts.
if it's too little, the problem is likely in the hardware
initialization part, which i simply copied from your patch.
but it could be a wrong copy & paste.
please check pc98_mpu401_init() in pc98.c.

btw, which MPU mode are you using, PC98II or normal MPU401?


Takashi

2002-11-01 12:56:48

by Osamu Tomita

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

2002.10.31 02:52, Takashi Iwai wrote:
> At Wed, 30 Oct 2002 02:43:22 +0900,
(snip)
> do you mean that the interrupts are generated too slowly?
> you can measure how many UART interrupts are generated per second by
> checking /proc/interrupts.
> if it's too little, the problem is likely in the hardware
> initialization part, which i simply copied from your patch.
> but it could be a wrong copy & paste.
> please check pc98_mpu401_init() in pc98.c.
>
> btw, which MPU mode are you using, PC98II or normal MPU401?
Thanks! Problem solved. MPU401 works fine by trivial fix as follows.

#--- linux/sound/isa/cs423x/pc98.c.old Wed Oct 30 00:20:35 2002
#+++ linux/sound/isa/cs423x/pc98.c Fri Nov 1 20:45:31 2002
#@@ -379,7 +379,7 @@
# err = pc98_mpu401_init(mpu_irq[dev]);
# if (! err) {
# err = snd_mpu401_uart_new(card, 0,
#- pc98ii ?
MPU401_HW_PC98II : MPU401_HW_MPU401,
#+ pc98ii[dev] ?
MPU401_HW_PC98II : MPU401_HW_MPU401,
# mpu_port[dev], 0,
# mpu_irq[dev],
SA_INTERRUPT, NULL);
# if (err < 0)

Now, PCM OPL3 and MPU401 all works fine.
Would you please add option "pc98ii" into snd-mpu401?
This is for Box that has MPU-PC98II only, with no other sound card.

Best regards,
Osamu Tomita

P.S. Here is a whole patch when I tested. (agaist 2.5.44)
--- linux/sound/drivers/mpu401/mpu401_uart.c 13 Aug 2002 16:17:06
-0000 1.11
+++ linux/sound/drivers/mpu401/mpu401_uart.c 28 Oct 2002 11:36:38
-0000
@@ -400,12 +400,17 @@
spin_lock_init(&mpu->timer_lock);
mpu->hardware = hardware;
if (!integrated) {
- if ((mpu->res = request_region(port, 2, "MPU401 UART"))
== NULL) {
+ int res_size = hardware == MPU401_HW_PC98II ? 4 : 2;
+ if ((mpu->res = request_region(port, res_size, "MPU401
UART")) == NULL) {
snd_device_free(card, rmidi);
return -EBUSY;
}
}
mpu->port = port;
+ if (hardware == MPU401_HW_PC98II)
+ mpu->cport = port + 2;
+ else
+ mpu->cport = port + 1;
if (irq >= 0 && irq_flags) {
if (request_irq(irq, snd_mpu401_uart_interrupt,
irq_flags, "MPU401 UART", (void *) mpu)) {
snd_printk("unable to grab IRQ %d\n", irq);
--- linux/sound/drivers/opl3/opl3_lib.c 13 Aug 2002 16:17:06 -0000
1.9
+++ linux/sound/drivers/opl3/opl3_lib.c 28 Oct 2002 14:41:55 -0000
@@ -418,6 +418,7 @@
case OPL3_HW_OPL3_SV:
case OPL3_HW_OPL3_CS:
case OPL3_HW_OPL3_FM801:
+ case OPL3_HW_OPL3_PC98:
opl3->command = &snd_opl3_command;
break;
case OPL3_HW_OPL3_CS4281:
@@ -438,6 +439,25 @@
opl3->command = &snd_opl3_command;
}
}
+
+ if (opl3->hardware == OPL3_HW_OPL3_PC98) {
+ /* Initialize? */
+ opl3->command(opl3, OPL3_RIGHT | 0x05, 0x05);
+ opl3->command(opl3, OPL3_RIGHT | 0x08, 0x04);
+ opl3->command(opl3, OPL3_RIGHT | 0x08, 0x00);
+ opl3->command(opl3, OPL3_LEFT | 0xf7, 0x00);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x60);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x80);
+ inb(opl3->l_port);
+
+ opl3->command(opl3, OPL3_LEFT | 0x02, 0xff);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x21);
+ inb(opl3->l_port);
+
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x60);
+ opl3->command(opl3, OPL3_LEFT | 0x04, 0x80);
+ }
+
opl3->command(opl3, OPL3_LEFT | OPL3_REG_TEST,
OPL3_ENABLE_WAVE_SELECT);
opl3->command(opl3, OPL3_LEFT | OPL3_REG_PERCUSSION, 0x00);
/* Melodic mode */
--- linux/include/sound/mpu401.h 23 Aug 2002 15:25:03 -0000
1.6
+++ linux/include/sound/mpu401.h 28 Oct 2002 14:01:27 -0000
@@ -41,6 +41,7 @@
#define MPU401_HW_CMIPCI 15 /* CMIPCI MPU-401 UART
*/
#define MPU401_HW_ALS4000 16 /* Avance Logic ALS4000
*/
#define MPU401_HW_INTEL8X0 17 /* Intel8x0 driver */
+#define MPU401_HW_PC98II 18 /* Roland PC98II */
#define MPU401_MODE_BIT_INPUT 0
#define MPU401_MODE_BIT_OUTPUT 1
@@ -64,6 +65,7 @@
unsigned short hardware; /* MPU401_HW_XXXX */
unsigned long port; /* base port of MPU-401 chip */
+ unsigned long cport; /* port + 1 (usually) */
struct resource *res; /* port resource */
int irq; /* IRQ number of MPU-401 chip
(-1 = poll) */
int irq_flags;
@@ -89,8 +91,8 @@
/* I/O ports */
-#define MPU401C(mpu) ((mpu)->port + 1)
-#define MPU401D(mpu) ((mpu)->port + 0)
+#define MPU401C(mpu) (mpu)->cport
+#define MPU401D(mpu) (mpu)->port
/*
--- linux/include/sound/opl3.h 18 Sep 2002 12:25:13 -0000
1.7
+++ linux/include/sound/opl3.h 28 Oct 2002 14:40:15 -0000
@@ -229,6 +229,7 @@
#define OPL3_HW_OPL3_CS 0x0302 /* CS4232/CS4236+ */
#define OPL3_HW_OPL3_FM801 0x0303 /* FM801 */
#define OPL3_HW_OPL3_CS4281 0x0304 /* CS4281 */
+#define OPL3_HW_OPL3_PC98 0x0305 /* PC9800 */
#define OPL3_HW_OPL4 0x0400
#define OPL3_HW_MASK 0xff00
--- linux/sound/isa/Config.in 24 Jul 2002 10:30:26 -0000 1.5
+++ linux/sound/isa/Config.in 28 Oct 2002 14:06:57 -0000
@@ -8,6 +8,7 @@
dep_tristate 'Generic Cirrus Logic CS4231 driver' CONFIG_SND_CS4231
$CONFIG_SND
dep_tristate 'Generic Cirrus Logic CS4232 driver' CONFIG_SND_CS4232
$CONFIG_SND
dep_tristate 'Generic Cirrus Logic CS4236+ driver' CONFIG_SND_CS4236
$CONFIG_SND
+dep_tristate 'NEC PC9800 CS4232 driver' CONFIG_SND_PC98_CS4232
$CONFIG_SND $CONFIG_PC9800
dep_tristate 'Generic ESS ES968 driver' CONFIG_SND_ES968 $CONFIG_SND
$CONFIG_ISAPNP
dep_tristate 'Generic ESS ES688/ES1688 driver' CONFIG_SND_ES1688
$CONFIG_SND
dep_tristate 'Generic ESS ES18xx driver' CONFIG_SND_ES18XX $CONFIG_SND
--- linux/sound/isa/cs423x/Makefile 18 Jun 2002 15:32:29 -0000
1.5
+++ linux/sound/isa/cs423x/Makefile 28 Oct 2002 17:51:40 -0000
@@ -10,6 +10,7 @@
snd-cs4231-objs := cs4231.o
snd-cs4232-objs := cs4232.o
snd-cs4236-objs := cs4236.o
+snd-pc98-cs4232-objs := pc98.o
# Toplevel Module Dependency
obj-$(CONFIG_SND_AZT2320) += snd-cs4231-lib.o
@@ -22,6 +23,7 @@
obj-$(CONFIG_SND_INTERWAVE_STB) += snd-cs4231-lib.o
obj-$(CONFIG_SND_OPTI92X_CS4231) += snd-cs4231-lib.o
obj-$(CONFIG_SND_WAVEFRONT) += snd-cs4231-lib.o
+obj-$(CONFIG_SND_PC98_CS4232) += snd-pc98-cs4232.o snd-cs4231-lib.o
obj-m := $(sort $(obj-m))
--- /dev/null Thu Apr 11 23:25:15 2002
+++ linux/sound/isa/cs423x/pc98.c Fri Nov 1 11:37:22 2002
@@ -0,0 +1,466 @@
+/*
+ * Driver for CS4232 on NEC PC9800 series
+ * Copyright (c) by Jaroslav Kysela <[email protected]>
+ * Osamu Tomita <[email protected]>
+ * Takashi Iwai <[email protected]>
+ *
+ *
+ * This program is free software; you can redistribute it and/or
modify
+ * it under the terms of the GNU General Public License as published
by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
+ *
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/cs4231.h>
+#include <sound/mpu401.h>
+#include <sound/opl3.h>
+#define SNDRV_GET_ID
+#include <sound/initval.h>
+#include "sound_pc9800.h"
+
+#define chip_t cs4231_t
+
+MODULE_AUTHOR("Osamu Tomita <[email protected]>");
+MODULE_LICENSE("GPL");
+MODULE_CLASSES("{sound}");
+MODULE_DESCRIPTION("NEC PC9800 CS4232");
+MODULE_DEVICES("{{NEC,PC9800}}");
+
+#define IDENT "PC98-CS4232"
+
+static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX
*/
+static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this
card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /*
Enable this card */
+static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+#if 0 /* NOT USED */
+static long cport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+#endif
+static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;/* PnP setup */
+static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
+static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /*
5,7,9,11,12,15 */
+static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 9,11,12,15 */
+static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7
*/
+static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3,5,6,7
*/
+static int pc98ii[SNDRV_CARDS]; /*
PC98II */
+
+MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(index, "Index value for " IDENT " soundcard.");
+MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
+MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s");
+MODULE_PARM_DESC(id, "ID string for " IDENT " soundcard.");
+MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
+MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(enable, "Enable " IDENT " soundcard.");
+MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
+MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(port, "Port # for " IDENT " driver.");
+MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC);
+#if 0 /* NOT USED */
+MODULE_PARM(cport, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(cport, "Control port # for " IDENT " driver.");
+MODULE_PARM_SYNTAX(cport, SNDRV_PORT12_DESC);
+#endif
+MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " IDENT " driver.");
+MODULE_PARM_SYNTAX(mpu_port, SNDRV_PORT12_DESC);
+MODULE_PARM(fm_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l");
+MODULE_PARM_DESC(fm_port, "FM port # for " IDENT " driver.");
+MODULE_PARM_SYNTAX(fm_port, SNDRV_PORT12_DESC);
+MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(irq, "IRQ # for " IDENT " driver.");
+MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC);
+MODULE_PARM(mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " IDENT " driver.");
+MODULE_PARM_SYNTAX(mpu_irq, SNDRV_IRQ_DESC);
+MODULE_PARM(dma1, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma1, "DMA1 # for " IDENT " driver.");
+MODULE_PARM_SYNTAX(dma1, SNDRV_DMA_DESC);
+MODULE_PARM(dma2, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(dma2, "DMA2 # for " IDENT " driver.");
+MODULE_PARM_SYNTAX(dma2, SNDRV_DMA_DESC);
+MODULE_PARM(pc98ii, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pc98ii, "Roland MPU-PC98II support.");
+MODULE_PARM_SYNTAX(pc98ii, SNDRV_BOOLEAN_FALSE_DESC);
+
+
+static snd_card_t *snd_pc98_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
+
+/*
+ * initialize MPU401-UART
+ */
+
+static int __init pc98_mpu401_init(int irq)
+{
+#include "pc9801_118_magic.h"
+#define outp118(reg,data) outb((reg),0x148e);outb((data),0x148f)
+#define WAIT118 outb(0x00,0x5f)
+ int mpu_intr, count;
+#ifdef OOKUBO_ORIGINAL
+ int err = 0;
+#endif /* OOKUBO_ORIGINAL */
+
+ switch (irq) {
+ case 3:
+ mpu_intr = 3;
+ break;
+ case 5:
+ mpu_intr = 2;
+ break;
+ case 6:
+ mpu_intr = 1;
+ break;
+ case 10:
+ mpu_intr = 0;
+ break;
+ default:
+ snd_printk(KERN_ERR IDENT ": Bad IRQ %d\n", irq);
+ return -EINVAL;
+ }
+
+ outp118(0x21, mpu_intr);
+ WAIT118;
+ outb(0x00, 0x148e);
+ if (inb(0x148f) & 0x08) {
+ snd_printk(KERN_INFO IDENT ": No MIDI daughter board
found\n");
+ return 0;
+ }
+
+ outp118(0x20, 0x00);
+ outp118(0x05, 0x04);
+ for (count = 0; count < 35000; count ++)
+ WAIT118;
+ outb(0x05, 0x148e);
+ for (count = 0; count < 65000; count ++)
+ if (inb(0x148f) == 0x04)
+ goto set_mode_118;
+ snd_printk(KERN_ERR IDENT ": MIDI daughter board initalize
failed at stage1\n\n");
+ return -EINVAL;
+
+ set_mode_118:
+ outp118(0x05, 0x0c);
+ outb(0xaa, 0x485);
+ outb(0x99, 0x485);
+ outb(0x2a, 0x485);
+ for (count = 0; count < sizeof(Data0485_99); count ++) {
+ outb(Data0485_99[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x9e, 0x485);
+ outb(0x2a, 0x485);
+ for (count = 0; count < sizeof(Data0485_9E); count ++)
+ if (inb(0x485) != Data0485_9E[count]) {
+#ifdef OOKUBO_ORIGINAL
+ err = 1;
+#endif /* OOKUBO_ORIGINAL */
+ break;
+ }
+ outb(0x00, 0x486);
+ for (count = 0; count < 2000; count ++)
+ WAIT118;
+#ifdef OOKUBO_ORIGINAL
+ if (!err) {
+ outb(0xaa, 0x485);
+ outb(0x36, 0x485);
+ outb(0x28, 0x485);
+ for (count = 0; count < sizeof(Data0485_36); count ++)
+ outb(Data0485_36[count], 0x485);
+ outb(0x00, 0x486);
+ for (count = 0; count < 1500; count ++)
+ WAIT118;
+ outp118(0x05, inb(0x148f) | 0x08);
+ outb(0xff, 0x148c);
+ outp118(0x05, inb(0x148f) & 0xf7);
+ for (count = 0; count < 1500; count ++)
+ WAIT118;
+ }
+#endif /* OOKUBO_ORIGINAL */
+
+ outb(0xaa, 0x485);
+ outb(0xa9, 0x485);
+ outb(0x21, 0x485);
+ for (count = 0; count < sizeof(Data0485_A9); count ++) {
+ outb(Data0485_A9[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x0c, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_0C); count ++) {
+ outb(Data0485_0C[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x66, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_66); count ++) {
+ outb(Data0485_66[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outb(0xaa, 0x485);
+ outb(0x60, 0x485);
+ outb(0x20, 0x485);
+ for (count = 0; count < sizeof(Data0485_60); count ++) {
+ outb(Data0485_60[count], 0x485);
+ WAIT118;
+ }
+
+ outb(0x00, 0x486);
+ outp118(0x05, 0x04);
+ outp118(0x05, 0x00);
+ for (count = 0; count < 35000; count ++)
+ WAIT118;
+ outb(0x05, 0x148e);
+ for (count = 0; count < 65000; count ++)
+ if (inb(0x148f) == 0x00)
+ goto end_mode_118;
+ snd_printk(KERN_ERR IDENT ": MIDI daughter board initalize
failed at stage2\n");
+ return -EINVAL;
+
+ end_mode_118:
+ outb(0x3f, 0x148d);
+ snd_printk(KERN_INFO IDENT ": MIDI daughter board
initalized\n");
+ return 0;
+}
+
+static int __init pc98_cs4231_chip_init(int dev)
+{
+ int intr_bits, intr_bits2, dma_bits;
+
+ switch (irq[dev]) {
+ case 3:
+ intr_bits = 0x08;
+ intr_bits2 = 0x03;
+ break;
+ case 5:
+ intr_bits = 0x10;
+ intr_bits2 = 0x08;
+ break;
+ case 10:
+ intr_bits = 0x18;
+ intr_bits2 = 0x02;
+ break;
+ case 12:
+ intr_bits = 0x20;
+ intr_bits2 = 0x00;
+ break;
+ default:
+ snd_printk(KERN_ERR IDENT ": Bad IRQ %d\n", irq[dev]);
+ return -EINVAL;
+ }
+
+ switch (dma1[dev]) {
+ case 0:
+ dma_bits = 0x01;
+ break;
+ case 1:
+ dma_bits = 0x02;
+ break;
+ case 3:
+ dma_bits = 0x03;
+ break;
+ default:
+ snd_printk(KERN_ERR IDENT ": Bad DMA %d\n", dma1[dev]);
+ return -EINVAL;
+ }
+
+ if (dma2[dev] >= 2) {
+ snd_printk(KERN_ERR IDENT ": Bad DMA %d\n", dma2[dev]);
+ return -EINVAL;
+ }
+ if (dma1[dev] != dma2[dev] && dma2[dev] >= 0)
+ intr_bits |= 0x04;
+
+ if (PC9800_SOUND_ID() == PC9800_SOUND_ID_118) {
+ /* Set up CanBe control registers. */
+ snd_printd(KERN_INFO "Setting up CanBe Sound System\n");
+ outb(inb(PC9800_SOUND_IO_ID) | 0x03,
PC9800_SOUND_IO_ID);
+ outb(0x01, 0x0f4a);
+ outb(intr_bits2, 0x0f4b);
+ }
+
+ outb(intr_bits | dma_bits, 0xf40);
+ return 0;
+}
+
+
+static int __init snd_card_pc98_probe(int dev)
+{
+ snd_card_t *card;
+ snd_pcm_t *pcm = NULL;
+ cs4231_t *chip;
+ opl3_t *opl3;
+ int err;
+
+ if (port[dev] == SNDRV_AUTO_PORT) {
+ snd_printk(KERN_ERR IDENT ": specify port\n");
+ return -EINVAL;
+ }
+ card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
+ if (card == NULL)
+ return -ENOMEM;
+ if (mpu_port[dev] < 0 || mpu_irq[dev] < 0)
+ mpu_port[dev] = SNDRV_AUTO_PORT;
+ if (fm_port[dev] < 0)
+ fm_port[dev] = SNDRV_AUTO_PORT;
+
+ if ((err = pc98_cs4231_chip_init(dev)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+
+ if ((err = snd_cs4231_create(card,
+ port[dev],
+ -1,
+ irq[dev],
+ dma1[dev],
+ dma2[dev],
+ CS4231_HW_DETECT,
+ 0,
+ &chip)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+ if ((err = snd_cs4231_pcm(chip, 0, &pcm)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+ if ((err = snd_cs4231_mixer(chip)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+
+ if ((err = snd_cs4231_timer(chip, 0, NULL)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+
+ if (fm_port[dev] != SNDRV_AUTO_PORT) {
+ /* ??? */
+ outb(0x00, fm_port[dev] + 6);
+ inb(fm_port[dev] + 7);
+ /* Enable OPL-3 Function */
+ outb(inb(PC9800_SOUND_IO_ID) | 0x03,
PC9800_SOUND_IO_ID);
+ if (snd_opl3_create(card,
+ fm_port[dev], fm_port[dev] + 2,
+ OPL3_HW_OPL3_PC98, 0, &opl3) < 0) {
+ printk(KERN_ERR IDENT ": OPL3 not detected\n");
+ } else {
+ if ((err = snd_opl3_hwdep_new(opl3, 0, 1,
NULL)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+ }
+ }
+
+ if (mpu_port[dev] != SNDRV_AUTO_PORT) {
+ err = pc98_mpu401_init(mpu_irq[dev]);
+ if (! err) {
+ err = snd_mpu401_uart_new(card, 0,
+ pc98ii[dev] ?
MPU401_HW_PC98II : MPU401_HW_MPU401,
+ mpu_port[dev], 0,
+ mpu_irq[dev],
SA_INTERRUPT, NULL);
+ if (err < 0)
+ snd_printk(KERN_INFO IDENT ": MPU401
not detected\n");
+ }
+ }
+
+ strcpy(card->driver, pcm->name);
+ strcpy(card->shortname, pcm->name);
+ sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i",
+ pcm->name,
+ chip->port,
+ irq[dev],
+ dma1[dev]);
+ if (dma1[dev] >= 0)
+ sprintf(card->longname + strlen(card->longname), "&%d",
dma2[dev]);
+ if ((err = snd_card_register(card)) < 0) {
+ snd_card_free(card);
+ return err;
+ }
+ snd_pc98_cards[dev] = card;
+ return 0;
+}
+
+static int __init alsa_card_pc98_init(void)
+{
+ int dev, cards = 0;
+
+ for (dev = 0; dev < SNDRV_CARDS; dev++) {
+ if (!enable[dev])
+ continue;
+ if (snd_card_pc98_probe(dev) >= 0)
+ cards++;
+ }
+ if (!cards) {
+#ifdef MODULE
+ printk(KERN_ERR IDENT " soundcard not found or device
busy\n");
+#endif
+ return -ENODEV;
+ }
+ return 0;
+}
+
+static void __exit alsa_card_pc98_exit(void)
+{
+ int idx;
+
+ for (idx = 0; idx < SNDRV_CARDS; idx++)
+ snd_card_free(snd_pc98_cards[idx]);
+}
+
+module_init(alsa_card_pc98_init)
+module_exit(alsa_card_pc98_exit)
+
+#ifndef MODULE
+
+/* format is: snd-pc98-cs4232=enable,index,id,port,
+ mpu_port,fm_port,
+ irq,mpu_irq,dma1,dma2,pc98ii */
+
+static int __init alsa_card_pc98_setup(char *str)
+{
+ static unsigned __initdata nr_dev = 0;
+
+ if (nr_dev >= SNDRV_CARDS)
+ return 0;
+ (void)(get_option(&str,&enable[nr_dev]) == 2 &&
+ get_option(&str,&index[nr_dev]) == 2 &&
+ get_id(&str,&id[nr_dev]) == 2 &&
+ get_option(&str,(int *)&port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&mpu_port[nr_dev]) == 2 &&
+ get_option(&str,(int *)&fm_port[nr_dev]) == 2 &&
+ get_option(&str,&irq[nr_dev]) == 2 &&
+ get_option(&str,&mpu_irq[nr_dev]) == 2 &&
+ get_option(&str,&dma1[nr_dev]) == 2 &&
+ get_option(&str,&dma2[nr_dev]) == 2 &&
+ get_option(&str,&pc98ii[nr_dev]) == 2);
+ nr_dev++;
+ return 1;
+}
+
+__setup("snd-pc98-cs4232=", alsa_card_pc98_setup);
+
+#endif /* ifndef MODULE */
--- /dev/null 2002-09-08 06:22:10.000000000 +0200
+++ linux/sound/isa/cs423x/pc9801_118_magic.h 2002-10-28
15:44:12.000000000 +0100
@@ -0,0 +1,411 @@
+ static unsigned char Data0485_A9[] = {
+ 0x12, 0x03, 0x90, 0xc2, 0x2a, 0x75, 0x1e, 0x20,
+ 0xe4, 0x12, 0x2b, 0x9b, 0x22, 0xa9, 0x16, 0x77,
+ 0x33, 0xe9, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf5,
+ 0x16, 0xc2, 0x2f, 0x22, 0xa9, 0x16, 0x77, 0x42,
+ 0xe9, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf9, 0x77,
+ 0xf8, 0x04, 0x54, 0x03, 0x44, 0xa8, 0xf5, 0x16,
+ 0xc2, 0x2f, 0x22, 0x90, 0x25, 0x9f, 0x30, 0x04,
+ 0x05, 0xc2, 0x04, 0x12, 0x1f, 0x62, 0x30, 0x00,
+ 0x05, 0xc2, 0x00, 0x12, 0x15, 0xe6, 0x30, 0x01,
+ 0x05, 0xc2, 0x01, 0x12, 0x29, 0xaf, 0x30, 0x02,
+ 0x05, 0xc2, 0x02, 0x12, 0x29, 0xaf, 0x30, 0x05,
+ 0x05, 0xc2, 0x05, 0x12, 0x16, 0x65, 0x30, 0x06,
+ 0x08, 0xc2, 0x06, 0x12, 0x16, 0xb1, 0x12, 0x29,
+ 0xaf, 0x30, 0x07, 0x08, 0xc2, 0x07, 0x12, 0x16,
+ 0xe9, 0x12, 0x29, 0xaf, 0x22, 0x20, 0x97, 0x09,
+ 0x53, 0xa8, 0xfb, 0x12, 0x04, 0x2c, 0x43, 0xa8,
+ 0x04, 0x22, 0x71, 0xb8, 0x71, 0xb8, 0x71, 0xb8,
+ 0x22, 0x20, 0x4b, 0x04, 0x75, 0x4e, 0x02, 0x22,
+ 0xe5, 0x35, 0x24, 0xff, 0xf5, 0x35, 0xe5, 0x36,
+ 0x34, 0xff, 0xf5, 0x36, 0x75, 0x4e, 0x02, 0x22,
+ 0x10, 0x19, 0x02, 0x80, 0x08, 0x78, 0x00, 0xe2,
+ 0x78, 0x07, 0xf2, 0x61, 0x9b, 0x78, 0x11, 0xe2,
+ 0xc0, 0x01, 0xc0, 0xf0, 0xc0, 0xd0, 0xc0, 0x02,
+ 0x71, 0x14, 0xe5, 0x30, 0xb4, 0x01, 0x02, 0x61,
+ 0x93, 0x43, 0x08, 0x40, 0x12, 0x2a, 0x53, 0x61,
+ 0x93, 0x79, 0x03, 0xe3, 0xa2, 0xe2, 0x92, 0x26,
+ 0xa2, 0xe3, 0x92, 0x27, 0x22, 0xad, 0x2b, 0xbd,
+ 0x04, 0x07, 0xf5, 0x72, 0x78, 0x27, 0x02, 0x11,
+ 0x76, 0x02, 0x11, 0x30, 0x00, 0x00, 0x00, 0x12,
+ 0x28, 0xba, 0x79, 0x01, 0xe3, 0x75, 0x21, 0x3f,
+ 0x75, 0x49, 0x11, 0x75, 0x4c, 0x11, 0x31, 0xdc,
+ 0x75, 0x1a, 0x80, 0x51, 0x72, 0x75, 0x81, 0xe3,
+ 0x12, 0x25, 0xc9, 0x43, 0xa8, 0x01, 0x00, 0x53,
+ 0xa8, 0xfe, 0x10, 0x50, 0x02, 0x80, 0x03, 0x12,
+ 0x1a, 0x8d, 0xd1, 0x28, 0x12, 0x03, 0xd9, 0xd1,
+ 0xf2, 0x12, 0x2d, 0xf0, 0xb0, 0x11, 0x92, 0xe0,
+ 0xa2, 0x2a, 0xa0, 0xb5, 0x82, 0xe0, 0x50, 0x03,
+ 0x79, 0x0f, 0xe3, 0x71, 0xca, 0x51, 0x1e, 0x91,
+ 0xe4, 0x53, 0xa8, 0xfb, 0x10, 0x10, 0x02, 0x80,
+ 0x26, 0xc2, 0x8e, 0xd2, 0xab, 0xa2, 0x1c, 0x40,
+ 0x13, 0xa2, 0x1d, 0x50, 0x0a, 0x43, 0x08, 0x40,
+ 0x12, 0x1a, 0x01, 0xd1, 0xd7, 0x80, 0x0b, 0x12,
+ 0x26, 0x04, 0x61, 0x08, 0x43, 0x08, 0x40, 0x12,
+ 0x1a, 0x01, 0xd2, 0x1f, 0x12, 0x17, 0x7f, 0x43,
+ 0xa8, 0x04, 0x51, 0x1e, 0x91, 0xe4, 0x12, 0x13,
+ 0x34, 0x80, 0x98, 0xa2, 0x17, 0x72, 0x16, 0x72,
+ 0x15, 0x72, 0x2d, 0x50, 0x06, 0xfa, 0x12, 0x13,
+ 0x66, 0x80, 0x25, 0xc2, 0x13, 0x30, 0x28, 0x05,
+ 0x12, 0x02, 0xbe, 0x80, 0x1b, 0xb4, 0x10, 0x12,
+ 0x78, 0x00, 0xf2, 0xe5, 0x30, 0xb4, 0x01, 0x06,
+ 0x12, 0x03, 0x90, 0xd2, 0x19, 0x22, 0x12, 0x00,
+ 0xdd, 0x22, 0x75, 0x30, 0x00, 0x12, 0x00, 0xa1,
+ 0x22, 0x00, 0x00, 0x75, 0x1e, 0x00, 0x74, 0x0c,
+ 0x12, 0x2b, 0x9b, 0x74, 0x40, 0x79, 0x05, 0xf3,
+ 0x74, 0x49, 0x12, 0x2b, 0x9b, 0x74, 0x04, 0x79,
+ 0x05, 0xf3, 0x75, 0x15, 0x04, 0x74, 0x10, 0x12,
+ 0x2b, 0x9b, 0x74, 0x00, 0x79, 0x05, 0xf3, 0x74,
+ 0x17, 0x12, 0x2b, 0x9b, 0x74, 0x00, 0x79, 0x05,
+ 0xf3, 0x74, 0x1a, 0x12, 0x2b, 0x9b, 0x74, 0x00,
+ 0x79, 0x05, 0xf3, 0x74, 0x0a, 0x12, 0x2b, 0x9b,
+ 0x74, 0x20, 0x79, 0x05, 0xf3, 0x79, 0xe0, 0x77,
+ 0x20, 0x22, 0xd0, 0x02, 0xd0, 0xd0, 0xd0, 0xf0,
+ 0xd0, 0x01, 0xe5, 0x5f, 0xd0, 0xa8, 0x22, 0x00,
+ 0x00, 0x90, 0x25, 0x9f, 0x75, 0x26, 0xff, 0x75,
+ 0x27, 0xff, 0x75, 0x28, 0x03, 0x75, 0x13, 0xff,
+ 0x75, 0x1f, 0x00, 0x75, 0x14, 0xff, 0x22, 0x79,
+ 0x06, 0xe5, 0x29, 0x60, 0x0b, 0xe3, 0x30, 0xe1,
+ 0xf8, 0xe5, 0x4f, 0x64, 0x80, 0x79, 0x07, 0xf3,
+ 0x22, 0x10, 0x4c, 0x01, 0x22, 0x30, 0x4b, 0x0a,
+ 0xc2, 0x4b, 0xe5, 0x4d, 0x64, 0x80, 0xf5, 0x4f,
+ 0x80, 0x1d, 0xe5, 0x15, 0xa2, 0xe0, 0x82, 0xe6,
+ 0x40, 0x02, 0x80, 0x35, 0x30, 0x4a, 0x04, 0xb1,
+ 0xe6, 0x80, 0x0c, 0x30, 0x49, 0x04, 0x51, 0x2b,
+ 0x80, 0x05, 0x30, 0x48, 0x24, 0x91, 0x7e, 0x79,
+ 0x06, 0xe3, 0x30, 0xe0, 0x1a, 0x79, 0x06, 0xf3,
+ 0xe5, 0x4e, 0x24, 0xff, 0x50, 0x04, 0xf5, 0x4e,
+ 0x80, 0x0d, 0x79, 0x0f, 0xf3, 0x20, 0x2a, 0x07,
+ 0x12, 0x2b, 0x32, 0x75, 0x29, 0x00, 0x22, 0x91,
+ 0x1b, 0x22, 0x79, 0x0f, 0xe3, 0xc0, 0xa8, 0x75,
+ 0xa8, 0x00, 0x30, 0x2b, 0x03, 0xd0, 0xa8, 0x22,
+ 0x79, 0x0e, 0xf3, 0xd0, 0xa8, 0x22, 0x8a, 0xf0,
+ 0xe5, 0x50, 0x10, 0xf3, 0x10, 0x23, 0x23, 0x23,
+ 0x25, 0xf0, 0x12, 0x2c, 0xb8, 0xa2, 0xe7, 0x92,
+ 0xe4, 0xc2, 0xe7, 0x80, 0x08, 0x23, 0x23, 0x23,
+ 0x25, 0xf0, 0x12, 0x2c, 0x19, 0x25, 0x4f, 0x20,
+ 0xd2, 0x04, 0xf5, 0x4f, 0x80, 0x0a, 0x40, 0x05,
+ 0x75, 0x4f, 0x7f, 0x80, 0x03, 0x75, 0x4f, 0xff,
+ 0xea, 0x12, 0x2c, 0x3c, 0x25, 0x50, 0x20, 0xe7,
+ 0x05, 0xb4, 0x03, 0x07, 0x80, 0x0c, 0x75, 0x50,
+ 0x00, 0x80, 0x09, 0x40, 0x05, 0x75, 0x50, 0x03,
+ 0x80, 0x02, 0xf5, 0x50, 0x22, 0xe5, 0x4d, 0xc4,
+ 0x54, 0x0c, 0x03, 0x03, 0xfa, 0x91, 0xa9, 0x71,
+ 0xb8, 0xe5, 0x4d, 0xc4, 0x54, 0x03, 0xfa, 0x91,
+ 0xa9, 0x71, 0xb8, 0xe5, 0x4d, 0x54, 0x0c, 0x03,
+ 0x03, 0xfa, 0x91, 0xa9, 0x71, 0xb8, 0xe5, 0x4d,
+ 0x54, 0x03, 0xfa, 0x91, 0xa9, 0x71, 0xb8, 0x22,
+ 0x8a, 0xf0, 0xe5, 0x50, 0x23, 0x23, 0x25, 0xf0,
+ 0x12, 0x2b, 0xf6, 0x25, 0x4f, 0x20, 0xd2, 0x04,
+ 0xf5, 0x4f, 0x80, 0x0a, 0x40, 0x05, 0x75, 0x4f,
+ 0x7f, 0x80, 0x03, 0x75, 0x4f, 0xff, 0xea, 0x12,
+ 0x2c, 0x40, 0x25, 0x50, 0x20, 0xe7, 0x05, 0xb4,
+ 0x05, 0x07, 0x80, 0x0c, 0x75, 0x50, 0x00, 0x80,
+ 0x09, 0x40, 0x05, 0x75, 0x50, 0x05, 0x80, 0x02,
+ 0xf5, 0x50, 0x22, 0x30, 0x26, 0x03, 0x12, 0x1e,
+ 0xf5, 0x30, 0x27, 0x03, 0x12, 0x1f, 0x37, 0x30,
+ 0x25, 0x09, 0x12, 0x1f, 0x4e, 0x30, 0x23, 0x03,
+ 0x12, 0x1f, 0x1e, 0x10, 0x22, 0x02, 0x80, 0x0a,
+ 0xe5, 0x3b, 0xb4, 0xff, 0x02, 0xc2, 0x20, 0x12,
+ 0x1e, 0x79, 0x22, 0x78, 0x11, 0xe2, 0x20, 0xe0,
+ 0x07, 0xc0, 0x01, 0x12, 0x28, 0xba, 0xd0, 0x01,
+ 0x78, 0x00, 0xf2, 0x61, 0x9b, 0x12, 0x2b, 0x32,
+ 0x12, 0x17, 0x7f, 0x78, 0x00, 0xf2, 0xaa, 0x35,
+ 0xab, 0x36, 0xea, 0x24, 0xff, 0xfa, 0xeb, 0x34,
+ 0xff, 0xfb, 0x50, 0x03, 0xd2, 0x10, 0x22, 0x75,
+ 0x37, 0x01, 0x75, 0x38, 0x00, 0x75, 0x39, 0x00,
+ 0x12, 0x04, 0x04, 0xd2, 0x8e, 0x22, 0xa8, 0x2b,
+ 0xb8, 0x00, 0x02, 0x80, 0x03, 0x02, 0x11, 0xbd,
+ 0xf5, 0x74, 0x78, 0x2a, 0x12, 0x11, 0xec, 0xe5,
+ 0x74, 0x78, 0x29, 0x12, 0x11, 0xec, 0x22, 0xfa,
+ 0xe5, 0x2b, 0x60, 0x01, 0x22, 0xea, 0x78, 0x2b,
+ 0xf5, 0x75, 0x12, 0x11, 0xec, 0x22, 0x74, 0x10,
+ 0x12, 0x2b, 0x9b, 0x74, 0x20, 0x78, 0x05, 0xf2,
+ 0x74, 0x09, 0x12, 0x17, 0x75, 0xe5, 0x15, 0x44,
+ 0x80, 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x12, 0x17,
+ 0x7f, 0x22, 0x12, 0x03, 0x84, 0x79, 0x0f, 0xe3,
+ 0x78, 0x00, 0xf2, 0x12, 0x2b, 0x28, 0xe5, 0x81,
+ 0x24, 0xfc, 0xf5, 0x81, 0x61, 0x93, 0xd2, 0x07,
+ 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x4c, 0xc2,
+ 0x0f, 0x12, 0x29, 0xa3, 0x61, 0x93, 0x02, 0x1b,
+ 0x77, 0x00, 0xe1, 0x81, 0xe1, 0x9a, 0xd2, 0x2c,
+ 0xa1, 0x0c, 0x20, 0x20, 0x02, 0xd2, 0x26, 0x02,
+ 0x1e, 0x35, 0x02, 0x1e, 0x61, 0x02, 0x1d, 0x8f,
+ 0xc2, 0x8e, 0x75, 0xa8, 0x9e, 0x22, 0x41, 0x49,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x02, 0x29, 0x91, 0x00, 0x00, 0x00, 0xa1, 0xbb,
+ 0xa1, 0xc3, 0x02, 0x1e, 0x6b, 0xe5, 0x4d, 0xc4,
+ 0x54, 0x0f, 0xfa, 0x91, 0x2f, 0x71, 0xb8, 0xe5,
+ 0x4d, 0x54, 0x0f, 0xfa, 0x91, 0x2f, 0x71, 0xb8,
+ 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa1, 0xc6,
+ 0x02, 0x1d, 0x8f, 0xc2, 0x8e, 0xd2, 0xab, 0xc2,
+ 0x10, 0x79, 0x0f, 0xf3, 0x22, 0x00, 0x02, 0x2a,
+ 0x84, 0x00, 0xe1, 0xbc, 0xe1, 0xc8, 0x02, 0x1e,
+ 0x27, 0x00, 0x78, 0x00, 0xf2, 0x78, 0x0b, 0xe2,
+ 0xf4, 0xf5, 0x4d, 0xd2, 0x4c, 0x61, 0x9b, 0x30,
+ 0xb5, 0x02, 0xc2, 0x11, 0x22, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x79, 0xbd, 0xf1, 0x3d, 0x83,
+ 0x22, 0xdd, 0xbd, 0xbd, 0xbd, 0x61, 0xbd, 0x8d,
+ 0x7a, 0xbd, 0xbd, 0xbd, 0xbd, 0x30, 0xbd, 0xbd,
+ 0xbd, 0x55, 0xbd, 0xbd, 0xbd, 0x52, 0xbd, 0xb6,
+ 0xb6, 0xbd, 0xbd, 0xbd, 0xbd, 0x00, 0xbd, 0xbd,
+ 0xbd, 0xe8, 0xda, 0xbd, 0xbd, 0xcf, 0xb9, 0xbd,
+ 0xc4, 0xf1, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0x7b, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0x70, 0x6a, 0x57, 0x47, 0x34, 0xbd, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x29, 0xbd,
+ 0xbd, 0xbd, 0xb6, 0xb6, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x2e, 0x25,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xfe, 0xf5,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x19, 0xbd,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x21, 0x8f,
+ 0x09, 0xbd, 0xf9, 0x86, 0xbd, 0xbd, 0xbd, 0xd7,
+ 0xbd, 0xa9, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x9b,
+ 0xd1, 0x9d, 0xbd, 0xae, 0xbd, 0xbd, 0xbd, 0xcb,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd,
+ 0xb6, 0xa5, 0xbd, 0xc5, 0xbd, 0xbd, 0xbd, 0xc3,
+ 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0x74, 0x10,
+ 0x12, 0x2b, 0x9b, 0xe4, 0x78, 0x05, 0xf2, 0x74,
+ 0x09, 0x12, 0x17, 0x75, 0xe5, 0x15, 0x54, 0x7f,
+ 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x12, 0x17, 0x7f,
+ 0x22, 0x30, 0x51, 0x01, 0x22, 0x53, 0xa8, 0xfb,
+ 0x12, 0x2d, 0xf0, 0x50, 0x22, 0x79, 0x03, 0xe3,
+ 0x20, 0xe4, 0x1c, 0xaa, 0x35, 0xab, 0x36, 0xea,
+ 0x24, 0xf0, 0xfa, 0xeb, 0x34, 0xff, 0xfb, 0x50,
+ 0x0e, 0x10, 0x1f, 0x02, 0x80, 0x09, 0x20, 0x2a,
+ 0x03, 0x12, 0x2b, 0x32, 0x12, 0x2d, 0xd6, 0x43,
+ 0xa8, 0x04, 0x22, 0xa2, 0x1c, 0x72, 0x1d, 0x40,
+ 0x07, 0x53, 0x08, 0xbf, 0x78, 0x00, 0xf2, 0x22,
+ 0xb1, 0x1e, 0x22, 0x00, 0x79, 0x02, 0x12, 0x27,
+ 0x3d, 0x02, 0x2d, 0x37, 0x14, 0x54, 0xf0, 0x60,
+ 0x21, 0xe5, 0xf0, 0x24, 0xb6, 0xe5, 0xf0, 0x50,
+ 0x16, 0x24, 0x8b, 0x50, 0x15, 0xe5, 0xf0, 0x24,
+ 0x56, 0xe5, 0xf0, 0x50, 0x08, 0x24, 0x2f, 0x50,
+ 0x09, 0xe5, 0xf0, 0x24, 0xd9, 0x24, 0xd5, 0x24,
+ 0xf0, 0x22, 0x15, 0x81, 0x15, 0x81, 0xe9, 0x22,
+ 0x78, 0x13, 0x74, 0x00, 0xf2, 0x75, 0x2e, 0x01,
+ 0xd2, 0x6a, 0xc2, 0x69, 0xc2, 0x68, 0xc2, 0x6c,
+ 0x90, 0x25, 0x9f, 0x75, 0xb8, 0x07, 0x41, 0xa4,
+ 0xc0, 0x01, 0xc0, 0xf0, 0xc0, 0xd0, 0xc0, 0x02,
+ 0xe5, 0x3d, 0x54, 0x7d, 0x03, 0x10, 0xe5, 0x05,
+ 0x90, 0x28, 0x4b, 0x80, 0x03, 0x90, 0x2b, 0x7c,
+ 0x73, 0xe5, 0x3d, 0x30, 0xe5, 0x07, 0x74, 0xfd,
+ 0x78, 0x00, 0xf2, 0x61, 0x9b, 0x90, 0x1a, 0x97,
+ 0x74, 0xb6, 0xc0, 0xe0, 0x74, 0x27, 0xc0, 0xe0,
+ 0xc0, 0xa8, 0x02, 0x1b, 0xab, 0x90, 0x25, 0x9f,
+ 0xd0, 0xa8, 0x22, 0x90, 0x27, 0xb6, 0xc0, 0x82,
+ 0xc0, 0x83, 0xc0, 0xa8, 0x02, 0x1d, 0xa6, 0x90,
+ 0x27, 0xb6, 0xc0, 0x82, 0xc0, 0x83, 0xc0, 0xa8,
+ 0x02, 0x1e, 0x0a, 0xea, 0x24, 0xf0, 0xfa, 0xeb,
+ 0x34, 0xff, 0xfb, 0x50, 0x2e, 0x20, 0x0b, 0x05,
+ 0x85, 0x44, 0xe0, 0x80, 0x03, 0x75, 0xe0, 0x00,
+ 0x30, 0xe1, 0x20, 0xe5, 0x35, 0x24, 0xff, 0xf5,
+ 0x35, 0xe5, 0x36, 0x34, 0xff, 0xf5, 0x36, 0xc3,
+ 0xe5, 0x36, 0x13, 0xf5, 0x36, 0xe5, 0x35, 0x13,
+ 0xf5, 0x35, 0x75, 0x3a, 0x10, 0x12, 0x1a, 0x77,
+ 0x02, 0x18, 0x77, 0x75, 0x3a, 0x00, 0x12, 0x1a,
+ 0x77, 0x02, 0x18, 0x1b, 0x20, 0x4b, 0x04, 0x75,
+ 0x4e, 0x03, 0x22, 0xe5, 0x35, 0x24, 0xff, 0xf5,
+ 0x35, 0xe5, 0x36, 0x34, 0xff, 0xf5, 0x36, 0x75,
+ 0x4e, 0x03, 0x22, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x22, 0x02, 0x2c,
+ 0x70, 0xd2, 0x00, 0x78, 0x11, 0xe2, 0x44, 0x11,
+ 0xf5, 0x3f, 0xc2, 0x08, 0x12, 0x29, 0xa3, 0x02,
+ 0x23, 0x93, 0x21, 0x62, 0x61, 0x40, 0x01, 0x3a,
+ 0x01, 0x73, 0x21, 0x76, 0x61, 0xa8, 0x21, 0x39,
+ 0x21, 0x4a, 0x02, 0x2a, 0x7b, 0x79, 0x06, 0xf3,
+ 0xc0, 0xd0, 0x12, 0x03, 0xd9, 0x78, 0x00, 0xf2,
+ 0xd0, 0xd0, 0x22, 0x00, 0x00, 0x00, 0x00, 0x02,
+ 0x2c, 0xb4, 0x78, 0x11, 0xe2, 0x44, 0x11, 0x54,
+ 0x0f, 0xf8, 0xc4, 0x48, 0xd2, 0x05, 0xf5, 0x48,
+ 0xc2, 0x0d, 0x31, 0xa3, 0x02, 0x23, 0x93, 0x20,
+ 0x4b, 0x04, 0x75, 0x4e, 0x01, 0x22, 0xe5, 0x35,
+ 0x24, 0xff, 0xf5, 0x35, 0xe5, 0x36, 0x34, 0xff,
+ 0xf5, 0x36, 0x75, 0x4e, 0x01, 0x22, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x79, 0xd0, 0x77, 0x1b, 0x79, 0xd1, 0x77, 0x18,
+ 0x79, 0xd2, 0x77, 0x77, 0x79, 0xd3, 0x77, 0x18,
+ 0x22, 0x75, 0x29, 0x00, 0x75, 0x25, 0x00, 0x75,
+ 0x34, 0x03, 0x75, 0x22, 0x00, 0x75, 0x23, 0x05,
+ 0x75, 0x4f, 0x00, 0x75, 0x50, 0x00, 0x75, 0x30,
+ 0x00, 0x79, 0xdc, 0x77, 0x03, 0xc2, 0x8e, 0x75,
+ 0x17, 0xa8, 0x75, 0x16, 0xa8, 0x74, 0xaa, 0x79,
+ 0x01, 0xf3, 0x79, 0xd7, 0x77, 0x74, 0x79, 0xd8,
+ 0x77, 0xff, 0x79, 0xd9, 0x77, 0x07, 0x79, 0xda,
+ 0x77, 0x00, 0x12, 0x25, 0x6f, 0x43, 0x08, 0x40,
+ 0x71, 0x32, 0x79, 0x0e, 0xe3, 0x10, 0x51, 0x1c,
+ 0x74, 0x06, 0x71, 0x9b, 0xe5, 0x11, 0x44, 0x80,
+ 0x79, 0x05, 0xf3, 0xf5, 0x11, 0x74, 0x07, 0x71,
+ 0x9b, 0xe5, 0x12, 0x44, 0x80, 0x79, 0x05, 0xf3,
+ 0xf5, 0x12, 0x80, 0x18, 0x53, 0x27, 0xa0, 0x53,
+ 0x28, 0x01, 0x75, 0x20, 0xf7, 0x12, 0x23, 0x4c,
+ 0x75, 0x11, 0x80, 0x75, 0x12, 0x80, 0x12, 0x1f,
+ 0xc0, 0x12, 0x21, 0xdc, 0x79, 0x06, 0xf3, 0x22,
+ 0xd2, 0x02, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5,
+ 0x43, 0xc2, 0x0a, 0x12, 0x29, 0xa3, 0x02, 0x23,
+ 0x93, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x44,
+ 0xc2, 0x0b, 0x12, 0x29, 0xa3, 0x02, 0x23, 0x93,
+ 0x78, 0x00, 0xe2, 0x90, 0x25, 0x9f, 0x02, 0x23,
+ 0x93, 0x78, 0x11, 0xe2, 0x75, 0x20, 0xf7, 0x75,
+ 0x21, 0x3f, 0x75, 0x49, 0x11, 0x75, 0x4c, 0x11,
+ 0x31, 0xa3, 0x02, 0x23, 0x93, 0x78, 0x11, 0xe2,
+ 0x44, 0x11, 0x54, 0x0f, 0xf8, 0xc4, 0x48, 0xf8,
+ 0xe5, 0x49, 0x45, 0x3f, 0x58, 0xf5, 0x49, 0xd2,
+ 0x06, 0xc2, 0x0e, 0x31, 0xa3, 0x02, 0x23, 0x93,
+ 0xc0, 0x01, 0x20, 0x2a, 0x04, 0x71, 0x32, 0xc2,
+ 0x11, 0x11, 0x5e, 0xc2, 0x1f, 0xd0, 0x01, 0x02,
+ 0x23, 0x9b, 0x12, 0x21, 0xdc, 0x78, 0x00, 0xf2,
+ 0x22, 0x00, 0x00, 0x00, 0x00, 0x00, 0x79, 0xda,
+ 0xe7, 0x70, 0x2b, 0x20, 0x0a, 0x05, 0x85, 0x43,
+ 0xe0, 0x80, 0x03, 0x75, 0xe0, 0x00, 0x30, 0xe1,
+ 0x1d, 0x20, 0xe2, 0x1f, 0x74, 0xe0, 0xca, 0x74,
+ 0x00, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3, 0xf5,
+ 0x09, 0xca, 0x74, 0x01, 0x71, 0x9b, 0xca, 0x79,
+ 0x05, 0xf3, 0xf5, 0x0a, 0x80, 0x43, 0x12, 0x15,
+ 0x3e, 0x80, 0x3e, 0xe5, 0x0b, 0xb4, 0x17, 0x02,
+ 0x80, 0x0b, 0x50, 0x09, 0x74, 0x17, 0xc3, 0x95,
+ 0x0b, 0x44, 0x60, 0x80, 0x02, 0x74, 0x60, 0xca,
+ 0x74, 0x00, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3,
+ 0xf5, 0x09, 0xe5, 0x0c, 0xb4, 0x17, 0x02, 0x80,
+ 0x0b, 0x50, 0x09, 0x74, 0x17, 0xc3, 0x95, 0x0c,
+ 0x44, 0x60, 0x80, 0x02, 0x74, 0x60, 0xca, 0x74,
+ 0x01, 0x71, 0x9b, 0xca, 0x79, 0x05, 0xf3, 0xf5,
+ 0x0a, 0x22, 0xd2, 0x04, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x46, 0xc2, 0x0c, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0xd2, 0x05, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x48, 0xc2, 0x0d, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0xd2, 0x06, 0x78, 0x11, 0xe2, 0x44,
+ 0x11, 0xf5, 0x49, 0xc2, 0x0e, 0x31, 0xa3, 0x02,
+ 0x23, 0x93, 0x30, 0x1c, 0x21, 0x20, 0x4d, 0x1e,
+ 0xe5, 0x29, 0x60, 0x1a, 0xc2, 0x1c, 0x12, 0x19,
+ 0xec, 0x12, 0x13, 0xcf, 0xd2, 0x4d, 0x12, 0x17,
+ 0x7f, 0x78, 0x00, 0xf2, 0x79, 0x06, 0xf3, 0x43,
+ 0xa8, 0x04, 0x12, 0x24, 0x1b, 0x22, 0x12, 0x27,
+ 0x24, 0x22, 0x78, 0x00, 0xe2, 0x90, 0x25, 0x9f,
+ 0x02, 0x23, 0x93, 0x78, 0x00, 0xe2, 0xa2, 0xe7,
+ 0x72, 0xe3, 0x92, 0xe7, 0x02, 0x1d, 0x85, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x79, 0x04, 0xe3, 0x54, 0x80, 0x70, 0xf9, 0x22,
+ 0xe5, 0x29, 0x79, 0xde, 0xf7, 0x75, 0x29, 0x00,
+ 0x70, 0x12, 0xe5, 0x15, 0x79, 0xdd, 0xf7, 0x12,
+ 0x2d, 0xf0, 0x40, 0x08, 0x20, 0x1c, 0x07, 0x20,
+ 0x1d, 0x04, 0x80, 0x02, 0x71, 0x32, 0x30, 0xb5,
+ 0x0c, 0x79, 0x06, 0xf3, 0x20, 0x2a, 0x06, 0x79,
+ 0xdd, 0xe7, 0x54, 0xfc, 0xf7, 0xd2, 0x2b, 0x12,
+ 0x25, 0x6f, 0x22, 0x00, 0x00, 0x00, 0x00, 0xe5,
+ 0x15, 0xa2, 0xe0, 0xb0, 0xe6, 0x40, 0x31, 0xa2,
+ 0xe1, 0xb0, 0xe7, 0x40, 0x38, 0x10, 0x2b, 0x02,
+ 0x80, 0x26, 0x79, 0xde, 0xe7, 0x70, 0x0b, 0x79,
+ 0xdd, 0xe7, 0x20, 0xe0, 0x12, 0x20, 0xe1, 0x28,
+ 0x80, 0x16, 0xf5, 0x29, 0x30, 0x4d, 0x11, 0x20,
+ 0x4c, 0x0e, 0x12, 0x24, 0x1b, 0x80, 0x09, 0x43,
+ 0x08, 0x40, 0x12, 0x13, 0xcf, 0x12, 0x17, 0x7f,
+ 0xe5, 0x13, 0x20, 0xe4, 0x05, 0x12, 0x18, 0x1b,
+ 0x80, 0x03, 0x12, 0x18, 0x77, 0xc2, 0x2b, 0x22,
+ 0x12, 0x26, 0xd7, 0x12, 0x13, 0xb7, 0x22, 0x78,
+ 0x04, 0x79, 0x00, 0xd9, 0xfe, 0xd8, 0xfa, 0x22,
+ 0x00, 0x74, 0x09, 0x71, 0x9b, 0xe5, 0x15, 0x54,
+ 0xfc, 0x79, 0x05, 0xf3, 0xf5, 0x15, 0x22, 0x78,
+ 0x11, 0xe2, 0x44, 0x11, 0x54, 0x0f, 0xf8, 0xc4,
+ 0x48, 0xf5, 0x46, 0xc2, 0x0c, 0xd2, 0x04, 0x31,
+ 0xa3, 0x02, 0x23, 0x93, 0x12, 0x26, 0xd7, 0x12,
+ 0x00, 0xb7, 0x22, 0x00, 0x79, 0x06, 0xf3, 0x74,
+ 0x0a, 0x71, 0x9b, 0x79, 0xe0, 0xe7, 0x44, 0x02,
+ 0xf7, 0x79, 0x05, 0xf3, 0x22, 0x74, 0x0a, 0x71,
+ 0x9b, 0x79, 0xe0, 0xe7, 0x54, 0xfd, 0xf7, 0x79,
+ 0x05, 0xf3, 0x22, 0x21, 0x59, 0x41, 0x23, 0x21,
+ 0x59, 0x41, 0x33, 0x41, 0x43, 0x21, 0x59, 0x21,
+ 0x59, 0x02, 0x25, 0x9f, 0x00, 0x74, 0x0d, 0x71,
+ 0x9b, 0x74, 0x4d, 0x79, 0x05, 0xf3, 0xd2, 0x52,
+ 0x22, 0x00, 0x53, 0x08, 0x40, 0x45, 0x08, 0x45,
+ 0x1e, 0x79, 0x04, 0xf3, 0xf5, 0x08, 0x22, 0xd2,
+ 0x01, 0x78, 0x11, 0xe2, 0x44, 0x11, 0xf5, 0x42,
+ 0xc2, 0x09, 0x31, 0xa3, 0x02, 0x23, 0x93, 0x00,
+ 0x00, 0x00, 0x00, 0x71, 0x6e, 0x74, 0x09, 0x12,
+ 0x17, 0x75, 0xe5, 0x15, 0x44, 0x40, 0x79, 0x05,
+ 0xf3, 0xf5, 0x15, 0x75, 0x3a, 0x00, 0x12, 0x1a,
+ 0x77, 0x02, 0x18, 0x1b, 0xf5, 0x38, 0xe5, 0x37,
+ 0x24, 0x01, 0xf5, 0x37, 0xe5, 0x38, 0x34, 0x00,
+ 0xf5, 0x38, 0x40, 0x05, 0x75, 0x39, 0x00, 0x80,
+ 0x03, 0x75, 0x39, 0x01, 0x12, 0x04, 0x04, 0xd2,
+ 0x8e, 0x02, 0x03, 0x8d, 0x00, 0xb4, 0x0d, 0x03,
+ 0x74, 0x14, 0x22, 0x04, 0x83, 0x22, 0x00, 0x02,
+ 0xff, 0x01, 0x00, 0x05, 0xfe, 0xff, 0x00, 0x0a,
+ 0xfc, 0xfe, 0x00, 0xc0, 0xf8, 0xfc, 0x00, 0x28,
+ 0xf0, 0xf8, 0x00, 0x30, 0xe0, 0xd0, 0x01, 0x88,
+ 0x04, 0x83, 0x22, 0x00, 0xff, 0xfe, 0xfd, 0xfc,
+ 0xfc, 0xfb, 0xfa, 0xfe, 0xfd, 0xfb, 0xf9, 0xf7,
+ 0xf7, 0xf5, 0xf3, 0xfc, 0xfa, 0xf6, 0xf2, 0xee,
+ 0xee, 0xea, 0xe6, 0xf8, 0xf4, 0xec, 0xe4, 0xdc,
+ 0xd4, 0xcc, 0xc4, 0x24, 0x21, 0x83, 0x22, 0x04,
+ 0x83, 0x22, 0xff, 0x01, 0xff, 0x01, 0x00, 0x00,
+ 0x00, 0x02, 0x22, 0x32, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0xff,
+ 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x83,
+ 0x22, 0x8a, 0x01, 0x20, 0x01, 0x0b, 0xea, 0xf3,
+ 0xf9, 0x8b, 0x7e, 0x6b, 0xd5, 0x01, 0x00, 0x01,
+ 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x01, 0x3a, 0x01, 0x38, 0x01, 0x4b, 0x01,
+ 0x49, 0x01, 0x5c, 0x01, 0x5a, 0x01, 0x08, 0x08,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x01, 0x15, 0x24, 0x48, 0x83, 0x22, 0x04,
+ 0x83, 0x22, 0x00, 0x01, 0x02, 0x03, 0x04, 0x06,
+ 0x07, 0x08, 0x00, 0x03, 0x05, 0x07, 0x09, 0x0d,
+ 0x0f, 0x81, 0x00, 0x06, 0x0a, 0x0e, 0x82, 0x8a,
+ 0x8e, 0x22, 0x00, 0x0c, 0x84, 0x8c, 0x24, 0x2c,
+ 0xa4, 0xac, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0xaa, 0x35, 0xab, 0x36,
+ 0x02, 0x27, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x25,
+ 0x03, 0x03, 0x2b, 0x03, 0x00, 0x03, 0x00, 0x03,
+ 0x00, 0x03, 0x00, 0x03, 0x00, 0x03, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x83, 0x22,
+ 0x00, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x2b, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02,
+ 0x01, 0x01, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02,
+ 0x02, 0x01, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x21, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x00,
+ 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x21,
+ 0x01, 0x02, 0x21, 0x02, 0x02, 0x02, 0x00, 0x02,
+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x20, 0xb5, 0x05,
+ 0x79, 0x0f, 0xf3, 0xc2, 0x11, 0x22, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe5,
+ 0x15, 0xa2, 0xe0, 0xb0, 0xe6, 0x50, 0x01, 0x22,
+ 0xa2, 0xe1, 0xb0, 0xe7, 0x22, 0x02, 0x00};
+ static unsigned char Data0485_0C[] = {
+ 0x02, 0x27, 0x69};
+ static unsigned char Data0485_66[] = {
+ 0x02, 0x25, 0x47, 0x02, 0x25, 0x60};
+ static unsigned char Data0485_60[] = {
+ 0x02, 0x22, 0x7e};
+ static unsigned char Data0485_99[] = {
+ 0xc2, 0x53, 0x02, 0x12, 0x86};
+ static unsigned char Data0485_9E[] = {
+ 0x70, 0xf9, 0x22};
+#ifdef OOKUBO_ORIGINAL
+ static unsigned char Data0485_36[] = {
+ 0x78, 0x00, 0xf2, 0xc2, 0x53, 0x74, 0x86, 0xc0,
+ 0xe0, 0x74, 0x12, 0xc0, 0xe0, 0x32};
+#endif /* OOKUBO_ORIGINAL */
--- /dev/null 2002-09-08 06:22:10.000000000 +0200
+++ linux/sound/isa/cs423x/sound_pc9800.h 2002-10-28
15:45:00.000000000 +0100
@@ -0,0 +1,23 @@
+#ifndef _SOUND_PC9800_H_
+#define _SOUND_PC9800_H_
+
+#include <asm/io.h>
+
+#define PC9800_SOUND_IO_ID 0xa460
+
+/* Sound Functions ID. */
+#define PC9800_SOUND_ID() ((inb(PC9800_SOUND_IO_ID) >> 4) & 0x0f)
+
+#define PC9800_SOUND_ID_DO 0x0 /* PC-98DO+ Internal */
+#define PC9800_SOUND_ID_GS 0x1 /* PC-98GS Internal */
+#define PC9800_SOUND_ID_73 0x2 /* PC-9801-73 (base 0x18x) */
+#define PC9800_SOUND_ID_73A 0x3 /* PC-9801-73/76 (base 0x28x) */
+#define PC9800_SOUND_ID_86 0x4 /* PC-9801-86 and compatible
(base 0x18x) */
+#define PC9800_SOUND_ID_86A 0x5 /* PC-9801-86 (base 0x28x) */
+#define PC9800_SOUND_ID_NF 0x6 /* PC-9821Nf/Np Internal */
+#define PC9800_SOUND_ID_XMATE 0x7 /* X-Mate Internal and
compatible */
+#define PC9800_SOUND_ID_118 0x8 /* PC-9801-118 and
compatible(CanBe Internal, etc.) */
+
+#define PC9800_SOUND_ID_UNKNOWN 0xf /* Unknown (No Sound
System or PC-9801-26) */
+
+#endif
--- linux/sound/core/Makefile Sat Oct 19 13:01:14 2002
+++ linux/sound/core/Makefile Wed Oct 30 13:52:52 2002
@@ -96,6 +96,7 @@
obj-$(CONFIG_SND_YMFPCI) += snd-pcm.o snd-timer.o snd.o snd-rawmidi.o
snd-hwdep.o
obj-$(CONFIG_SND_POWERMAC) += snd-pcm.o snd-timer.o snd.o
obj-$(CONFIG_SND_SA11XX_UDA1341) += snd-pcm.o snd-timer.o snd.o
+obj-$(CONFIG_SND_PC98_CS4232) += snd-pcm.o snd-timer.o snd.o
snd-rawmidi.o snd-hwdep.o
ifeq ($(CONFIG_SND_SB16_CSP),y)
obj-$(CONFIG_SND_SB16) += snd-hwdep.o
obj-$(CONFIG_SND_SBAWE) += snd-hwdep.o
--- linux/sound/core/seq/Makefile Sat Oct 19 13:02:30 2002
+++ linux/sound/core/seq/Makefile Wed Oct 30 13:50:47 2002
@@ -74,6 +74,7 @@
obj-$(CONFIG_SND_TRIDENT) += snd-seq-midi.o snd-seq.o
snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o
snd-seq-instr.o
obj-$(CONFIG_SND_YMFPCI) += snd-seq-midi.o snd-seq.o snd-seq-device.o
snd-seq-midi-event.o snd-seq-midi-emul.o snd-seq-instr.o
obj-$(CONFIG_SND_USB_AUDIO) += snd-seq.o snd-seq-device.o
snd-seq-midi-event.o snd-seq-virmidi.o
+obj-$(CONFIG_SND_PC98_CS4232) += snd-seq-midi.o snd-seq.o
snd-seq-device.o snd-seq-midi-event.o snd-seq-midi-emul.o
snd-seq-instr.o
obj-m := $(sort $(obj-m))
--- linux/sound/core/seq/instr/Makefile Sat Oct 19 13:01:19 2002
+++ linux/sound/core/seq/instr/Makefile Wed Oct 30 13:35:51 2002
@@ -40,6 +40,7 @@
obj-$(CONFIG_SND_SONICVIBES) += snd-ainstr-fm.o
obj-$(CONFIG_SND_TRIDENT) += snd-ainstr-simple.o
obj-$(CONFIG_SND_YMFPCI) += snd-ainstr-fm.o
+obj-$(CONFIG_SND_PC98_CS4232) += snd-ainstr-fm.o
obj-m := $(sort $(obj-m))
--- linux/sound/drivers/mpu401/Makefile Sat Oct 19 13:02:35 2002
+++ linux/sound/drivers/mpu401/Makefile Wed Oct 30 13:58:29 2002
@@ -39,6 +39,7 @@
obj-$(CONFIG_SND_ALI5451) += snd-mpu401-uart.o
obj-$(CONFIG_SND_TRIDENT) += snd-mpu401-uart.o
obj-$(CONFIG_SND_YMFPCI) += snd-mpu401-uart.o
+obj-$(CONFIG_SND_PC98_CS4232) += snd-mpu401-uart.o
obj-m := $(sort $(obj-m))
--- linux/sound/drivers/opl3/Makefile Sat Oct 19 13:01:08 2002
+++ linux/sound/drivers/opl3/Makefile Wed Oct 30 13:56:37 2002
@@ -38,6 +38,7 @@
obj-$(CONFIG_SND_FM801) += snd-opl3-lib.o
obj-$(CONFIG_SND_SONICVIBES) += snd-opl3-lib.o
obj-$(CONFIG_SND_YMFPCI) += snd-opl3-lib.o
+obj-$(CONFIG_SND_PC98_CS4232) += snd-opl3-lib.o
ifeq ($(subst m,y,$(CONFIG_SND_SEQUENCER)),y)
obj-$(CONFIG_SND_ALS100) += snd-opl3-synth.o
obj-$(CONFIG_SND_AZT2320) += snd-opl3-synth.o
@@ -63,6 +64,7 @@
obj-$(CONFIG_SND_FM801) += snd-opl3-synth.o
obj-$(CONFIG_SND_SONICVIBES) += snd-opl3-synth.o
obj-$(CONFIG_SND_YMFPCI) += snd-opl3-synth.o
+ obj-$(CONFIG_SND_PC98_CS4232) += snd-opl3-synth.o
endif
obj-m := $(sort $(obj-m))
--- linux/sound/drivers/mpu401/mpu401.c Sat Oct 19 13:02:26 2002
+++ linux/sound/drivers/mpu401/mpu401.c Fri Nov 1 21:16:31 2002
@@ -40,6 +40,7 @@
static int snd_enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /*
Enable this card */
static long snd_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /*
MPU-401 port number */
static int snd_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* MPU-401 IRQ
*/
+static int pc98ii[SNDRV_CARDS]; /*
PC98II */
MODULE_PARM(snd_index, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
MODULE_PARM_DESC(snd_index, "Index value for MPU-401 device.");
@@ -56,6 +57,9 @@
MODULE_PARM(snd_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
MODULE_PARM_DESC(snd_irq, "IRQ # for MPU-401 device.");
MODULE_PARM_SYNTAX(snd_irq, SNDRV_IRQ_DESC);
+MODULE_PARM(pc98ii, "1-" __MODULE_STRING(SNDRV_CARDS) "i");
+MODULE_PARM_DESC(pc98ii, "Roland MPU-PC98II support.");
+MODULE_PARM_SYNTAX(pc98ii, SNDRV_BOOLEAN_FALSE_DESC);
static snd_card_t *snd_mpu401_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
@@ -76,7 +80,8 @@
card = snd_card_new(snd_index[dev], snd_id[dev], THIS_MODULE,
0);
if (card == NULL)
return -ENOMEM;
- if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
+ if (snd_mpu401_uart_new(card, 0,
+ pc98ii[dev] ? MPU401_HW_PC98II :
MPU401_HW_MPU401,
snd_port[dev], 0,
snd_irq[dev], snd_irq[dev] >= 0 ?
SA_INTERRUPT : 0, NULL) < 0) {
printk(KERN_ERR "MPU401 not detected at 0x%lx\n",
snd_port[dev]);
@@ -143,7 +148,8 @@
get_option(&str,&snd_index[nr_dev]) == 2 &&
get_id(&str,&snd_id[nr_dev]) == 2 &&
get_option(&str,(int *)&snd_port[nr_dev]) == 2 &&
- get_option(&str,&snd_irq[nr_dev]) == 2);
+ get_option(&str,&snd_irq[nr_dev]) == 2 &&
+ get_option(&str,&pc98ii[nr_dev]) == 2);
nr_dev++;
return 1;
}

2002-11-01 13:39:01

by Takashi Iwai

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

At Fri, 1 Nov 2002 22:02:18 +0900,
Osamu Tomita wrote:
>
> 2002.10.31 02:52, Takashi Iwai wrote:
> > At Wed, 30 Oct 2002 02:43:22 +0900,
> (snip)
> > do you mean that the interrupts are generated too slowly?
> > you can measure how many UART interrupts are generated per second by
> > checking /proc/interrupts.
> > if it's too little, the problem is likely in the hardware
> > initialization part, which i simply copied from your patch.
> > but it could be a wrong copy & paste.
> > please check pc98_mpu401_init() in pc98.c.
> >
> > btw, which MPU mode are you using, PC98II or normal MPU401?
> Thanks! Problem solved. MPU401 works fine by trivial fix as follows.
>
> #--- linux/sound/isa/cs423x/pc98.c.old Wed Oct 30 00:20:35 2002
> #+++ linux/sound/isa/cs423x/pc98.c Fri Nov 1 20:45:31 2002
> #@@ -379,7 +379,7 @@
> # err = pc98_mpu401_init(mpu_irq[dev]);
> # if (! err) {
> # err = snd_mpu401_uart_new(card, 0,
> #- pc98ii ?
> MPU401_HW_PC98II : MPU401_HW_MPU401,
> #+ pc98ii[dev] ?
> MPU401_HW_PC98II : MPU401_HW_MPU401,
> # mpu_port[dev], 0,
> # mpu_irq[dev],
> SA_INTERRUPT, NULL);
> # if (err < 0)

d'oh. thanks.

>
> Now, PCM OPL3 and MPU401 all works fine.
> Would you please add option "pc98ii" into snd-mpu401?
> This is for Box that has MPU-PC98II only, with no other sound card.

well, then i misunderstood the hardware configuration on PC98.

doesn't MPU-PC98II need any specific hardware init code like in
pc98_mpu401_init()?

if yes, then we should create another module for PC98II rather than
including a magical init code into a generic mpu401 module.


ciao,

Takashi

2002-11-02 02:38:22

by Osamu Tomita

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

Takashi Iwai wrote:
>
> At Fri, 1 Nov 2002 22:02:18 +0900,
> Osamu Tomita wrote:
> > Now, PCM OPL3 and MPU401 all works fine.
> > Would you please add option "pc98ii" into snd-mpu401?
> > This is for Box that has MPU-PC98II only, with no other sound card.
>
> well, then i misunderstood the hardware configuration on PC98.
>
> doesn't MPU-PC98II need any specific hardware init code like in
> pc98_mpu401_init()?
MPU-PC98II doesn't need those init codes. Apologize for not enough
explanations.
On-board sound and sound cards made by NEC need those init codes.
Perhaps, for backward compatibility, PC-9800's BIOS masks newer
features like WSS PCM, OPL3 FM synth and MPU-401 compatible IF.
After cold booting, they works as oldest sound card of NEC (PC-
9801-26). So I added some init codes to enable those features.
Most sound cards made by third parties (MPU-98, Sound blaster16
for PC9800...etc) don't need these init codes.

>
> if yes, then we should create another module for PC98II rather than
> including a magical init code into a generic mpu401 module.
Init code for MPU-401 detects wheter NEC or not. If MPU-401 is
not NEC's, skip magical initialization. So I think it's beter,
your patch and adding option to mpu401.c

Thanks,
Osamu

2002-11-04 10:11:00

by Takashi Iwai

Subject: Re: [PATCHSET 22/25] add support for PC-9800 architecture (sound alsa)

At Sat, 02 Nov 2002 11:44:08 +0900,
Osamu Tomita wrote:
>
> Takashi Iwai wrote:
> >
> > At Fri, 1 Nov 2002 22:02:18 +0900,
> > Osamu Tomita wrote:
> > > Now, PCM OPL3 and MPU401 all works fine.
> > > Would you please add option "pc98ii" into snd-mpu401?
> > > This is for Box that has MPU-PC98II only, with no other sound card.
> >
> > well, then i misunderstood the hardware configuration on PC98.
> >
> > doesn't MPU-PC98II need any specific hardware init code like in
> > pc98_mpu401_init()?
> MPU-PC98II doesn't need those init codes. Apologize for not enough
> explanations.
> On-board sound and sound cards made by NEC need those init codes.
> Perhaps, for backward compatibility, PC-9800's BIOS masks newer
> features like WSS PCM, OPL3 FM synth and MPU-401 compatible IF.
> After cold booting, they works as oldest sound card of NEC (PC-
> 9801-26). So I added some init codes to enable those features.
> Most sound cards made by third parties (MPU-98, Sound blaster16
> for PC9800...etc) don't need these init codes.

OK. thanks for clarification.

> > if yes, then we should create another module for PC98II rather than
> > including a magical init code into a generic mpu401 module.
> Init code for MPU-401 detects wheter NEC or not. If MPU-401 is
> not NEC's, skip magical initialization. So I think it's beter,
> your patch and adding option to mpu401.c

Agreed.

Now i put the patch into ALSA cvs tree.
I hope Jaroslav will submit the patchset soon.

--
Takashi Iwai <[email protected]> SuSE Linux AG - http://www.suse.de
ALSA Developer ALSA Project - http://www.alsa-project.org