Trident 4DWAVE-DX/NX, SiS 7018, ALi M5451 Sound Driver; from SOMEYA Yoshihiko and KUROSAWA Takahiro; tested by Matt Behrens <matt@zigg.com>

7 files changed, 1911 insertions, 6 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 0bab1cc6316..01baec4c460 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.281 2001/10/24 13:57:46 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.282 2001/11/26 16:38:37 mickey Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	GENERIC -- everything that's currently supported
@@ -378,10 +378,11 @@ sv*	at pci? dev ? function ?		# S3 SonicVibes (S3 617)
 neo*	at pci? dev ? function ?		# NeoMagic 256AV/ZX
 cmpci*	at pci? dev ? function ?		# C-Media CMI8338/8738
 auich*	at pci? dev ? function ?		# i82801 ICH AC'97 audio
+autri*	at pci? dev ? function ?		# Trident 4D WAVE
+auvia*	at pci? dev ? function ?		# VIA VT82C686A
 clcs*	at pci? dev ? function ?		# CS4280 CrystalClear audio
 clct*	at pci? dev ? function ?		# CS4281 CrystalClear audio
 fms*	at pci? dev ? function ?		# Forte Media FM801
-auvia*	at pci? dev ? function ?		# VIA VT82C686A
 maestro* at pci? dev ? function ?		# ESS Maestro PCI
 yds*	at pci? dev ? function ?		# Yamaha YMF Audio
 emu*	at pci? dev ? function ?		# SB Live!
@@ -409,6 +410,7 @@ midi*	at sb?			# SB MPU401 port
 midi*	at opl?			# OPL FM synth
 midi*	at ym?
 midi*	at mpu?
+midi*	at autri?
 
 # The spkr driver provides a simple tone interface to the built in speaker.
 #spkr0	at pcppi?		# PC speaker
@@ -429,8 +431,9 @@ audio*	at cmpci?
 audio*	at clcs?
 audio*	at clct?
 audio*	at auich?
-audio*	at fms?
+audio*	at autri?
 audio*	at auvia?
+audio*	at fms?
 audio*	at uaudio?
 audio*	at maestro?
 audio*	at yds?
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
new file mode 100644
index 00000000000..ff9fae0461d
--- /dev/null
+++ b/sys/dev/pci/autri.c
@@ -0,0 +1,1620 @@
+/*	$OpenBSD: autri.c,v 1.1 2001/11/26 16:38:38 mickey Exp $	*/
+
+/*
+ * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Trident 4DWAVE-DX/NX, SiS 7018, ALi M5451 Sound Driver
+ *
+ * The register information is taken from the ALSA driver.
+ *
+ * Documentation links:
+ * - ftp://ftp.alsa-project.org/pub/manuals/trident/
+ */
+
+#include "midi.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/fcntl.h>
+#include <sys/malloc.h>
+#include <sys/device.h>
+#include <sys/proc.h>
+
+#include <dev/pci/pcidevs.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
+#include <sys/audioio.h>
+#include <dev/audio_if.h>
+#include <dev/midi_if.h>
+#include <dev/mulaw.h>
+#include <dev/auconv.h>
+#include <dev/ic/ac97.h>
+#include <dev/ic/mpuvar.h>
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <dev/pci/autrireg.h>
+#include <dev/pci/autrivar.h>
+
+#ifdef AUDIO_DEBUG
+# define DPRINTF(x)	if (autridebug) printf x
+# define DPRINTFN(n,x)	if (autridebug > (n)) printf x
+int autridebug = 0;
+#else
+# define DPRINTF(x)
+# define DPRINTFN(n,x)
+#endif
+
+int	autri_match __P((struct device *, void *, void *));
+void	autri_attach __P((struct device *, struct device *, void *));
+int	autri_intr __P((void *));
+
+#define DMAADDR(p) ((p)->map->dm_segs[0].ds_addr)
+#define KERNADDR(p) ((void *)((p)->addr))
+
+int autri_allocmem
+    __P((struct autri_softc *, size_t, size_t, struct autri_dma *));
+int autri_freemem __P((struct autri_softc *, struct autri_dma *));
+
+#define TWRITE1(sc, r, x) bus_space_write_1((sc)->memt, (sc)->memh, (r), (x))
+#define TWRITE2(sc, r, x) bus_space_write_2((sc)->memt, (sc)->memh, (r), (x))
+#define TWRITE4(sc, r, x) bus_space_write_4((sc)->memt, (sc)->memh, (r), (x))
+#define TREAD1(sc, r) bus_space_read_1((sc)->memt, (sc)->memh, (r))
+#define TREAD2(sc, r) bus_space_read_2((sc)->memt, (sc)->memh, (r))
+#define TREAD4(sc, r) bus_space_read_4((sc)->memt, (sc)->memh, (r))
+
+static __inline void autri_reg_set_1 __P((struct autri_softc *, int, uint8_t));
+static __inline void autri_reg_clear_1
+    __P((struct autri_softc *, int, uint8_t));
+static __inline void autri_reg_set_4
+    __P((struct autri_softc *, int, uint32_t));
+static __inline void autri_reg_clear_4
+    __P((struct autri_softc *, int, uint32_t));
+
+int	autri_attach_codec __P((void *sc, struct ac97_codec_if *));
+int	autri_read_codec __P((void *sc, u_int8_t a, u_int16_t *d));
+int	autri_write_codec __P((void *sc, u_int8_t a, u_int16_t d));
+void	autri_reset_codec __P((void *sc));
+
+static void autri_powerhook(int why,void *addr);
+static int  autri_init __P((void *sc));
+static struct autri_dma *autri_find_dma __P((struct autri_softc *, void *));
+static void autri_setup_channel __P((struct autri_softc *sc,int mode,
+				    struct audio_params *param));
+static void autri_enable_interrupt __P((struct autri_softc *sc, int ch));
+static void autri_disable_interrupt __P((struct autri_softc *sc, int ch));
+static void autri_startch __P((struct autri_softc *sc, int ch, int ch_intr));
+static void autri_stopch __P((struct autri_softc *sc, int ch, int ch_intr));
+static void autri_enable_loop_interrupt __P((void *sc));
+#if 0
+static void autri_disable_loop_interrupt __P((void *sc));
+#endif
+
+struct cfdriver autri_cd = {
+	NULL, "autri", DV_DULL
+};
+
+struct cfattach autri_ca = {
+	sizeof(struct autri_softc), autri_match, autri_attach
+};
+
+int	autri_open __P((void *, int));
+void	autri_close __P((void *));
+int	autri_query_encoding __P((void *, struct audio_encoding *));
+int	autri_set_params
+    __P((void *, int, int, struct audio_params *, struct audio_params *));
+int	autri_round_blocksize __P((void *, int));
+int	autri_trigger_output
+    __P((void *, void *, void *, int, void (*)(void *), void *,
+    struct audio_params *));
+int	autri_trigger_input
+    __P((void *, void *, void *, int, void (*)(void *), void *,
+    struct audio_params *));
+int	autri_halt_output __P((void *));
+int	autri_halt_input __P((void *));
+int	autri_getdev __P((void *, struct audio_device *));
+int	autri_mixer_set_port __P((void *, mixer_ctrl_t *));
+int	autri_mixer_get_port __P((void *, mixer_ctrl_t *));
+void*	autri_malloc __P((void *, int, size_t, int, int));
+void	autri_free __P((void *, void *, int));
+size_t	autri_round_buffersize __P((void *, int, size_t));
+paddr_t	autri_mappage __P((void *, void *, off_t, int));
+int	autri_get_props __P((void *));
+int	autri_query_devinfo __P((void *addr, mixer_devinfo_t *dip));
+
+int	autri_get_portnum_by_name
+    __P((struct autri_softc *, char *, char *, char *));
+
+static struct audio_hw_if autri_hw_if = {
+	autri_open,
+	autri_close,
+	NULL,			/* drain */
+	autri_query_encoding,
+	autri_set_params,
+	autri_round_blocksize,
+	NULL,			/* commit_settings */
+	NULL,			/* init_output */
+	NULL,			/* init_input */
+	NULL,			/* start_output */
+	NULL,			/* start_input */
+	autri_halt_output,
+	autri_halt_input,
+	NULL,			/* speaker_ctl */
+	autri_getdev,
+	NULL,			/* setfd */
+	autri_mixer_set_port,
+	autri_mixer_get_port,
+	autri_query_devinfo,
+	NULL,
+	autri_free,
+	NULL,
+	autri_mappage,
+	autri_get_props,
+	autri_trigger_output,
+	autri_trigger_input,
+	autri_malloc,
+	autri_round_buffersize,
+};
+
+#if NMIDI > 0
+void	autri_midi_close(void *);
+void	autri_midi_getinfo(void *, struct midi_info *);
+int	autri_midi_open(void *, int, void (*)(void *, int),
+			   void (*)(void *), void *);
+int	autri_midi_output(void *, int);
+
+struct midi_hw_if autri_midi_hw_if = {
+	autri_midi_open,
+	autri_midi_close,
+	autri_midi_output,
+	autri_midi_getinfo,
+	NULL,			/* ioctl */
+};
+#endif
+
+/*
+ * register set/clear bit
+ */
+static __inline void
+autri_reg_set_1(sc, no, mask)
+	struct autri_softc *sc;
+	int no;
+	uint8_t mask;
+{
+	bus_space_write_1(sc->memt, sc->memh, no,
+	    (bus_space_read_1(sc->memt, sc->memh, no) | mask));
+}
+
+static __inline void
+autri_reg_clear_1(sc, no, mask)
+	struct autri_softc *sc;
+	int no;
+	uint8_t mask;
+{
+	bus_space_write_1(sc->memt, sc->memh, no,
+	    (bus_space_read_1(sc->memt, sc->memh, no) & ~mask));
+}
+
+static __inline void
+autri_reg_set_4(sc, no, mask)
+	struct autri_softc *sc;
+	int no;
+	uint32_t mask;
+{
+	bus_space_write_4(sc->memt, sc->memh, no,
+	    (bus_space_read_4(sc->memt, sc->memh, no) | mask));
+}
+
+static __inline void
+autri_reg_clear_4(sc, no, mask)
+	struct autri_softc *sc;
+	int no;
+	uint32_t mask;
+{
+	bus_space_write_4(sc->memt, sc->memh, no,
+	    (bus_space_read_4(sc->memt, sc->memh, no) & ~mask));
+}
+
+/*
+ * AC'97 codec
+ */
+int
+autri_attach_codec(sc_, codec_if)
+	void *sc_;
+	struct ac97_codec_if *codec_if;
+{
+	struct autri_codec_softc *sc = sc_;
+
+	DPRINTF(("autri_attach_codec()\n"));
+
+	sc->codec_if = codec_if;
+	return 0;
+}
+
+int
+autri_read_codec(sc_, index, data)
+	void *sc_;
+	u_int8_t index;
+	u_int16_t *data;
+{
+	struct autri_codec_softc *codec = sc_;
+	struct autri_softc *sc = codec->sc;
+	u_int32_t status, addr, cmd, busy;
+	u_int16_t count;
+
+	/*DPRINTF(("sc->sc->type : 0x%X",sc->sc->type));*/
+
+	switch (sc->sc_devid) {
+	case AUTRI_DEVICE_ID_4DWAVE_DX:
+		addr = AUTRI_DX_ACR1;
+		cmd  = AUTRI_DX_ACR1_CMD_READ;
+		busy = AUTRI_DX_ACR1_BUSY_READ;
+		break;
+	case AUTRI_DEVICE_ID_4DWAVE_NX:
+		addr = AUTRI_NX_ACR2;
+		cmd  = AUTRI_NX_ACR2_CMD_READ;
+		busy = AUTRI_NX_ACR2_BUSY_READ | AUTRI_NX_ACR2_RECV_WAIT;
+		break;
+	case AUTRI_DEVICE_ID_SIS_7018:
+		addr = AUTRI_SIS_ACRD;
+		cmd  = AUTRI_SIS_ACRD_CMD_READ;
+		busy = AUTRI_SIS_ACRD_BUSY_READ | AUTRI_SIS_ACRD_AUDIO_BUSY;
+		break;
+	case AUTRI_DEVICE_ID_ALI_M5451:
+		if (sc->sc_revision > 0x01)
+			addr = AUTRI_ALI_ACWR;
+		else
+			addr = AUTRI_ALI_ACRD;
+		cmd  = AUTRI_ALI_ACRD_CMD_READ;
+		busy = AUTRI_ALI_ACRD_BUSY_READ;
+		break;
+	default:
+		printf("%s: autri_read_codec : unknown device\n",
+		    sc->sc_dev.dv_xname);
+		return -1;
+	}
+
+	/* wait for 'Ready to Read' */
+	for (count=0; count<0xffff; count++) {
+		if ((TREAD4(sc, addr) & busy) == 0)
+			break;
+	}
+
+	if (count == 0xffff) {
+		printf("%s: Codec timeout. Busy reading AC'97 codec.\n",
+		    sc->sc_dev.dv_xname);
+		return -1;
+	}
+
+	/* send Read Command to AC'97 */
+	TWRITE4(sc, addr, (index & 0x7f) | cmd);
+
+	/* wait for 'Returned data is avalable' */
+	for (count=0; count<0xffff; count++) {
+		status = TREAD4(sc, addr);
+		if ((status & busy) == 0)
+			break;
+	}
+
+	if (count == 0xffff) {
+		printf("%s: Codec timeout. Busy reading AC'97 codec.\n",
+		    sc->sc_dev.dv_xname);
+		return -1;
+	}
+
+	*data =  (status >> 16) & 0x0000ffff;
+	/*DPRINTF(("autri_read_codec(0x%X) return 0x%X\n",reg,*data));*/
+	return 0;
+}
+
+int
+autri_write_codec(sc_, index, data)
+	void *sc_;
+	u_int8_t index;
+	u_int16_t data;
+{
+	struct autri_codec_softc *codec = sc_;
+	struct autri_softc *sc = codec->sc;
+	u_int32_t addr, cmd, busy;
+	u_int16_t count;
+
+	/*DPRINTF(("autri_write_codec(0x%X,0x%X)\n",index,data));*/
+
+	switch (sc->sc_devid) {
+	case AUTRI_DEVICE_ID_4DWAVE_DX:
+		addr = AUTRI_DX_ACR0;
+		cmd  = AUTRI_DX_ACR0_CMD_WRITE;
+		busy = AUTRI_DX_ACR0_BUSY_WRITE;
+		break;
+	case AUTRI_DEVICE_ID_4DWAVE_NX:
+		addr = AUTRI_NX_ACR1;
+		cmd  = AUTRI_NX_ACR1_CMD_WRITE;
+		busy = AUTRI_NX_ACR1_BUSY_WRITE;
+		break;
+	case AUTRI_DEVICE_ID_SIS_7018:
+		addr = AUTRI_SIS_ACWR;
+		cmd  = AUTRI_SIS_ACWR_CMD_WRITE;
+		busy = AUTRI_SIS_ACWR_BUSY_WRITE | AUTRI_SIS_ACWR_AUDIO_BUSY;
+		break;
+	case AUTRI_DEVICE_ID_ALI_M5451:
+		addr = AUTRI_ALI_ACWR;
+		cmd  = AUTRI_ALI_ACWR_CMD_WRITE;
+		if (sc->sc_revision > 0x01)
+			cmd  |= 0x0100;
+		busy = AUTRI_ALI_ACWR_BUSY_WRITE;
+		break;
+	default:
+		printf("%s: autri_write_codec : unknown device.\n",
+		    sc->sc_dev.dv_xname);
+		return -1;
+	}
+
+	/* wait for 'Ready to Write' */
+	for (count=0; count<0xffff; count++) {
+		if ((TREAD4(sc, addr) & busy) == 0)
+			break;
+	}
+
+	if (count == 0xffff) {
+		printf("%s: Codec timeout. Busy writing AC'97 codec\n",
+		    sc->sc_dev.dv_xname);
+		return -1;
+	}
+
+	/* send Write Command to AC'97 */
+	TWRITE4(sc, addr, (data << 16) | (index & 0x7f) | cmd);
+
+	return 0;
+}
+
+void
+autri_reset_codec(sc_)
+	void *sc_;
+{
+	struct autri_codec_softc *codec = sc_;
+	struct autri_softc *sc = codec->sc;
+	u_int32_t reg, ready;
+	int addr, count = 200;
+
+	DPRINTF(("autri_reset_codec(codec=%p,sc=%p)\n",codec,sc));
+	DPRINTF(("sc->sc_devid=%X\n",sc->sc_devid));
+
+	switch (sc->sc_devid) {
+	case AUTRI_DEVICE_ID_4DWAVE_DX:
+		/* warm reset AC'97 codec */
+		autri_reg_set_4(sc, AUTRI_DX_ACR2, 1);
+		delay(100);
+		/* release reset */
+		autri_reg_clear_4(sc, AUTRI_DX_ACR2, 1);
+		delay(100);
+
+		addr = AUTRI_DX_ACR2;
+		ready = AUTRI_DX_ACR2_CODEC_READY;
+		break;
+	case AUTRI_DEVICE_ID_4DWAVE_NX:
+		/* warm reset AC'97 codec */
+		autri_reg_set_4(sc, AUTRI_NX_ACR0, 1);
+		delay(100);
+		/* release reset */
+		autri_reg_clear_4(sc, AUTRI_NX_ACR0, 1);
+		delay(100);
+
+		addr = AUTRI_NX_ACR0;
+		ready = AUTRI_NX_ACR0_CODEC_READY;
+		break;
+	case AUTRI_DEVICE_ID_SIS_7018:
+		/* warm reset AC'97 codec */
+		autri_reg_set_4(sc, AUTRI_SIS_SCTRL, 1);
+		delay(100);
+		/* release reset (warm & cold) */
+		autri_reg_clear_4(sc, AUTRI_SIS_SCTRL, 3);
+		delay(100);
+
+		addr = AUTRI_SIS_SCTRL;
+		ready = AUTRI_SIS_SCTRL_CODEC_READY;
+		break;
+	case AUTRI_DEVICE_ID_ALI_M5451:
+		/* warm reset AC'97 codec */
+		autri_reg_set_4(sc, AUTRI_ALI_SCTRL, 1);
+		delay(100);
+		/* release reset (warm & cold) */
+		autri_reg_clear_4(sc, AUTRI_ALI_SCTRL, 3);
+		delay(100);
+
+		addr = AUTRI_ALI_SCTRL;
+		ready = AUTRI_ALI_SCTRL_CODEC_READY;
+		break;
+	}
+
+	/* wait for 'Codec Ready' */
+	while (count--) {
+		reg = TREAD4(sc, addr);
+		if (reg & ready)
+			break;
+		delay(1000);
+	}
+
+	if (count == 0)
+		printf("%s: Codec timeout. AC'97 is not ready for operation.\n",
+		    sc->sc_dev.dv_xname);
+}
+
+/*
+ *
+ */
+
+int
+autri_match(parent, match, aux)
+	struct device *parent;
+	void *match;
+	void *aux;
+{
+	struct pci_attach_args *pa = (struct pci_attach_args *) aux;
+
+	switch (PCI_VENDOR(pa->pa_id)) {
+	case PCI_VENDOR_TRIDENT:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_TRIDENT_4DWAVE_DX:
+		case PCI_PRODUCT_TRIDENT_4DWAVE_NX:
+			return 1;
+		}
+		break;
+	case PCI_VENDOR_SIS:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_SIS_7018:
+			return 1;
+		}
+		break;
+	case PCI_VENDOR_ALI:
+		switch (PCI_PRODUCT(pa->pa_id)) {
+		case PCI_PRODUCT_ALI_M5451:
+			return 1;
+		}
+		break;
+	}
+
+	return 0;
+}
+
+void
+autri_attach(parent, self, aux)
+	struct device *parent;
+	struct device *self;
+	void *aux;
+{
+	struct autri_softc *sc = (struct autri_softc *)self;
+	struct pci_attach_args *pa = (struct pci_attach_args *)aux;
+	pci_chipset_tag_t pc = pa->pa_pc;
+	struct autri_codec_softc *codec;
+	pci_intr_handle_t ih;
+	char const *intrstr;
+	mixer_ctrl_t ctl;
+	int i, r;
+	u_int32_t reg;
+
+	sc->sc_devid = pa->pa_id;
+	sc->sc_class = pa->pa_class;
+	sc->sc_revision = PCI_REVISION(pa->pa_class);
+	printf("\n");
+
+	/* map register to memory */
+	if (pci_mapreg_map(pa, AUTRI_PCI_MEMORY_BASE,
+	    PCI_MAPREG_TYPE_MEM, 0, &sc->memt, &sc->memh, NULL, NULL, 0)) {
+		printf("%s: can't map memory space\n", sc->sc_dev.dv_xname);
+		return;
+	}
+
+	/* map and establish the interrupt */
+	if (pci_intr_map(pa, &ih)) {
+		printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname);
+		return;
+	}
+	intrstr = pci_intr_string(pc, ih);
+	sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, autri_intr, sc,
+	    sc->sc_dev.dv_xname);
+	if (sc->sc_ih == NULL) {
+		printf("%s: couldn't establish interrupt",
+		    sc->sc_dev.dv_xname);
+		if (intrstr != NULL)
+			printf(" at %s", intrstr);
+		printf("\n");
+		return;
+	}
+	printf("%s: interrupting at %s\n", sc->sc_dev.dv_xname, intrstr);
+
+	sc->sc_dmatag = pa->pa_dmat;
+	sc->sc_pc = pc;
+	sc->sc_pt = pa->pa_tag;
+
+	/* enable the device */
+	reg = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+	reg |= (PCI_COMMAND_MEM_ENABLE | PCI_COMMAND_MASTER_ENABLE);
+	pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, reg);
+
+	/* initialize the device */
+	autri_init(sc);
+
+	/* attach AC'97 codec */
+	codec = &sc->sc_codec;
+	memcpy(&codec->sc_dev, &sc->sc_dev, sizeof(codec->sc_dev));
+	codec->sc = sc;
+
+	codec->host_if.arg = codec;
+	codec->host_if.attach = autri_attach_codec;
+	codec->host_if.reset = autri_reset_codec;
+	codec->host_if.read = autri_read_codec;
+	codec->host_if.write = autri_write_codec;
+
+	if ((r = ac97_attach(&codec->host_if)) != 0) {
+		printf("%s: can't attach codec (error 0x%X)\n",
+		    sc->sc_dev.dv_xname, r);
+		return;
+	}
+
+	/* disable mutes */
+	for (i = 0; i < 4; i++) {
+		static struct {
+			char *class, *device;
+		} d[] = {
+			{ AudioCoutputs, AudioNmaster},
+			{ AudioCinputs, AudioNdac},
+			{ AudioCinputs, AudioNcd},
+			{ AudioCrecord, AudioNvolume},
+		};
+
+		ctl.type = AUDIO_MIXER_ENUM;
+		ctl.un.ord = 0;
+
+#if 0
+		ctl.dev = sc->sc_codec.codec_if->vtbl->get_portnum_by_name(sc->sc_codec.codec_if,
+		    d[i].class, d[i].device, AudioNmute);
+#endif
+		ctl.dev = autri_get_portnum_by_name(sc,d[i].class,
+						   d[i].device, AudioNmute);
+		autri_mixer_set_port(sc, &ctl);
+	}
+
+	/* set a reasonable default volume */
+	ctl.type = AUDIO_MIXER_VALUE;
+	ctl.un.value.num_channels = 2;
+	ctl.un.value.level[AUDIO_MIXER_LEVEL_LEFT] =
+	ctl.un.value.level[AUDIO_MIXER_LEVEL_RIGHT] = 127;
+
+	ctl.dev = autri_get_portnum_by_name(sc,AudioCoutputs,AudioNmaster,NULL);
+	autri_mixer_set_port(sc, &ctl);
+
+	audio_attach_mi(&autri_hw_if, sc, &sc->sc_dev);
+
+#if NMIDI > 0
+	midi_attach_mi(&autri_midi_hw_if, sc, &sc->sc_dev);
+#endif
+
+	powerhook_establish(autri_powerhook, sc);
+}
+
+static void
+autri_powerhook(int why,void *addr)
+{
+	static int old = PWR_RESUME;
+	struct autri_softc *sc = addr;
+
+	if (why == PWR_RESUME && old == PWR_SUSPEND) {
+		DPRINTF(("PWR_RESUME\n"));
+		autri_init(sc);
+		/*autri_reset_codec(&sc->sc_codec);*/
+		(sc->sc_codec.codec_if->vtbl->restore_ports)(sc->sc_codec.codec_if);
+	}
+	old = why;
+}
+
+int
+autri_init(sc_)
+	void *sc_;
+{
+	struct autri_softc *sc = sc_;
+	u_int32_t reg;
+
+	pci_chipset_tag_t pc = sc->sc_pc;
+	pcitag_t pt = sc->sc_pt;
+
+	DPRINTF(("in autri_init()\n"));
+	DPRINTFN(5,("pci_conf_read(0x40) : 0x%X\n",pci_conf_read(pc,pt,0x40)));
+	DPRINTFN(5,("pci_conf_read(0x44) : 0x%X\n",pci_conf_read(pc,pt,0x44)));
+
+	switch (sc->sc_devid) {
+	case AUTRI_DEVICE_ID_4DWAVE_DX:
+		/* disable Legacy Control */
+		pci_conf_write(pc, pt, AUTRI_PCI_DDMA_CFG,0);
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg & 0xffff0000);
+		delay(100);
+		/* audio engine reset */
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg | 0x00040000);
+		delay(100);
+		/* release reset */
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg & ~0x00040000);
+		delay(100);
+		/* DAC on */
+		autri_reg_set_4(sc,AUTRI_DX_ACR2,0x02);
+		break;
+	case AUTRI_DEVICE_ID_4DWAVE_NX:
+		/* disable Legacy Control */
+		pci_conf_write(pc, pt, AUTRI_PCI_DDMA_CFG,0);
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg & 0xffff0000);
+		delay(100);
+		/* audio engine reset */
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg | 0x00010000);
+		delay(100);
+		/* release reset */
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg & ~0x00010000);
+		delay(100);
+		/* DAC on */
+		autri_reg_set_4(sc,AUTRI_NX_ACR0,0x02);
+		break;
+	case AUTRI_DEVICE_ID_SIS_7018:
+		/* disable Legacy Control */
+		pci_conf_write(pc, pt, AUTRI_PCI_DDMA_CFG,0);
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg & 0xffff0000);
+		delay(100);
+		/* reset Digital Controller */
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg | 0x000c0000);
+		delay(100);
+		/* release reset */
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg & ~0x00040000);
+		delay(100);
+		/* disable AC97 GPIO interrupt */
+		TWRITE1(sc, AUTRI_SIS_ACGPIO, 0);
+		/* enable 64 channel mode */
+		autri_reg_set_4(sc, AUTRI_LFO_GC_CIR, BANK_B_EN);
+		break;
+	case AUTRI_DEVICE_ID_ALI_M5451:
+		/* disable Legacy Control */
+		pci_conf_write(pc, pt, AUTRI_PCI_DDMA_CFG,0);
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg & 0xffff0000);
+		delay(100);
+		/* reset Digital Controller */
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg | 0x000c0000);
+		delay(100);
+		/* release reset */
+		reg = pci_conf_read(pc, pt, AUTRI_PCI_LEGACY_IOBASE);
+		pci_conf_write(pc, pt, AUTRI_PCI_LEGACY_IOBASE, reg & ~0x00040000);
+		delay(100);
+		/* enable PCM input */
+		autri_reg_set_4(sc, AUTRI_ALI_GCONTROL, AUTRI_ALI_GCONTROL_PCM_IN);
+		break;
+	}
+
+	if (sc->sc_devid == AUTRI_DEVICE_ID_ALI_M5451) {
+		sc->sc_play.ch      = 0;
+		sc->sc_play.ch_intr = 1;
+		sc->sc_rec.ch       = 31;
+		sc->sc_rec.ch_intr  = 2;
+	} else {
+		sc->sc_play.ch      = 0x20;
+		sc->sc_play.ch_intr = 0x21;
+		sc->sc_rec.ch       = 0x22;
+		sc->sc_rec.ch_intr  = 0x23;
+	}
+
+	/* clear channel status */
+	TWRITE4(sc, AUTRI_STOP_A, 0xffffffff);
+	TWRITE4(sc, AUTRI_STOP_B, 0xffffffff);
+
+	/* disable channel interrupt */
+	TWRITE4(sc, AUTRI_AINTEN_A, 0);
+	TWRITE4(sc, AUTRI_AINTEN_B, 0);
+
+#if 0
+	/* TLB */
+	if (sc->sc_devid == AUTRI_DEVICE_ID_4DWAVE_NX) {
+		TWRITE4(sc,AUTRI_NX_TLBC,0);
+	}
+#endif
+
+	autri_enable_loop_interrupt(sc);
+
+	DPRINTF(("out autri_init()\n"));
+	return 0;
+}
+
+static void
+autri_enable_loop_interrupt(sc_)
+	void *sc_;
+{
+	struct autri_softc *sc = sc_;
+	u_int32_t reg;
+
+	/*reg = (ENDLP_IE | MIDLP_IE);*/
+	reg = ENDLP_IE;
+#if 0
+	if (sc->sc_devid == AUTRI_DEVICE_ID_SIS_7018)
+		reg |= BANK_B_EN;
+#endif
+	autri_reg_set_4(sc,AUTRI_LFO_GC_CIR,reg);
+}
+
+#if 0
+static void
+autri_disable_loop_interrupt(sc_)
+	void *sc_;
+{
+	struct autri_softc *sc = sc_;
+	u_int32_t reg;
+
+	reg = (ENDLP_IE | MIDLP_IE);
+	autri_reg_clear_4(sc,AUTRI_LFO_GC_CIR,reg);
+}
+#endif
+
+int
+autri_intr(p)
+	void *p;
+{
+	struct autri_softc *sc = p;
+	u_int32_t intsrc;
+	u_int32_t mask, active[2];
+	int ch, endch;
+/*
+	u_int32_t reg;
+	u_int32_t cso,eso;
+*/
+
+	intsrc = TREAD4(sc,AUTRI_MISCINT);
+	if ((intsrc & (ADDRESS_IRQ|MPU401_IRQ)) == 0)
+		return 0;
+
+	if (intsrc & ADDRESS_IRQ) {
+
+		active[0] = TREAD4(sc,AUTRI_AIN_A);
+		active[1] = TREAD4(sc,AUTRI_AIN_B);
+
+		if (sc->sc_devid == AUTRI_DEVICE_ID_ALI_M5451) {
+			endch = 32;
+		} else {
+			endch = 64;
+		}
+
+		for (ch=0; ch<endch; ch++) {
+			mask = 1 << (ch & 0x1f);
+			if (active[(ch & 0x20) ? 1 : 0] & mask) {
+
+				/* clear interupt */
+				TWRITE4(sc, (ch & 0x20) ? AUTRI_AIN_B : AUTRI_AIN_A, mask);
+				/* disable interupt */
+				autri_reg_clear_4(sc,(ch & 0x20) ? AUTRI_AINTEN_B : AUTRI_AINTEN_A, mask);
+#if 0
+				reg = TREAD4(sc,AUTRI_LFO_GC_CIR) & ~0x0000003f;
+				TWRITE4(sc,AUTRI_LFO_GC_CIR, reg | ch);
+
+				if (sc->sc_devid == AUTRI_DEVICE_ID_4DWAVE_NX) {
+				  cso = TREAD4(sc, 0xe0) & 0x00ffffff;
+				  eso = TREAD4(sc, 0xe8) & 0x00ffffff;
+				} else {
+				  cso = (TREAD4(sc, 0xe0) >> 16) & 0x0000ffff;
+				  eso = (TREAD4(sc, 0xe8) >> 16) & 0x0000ffff;
+				}
+				/*printf("cso=%d, eso=%d\n",cso,eso);*/
+#endif
+				if (ch == sc->sc_play.ch_intr) {
+					if (sc->sc_play.intr)
+						sc->sc_play.intr(sc->sc_play.intr_arg);
+				}
+
+				if (ch == sc->sc_rec.ch_intr) {
+					if (sc->sc_rec.intr)
+						sc->sc_rec.intr(sc->sc_rec.intr_arg);
+				}
+
+				/* enable interrupt */
+				autri_reg_set_4(sc, (ch & 0x20) ? AUTRI_AINTEN_B : AUTRI_AINTEN_A, mask);
+			}
+		}
+	}
+
+	if (intsrc & MPU401_IRQ) {
+		/* XXX */
+	}
+
+	autri_reg_set_4(sc,AUTRI_MISCINT,
+		ST_TARGET_REACHED | MIXER_OVERFLOW | MIXER_UNDERFLOW);
+
+	return 1;
+}
+
+/*
+ *
+ */
+
+int
+autri_allocmem(sc, size, align, p)
+	struct autri_softc *sc;
+	size_t size;
+	size_t align;
+	struct autri_dma *p;
+{
+	int error;
+
+	p->size = size;
+	error = bus_dmamem_alloc(sc->sc_dmatag, p->size, align, 0,
+	    p->segs, sizeof(p->segs)/sizeof(p->segs[0]),
+	    &p->nsegs, BUS_DMA_NOWAIT);
+	if (error)
+		return (error);
+
+	error = bus_dmamem_map(sc->sc_dmatag, p->segs, p->nsegs, p->size,
+	    &p->addr, BUS_DMA_NOWAIT|BUS_DMA_COHERENT);
+	if (error)
+		goto free;
+
+	error = bus_dmamap_create(sc->sc_dmatag, p->size, 1, p->size,
+	    0, BUS_DMA_NOWAIT, &p->map);
+	if (error)
+		goto unmap;
+
+	error = bus_dmamap_load(sc->sc_dmatag, p->map, p->addr, p->size, NULL,
+	    BUS_DMA_NOWAIT);
+	if (error)
+		goto destroy;
+	return (0);
+
+destroy:
+	bus_dmamap_destroy(sc->sc_dmatag, p->map);
+unmap:
+	bus_dmamem_unmap(sc->sc_dmatag, p->addr, p->size);
+free:
+	bus_dmamem_free(sc->sc_dmatag, p->segs, p->nsegs);
+	return (error);
+}
+
+int
+autri_freemem(sc, p)
+	struct autri_softc *sc;
+	struct autri_dma *p;
+{
+	bus_dmamap_unload(sc->sc_dmatag, p->map);
+	bus_dmamap_destroy(sc->sc_dmatag, p->map);
+	bus_dmamem_unmap(sc->sc_dmatag, p->addr, p->size);
+	bus_dmamem_free(sc->sc_dmatag, p->segs, p->nsegs);
+	return 0;
+}
+
+int
+autri_open(addr, flags)
+	void *addr;
+	int flags;
+{
+	DPRINTF(("autri_open()\n"));
+	DPRINTFN(5,("MISCINT    : 0x%08X\n",
+	    TREAD4((struct autri_softc *)addr, AUTRI_MISCINT)));
+	DPRINTFN(5,("LFO_GC_CIR : 0x%08X\n",
+	    TREAD4((struct autri_softc *)addr, AUTRI_LFO_GC_CIR)));
+	return 0;
+}
+
+void
+autri_close(addr)
+	void *addr;
+{
+	DPRINTF(("autri_close()\n"));
+}
+
+int
+autri_query_encoding(addr, fp)
+	void *addr;
+	struct audio_encoding *fp;
+{
+	switch (fp->index) {
+	case 0:
+		strcpy(fp->name, AudioEulinear);
+		fp->encoding = AUDIO_ENCODING_ULINEAR;
+		fp->precision = 8;
+		fp->flags = 0;
+		break;
+	case 1:
+		strcpy(fp->name, AudioEmulaw);
+		fp->encoding = AUDIO_ENCODING_ULAW;
+		fp->precision = 8;
+		fp->flags = AUDIO_ENCODINGFLAG_EMULATED;
+		break;
+	case 2:
+		strcpy(fp->name, AudioEalaw);
+		fp->encoding = AUDIO_ENCODING_ALAW;
+		fp->precision = 8;
+		fp->flags = AUDIO_ENCODINGFLAG_EMULATED;
+		break;
+	case 3:
+		strcpy(fp->name, AudioEslinear);
+		fp->encoding = AUDIO_ENCODING_SLINEAR;
+		fp->precision = 8;
+		fp->flags = 0;
+		break;
+	case 4:
+		strcpy(fp->name, AudioEslinear_le);
+		fp->encoding = AUDIO_ENCODING_SLINEAR_LE;
+		fp->precision = 16;
+		fp->flags = 0;
+		break;
+	case 5:
+		strcpy(fp->name, AudioEulinear_le);
+		fp->encoding = AUDIO_ENCODING_ULINEAR_LE;
+		fp->precision = 16;
+		fp->flags = 0;
+		break;
+	case 6:
+		strcpy(fp->name, AudioEslinear_be);
+		fp->encoding = AUDIO_ENCODING_SLINEAR_BE;
+		fp->precision = 16;
+		fp->flags = AUDIO_ENCODINGFLAG_EMULATED;
+		break;
+	case 7:
+		strcpy(fp->name, AudioEulinear_be);
+		fp->encoding = AUDIO_ENCODING_ULINEAR_BE;
+		fp->precision = 16;
+		fp->flags = AUDIO_ENCODINGFLAG_EMULATED;
+		break;
+	default:
+		return (EINVAL);
+	}
+
+	return 0;
+}
+
+int
+autri_set_params(addr, setmode, usemode, play, rec)
+	void *addr;
+	int setmode, usemode;
+	struct audio_params *play, *rec;
+{
+	struct audio_params *p;
+	int mode;
+
+	for (mode = AUMODE_RECORD; mode != -1;
+	    mode = mode == AUMODE_RECORD ? AUMODE_PLAY : -1) {
+		if ((setmode & mode) == 0)
+			continue;
+
+		p = mode == AUMODE_PLAY ? play : rec;
+
+		if (p->sample_rate < 4000 || p->sample_rate > 48000 ||
+		    (p->precision != 8 && p->precision != 16) ||
+		    (p->channels != 1 && p->channels != 2))
+			return (EINVAL);
+
+		p->factor = 1;
+		p->sw_code = 0;
+		switch (p->encoding) {
+		case AUDIO_ENCODING_SLINEAR_BE:
+		case AUDIO_ENCODING_ULINEAR_BE:
+			if (p->precision == 16)
+				p->sw_code = swap_bytes;
+			break;
+		case AUDIO_ENCODING_SLINEAR_LE:
+		case AUDIO_ENCODING_ULINEAR_LE:
+			break;
+		case AUDIO_ENCODING_ULAW:
+			if (mode == AUMODE_PLAY)
+				p->sw_code = mulaw_to_ulinear8;
+			else
+				p->sw_code = ulinear8_to_mulaw;
+
+			break;
+		case AUDIO_ENCODING_ALAW:
+			if (mode == AUMODE_PLAY)
+				p->sw_code = alaw_to_ulinear8;
+			else
+				p->sw_code = ulinear8_to_alaw;
+
+			break;
+		default:
+			return (EINVAL);
+		}
+	}
+
+	return 0;
+}
+
+int
+autri_round_blocksize(addr, block)
+	void *addr;
+	int block;
+{
+	return (block & -4);
+}
+
+int
+autri_halt_output(addr)
+	void *addr;
+{
+	struct autri_softc *sc = addr;
+
+	DPRINTF(("autri_halt_output()\n"));
+
+	sc->sc_play.intr = NULL;
+	autri_stopch(sc, sc->sc_play.ch, sc->sc_play.ch_intr);
+	autri_disable_interrupt(sc, sc->sc_play.ch_intr);
+
+	return 0;
+}
+
+int
+autri_halt_input(addr)
+	void *addr;
+{
+	struct autri_softc *sc = addr;
+
+	DPRINTF(("autri_halt_input()\n"));
+
+	sc->sc_rec.intr = NULL;
+	autri_stopch(sc, sc->sc_rec.ch, sc->sc_rec.ch_intr);
+	autri_disable_interrupt(sc, sc->sc_rec.ch_intr);
+
+	return 0;
+}
+
+int
+autri_getdev(addr, retp)
+	void *addr;
+	struct audio_device *retp;
+{
+	struct autri_softc *sc = addr;
+
+	DPRINTF(("autri_getdev().\n"));
+
+	strncpy(retp->name, "Trident 4DWAVE", sizeof(retp->name));
+	snprintf(retp->version, sizeof(retp->version), "0x%02x",
+	    PCI_REVISION(sc->sc_class));
+
+	switch (sc->sc_devid) {
+	case AUTRI_DEVICE_ID_4DWAVE_DX:
+		strncpy(retp->config, "4DWAVE-DX", sizeof(retp->config));
+		break;
+	case AUTRI_DEVICE_ID_4DWAVE_NX:
+		strncpy(retp->config, "4DWAVE-NX", sizeof(retp->config));
+		break;
+	case AUTRI_DEVICE_ID_SIS_7018:
+		strncpy(retp->config, "SiS 7018", sizeof(retp->config));
+		break;
+	case AUTRI_DEVICE_ID_ALI_M5451:
+		strncpy(retp->config, "ALi M5451", sizeof(retp->config));
+		break;
+	default:
+		strncpy(retp->config, "unknown", sizeof(retp->config));
+	}
+
+	return 0;
+}
+
+int
+autri_mixer_set_port(addr, cp)
+	void *addr;
+	mixer_ctrl_t *cp;
+{
+	struct autri_softc *sc = addr;
+
+	return (sc->sc_codec.codec_if->vtbl->mixer_set_port(
+	    sc->sc_codec.codec_if, cp));
+}
+
+int
+autri_mixer_get_port(addr, cp)
+	void *addr;
+	mixer_ctrl_t *cp;
+{
+	struct autri_softc *sc = addr;
+
+	return (sc->sc_codec.codec_if->vtbl->mixer_get_port(
+	    sc->sc_codec.codec_if, cp));
+}
+
+int
+autri_query_devinfo(addr, dip)
+	void *addr;
+	mixer_devinfo_t *dip;
+{
+	struct autri_softc *sc = addr;
+
+	return (sc->sc_codec.codec_if->vtbl->query_devinfo(
+	    sc->sc_codec.codec_if, dip));
+}
+
+int
+autri_get_portnum_by_name(sc, class, device, qualifier)
+	struct autri_softc *sc;
+	char *class, *device, *qualifier;
+{
+	return (sc->sc_codec.codec_if->vtbl->get_portnum_by_name(
+	    sc->sc_codec.codec_if, class, device, qualifier));
+}
+
+void *
+autri_malloc(addr, direction, size, pool, flags)
+	void *addr;
+	int direction;
+	size_t size;
+	int pool, flags;
+{
+	struct autri_softc *sc = addr;
+	struct autri_dma *p;
+	int error;
+
+	p = malloc(sizeof(*p), pool, flags);
+	if (!p)
+		return NULL;
+
+#if 0
+	error = autri_allocmem(sc, size, 16, p);
+#endif
+	error = autri_allocmem(sc, size, 0x10000, p);
+	if (error) {
+		free(p, pool);
+		return NULL;
+	}
+
+	p->next = sc->sc_dmas;
+	sc->sc_dmas = p;
+	return KERNADDR(p);
+}
+
+void
+autri_free(addr, ptr, pool)
+	void *addr;
+	void *ptr;
+	int pool;
+{
+	struct autri_softc *sc = addr;
+	struct autri_dma **pp, *p;
+
+	for (pp = &sc->sc_dmas; (p = *pp) != NULL; pp = &p->next) {
+		if (KERNADDR(p) == ptr) {
+			autri_freemem(sc, p);
+			*pp = p->next;
+			free(p, pool);
+			return;
+		}
+	}
+}
+
+static struct autri_dma *
+autri_find_dma(sc, addr)
+	struct autri_softc *sc;
+	void *addr;
+{
+	struct autri_dma *p;
+
+	for (p = sc->sc_dmas; p && KERNADDR(p) != addr; p = p->next)
+		;
+
+	return p;
+}
+
+size_t
+autri_round_buffersize(addr, direction, size)
+	void *addr;
+	int direction;
+	size_t size;
+{
+	return size;
+}
+
+paddr_t
+autri_mappage(addr, mem, off, prot)
+	void *addr;
+	void *mem;
+	off_t off;
+	int prot;
+{
+	struct autri_softc *sc = addr;
+	struct autri_dma *p;
+
+	if (off < 0)
+		return (-1);
+
+	p = autri_find_dma(sc, mem);
+	if (!p)
+		return (-1);
+
+	return (bus_dmamem_mmap(sc->sc_dmatag, p->segs, p->nsegs,
+	    off, prot, BUS_DMA_WAITOK));
+}
+
+int
+autri_get_props(addr)
+	void *addr;
+{
+	return (AUDIO_PROP_MMAP | AUDIO_PROP_INDEPENDENT |
+		AUDIO_PROP_FULLDUPLEX);
+}
+
+static void
+autri_setup_channel(sc, mode, param)
+	struct autri_softc *sc;
+	int mode;
+	struct audio_params *param;
+{
+	int i, ch, channel;
+	u_int32_t reg, cr[5];
+	u_int32_t cso, eso;
+	u_int32_t delta, dch[2], ctrl;
+	u_int32_t alpha_fms, fm_vol, attribute;
+
+	u_int32_t dmaaddr, dmalen;
+	int factor, rvol, cvol;
+	struct autri_chstatus *chst;
+
+	ctrl = AUTRI_CTRL_LOOPMODE;
+	switch (param->encoding) {
+	case AUDIO_ENCODING_SLINEAR_BE:
+	case AUDIO_ENCODING_SLINEAR_LE:
+		ctrl |= AUTRI_CTRL_SIGNED;
+		break;
+	}
+
+	factor = 0;
+	if (param->precision == 16) {
+		ctrl |= AUTRI_CTRL_16BIT;
+		factor++;
+	}
+
+	if (param->channels == 2) {
+		ctrl |= AUTRI_CTRL_STEREO;
+		factor++;
+	}
+
+	delta = (u_int32_t)param->sample_rate;
+	if (delta < 4000)
+		delta = 4000;
+	if (delta > 48000)
+		delta = 48000;
+
+	dch[1] = ((delta << 12) / 48000) & 0x0000ffff;
+	if (mode == AUMODE_PLAY) {
+		chst = &sc->sc_play;
+		dch[0] = ((delta << 12) / 48000) & 0x0000ffff;
+		if (sc->sc_devid != AUTRI_DEVICE_ID_SIS_7018)
+			ctrl |= AUTRI_CTRL_WAVEVOL;
+/*
+		if (sc->sc_devid == AUTRI_DEVICE_ID_ALI_M5451)
+			ctrl |= 0x80000000;
+*/
+	} else {
+		chst = &sc->sc_rec;
+		dch[0] = ((48000 << 12) / delta) & 0x0000ffff;
+		ctrl |= AUTRI_CTRL_MUTE;
+	}
+
+	dmaaddr = DMAADDR(chst->dma);
+	cso = alpha_fms = 0;
+	rvol = cvol = 0x7f;
+	fm_vol = 0x0 | ((rvol & 0x7f) << 7) | (cvol & 0x7f);
+	attribute = 0;
+
+	for (ch=0; ch<2; ch++) {
+
+		if (ch == 0)
+			dmalen = (chst->length >> factor);
+		else {
+			/* channel for interrupt */
+			dmalen = (chst->blksize >> factor);
+			ctrl |= AUTRI_CTRL_MUTE;
+		}
+
+		eso = dmalen - 1;
+
+		switch (sc->sc_devid) {
+		case AUTRI_DEVICE_ID_4DWAVE_DX:
+			cr[0] = (cso << 16) | (alpha_fms & 0x0000ffff);
+			cr[1] = dmaaddr;
+			cr[2] = (eso << 16) | (dch[ch] & 0x0000ffff);
+			cr[3] = fm_vol;
+			cr[4] = ctrl;
+			break;
+		case AUTRI_DEVICE_ID_4DWAVE_NX:
+			cr[0] = (dch[ch] << 24) | (cso & 0x00ffffff);
+			cr[1] = dmaaddr;
+			cr[2] = ((dch[ch] << 16) & 0xff000000) | (eso & 0x00ffffff);
+			cr[3] = (alpha_fms << 16) | (fm_vol & 0x0000ffff);
+			cr[4] = ctrl;
+			break;
+		case AUTRI_DEVICE_ID_SIS_7018:
+			cr[0] = (cso << 16) | (alpha_fms & 0x0000ffff);
+			cr[1] = dmaaddr;
+			cr[2] = (eso << 16) | (dch[ch] & 0x0000ffff);
+			cr[3] = (attribute << 16) | (fm_vol & 0x0000ffff);
+			cr[4] = ctrl;
+			break;
+		case AUTRI_DEVICE_ID_ALI_M5451:
+			cr[0] = (cso << 16) | (alpha_fms & 0x0000ffff);
+			cr[1] = dmaaddr;
+			cr[2] = (eso << 16) | (dch[ch] & 0x0000ffff);
+			cr[3] = 0;
+			cr[4] = ctrl;
+			break;
+		}
+
+		/* write channel data */
+		channel = (ch == 0) ? chst->ch : chst->ch_intr;
+
+		reg = TREAD4(sc,AUTRI_LFO_GC_CIR) & ~0x0000003f;
+		TWRITE4(sc,AUTRI_LFO_GC_CIR, reg | channel);
+
+		for (i=0; i<5; i++) {
+			TWRITE4(sc, AUTRI_ARAM_CR + i*sizeof(cr[0]), cr[i]);
+			DPRINTFN(5,("cr[%d] : 0x%08X\n", i, cr[i]));
+		}
+
+		/* Bank A only */
+		if (channel < 0x20) {
+			TWRITE4(sc, AUTRI_EBUF1, AUTRI_EMOD_STILL);
+			TWRITE4(sc, AUTRI_EBUF2, AUTRI_EMOD_STILL);
+		}
+	}
+
+}
+
+int
+autri_trigger_output(addr, start, end, blksize, intr, arg, param)
+	void *addr;
+	void *start, *end;
+	int blksize;
+	void (*intr) __P((void *));
+	void *arg;
+	struct audio_params *param;
+{
+	struct autri_softc *sc = addr;
+	struct autri_dma *p;
+
+	DPRINTFN(5,("autri_trigger_output: sc=%p start=%p end=%p "
+	    "blksize=%d intr=%p(%p)\n", addr, start, end, blksize, intr, arg));
+
+	sc->sc_play.intr = intr;
+	sc->sc_play.intr_arg = arg;
+	sc->sc_play.offset = 0;
+	sc->sc_play.blksize = blksize;
+	sc->sc_play.length = (char *)end - (char *)start;
+
+	p = autri_find_dma(sc, start);
+	if (!p) {
+		printf("autri_trigger_output: bad addr %p\n", start);
+		return (EINVAL);
+	}
+
+	sc->sc_play.dma = p;
+
+	/* */
+	autri_setup_channel(sc, AUMODE_PLAY, param);
+
+	/* volume set to no attenuation */
+	TWRITE4(sc, AUTRI_MUSICVOL_WAVEVOL, 0);
+
+	/* enable interrupt */
+	autri_enable_interrupt(sc, sc->sc_play.ch_intr);
+
+	/* start channel */
+	autri_startch(sc, sc->sc_play.ch, sc->sc_play.ch_intr);
+
+	return 0;
+}
+
+int
+autri_trigger_input(addr, start, end, blksize, intr, arg, param)
+	void *addr;
+	void *start, *end;
+	int blksize;
+	void (*intr) __P((void *));
+	void *arg;
+	struct audio_params *param;
+{
+	struct autri_softc *sc = addr;
+	struct autri_dma *p;
+
+	DPRINTFN(5,("autri_trigger_input: sc=%p start=%p end=%p "
+	    "blksize=%d intr=%p(%p)\n", addr, start, end, blksize, intr, arg));
+
+	sc->sc_rec.intr = intr;
+	sc->sc_rec.intr_arg = arg;
+	sc->sc_rec.offset = 0;
+	sc->sc_rec.blksize = blksize;
+	sc->sc_rec.length = (char *)end - (char *)start;
+
+	/* */
+	p = autri_find_dma(sc, start);
+	if (!p) {
+		printf("autri_trigger_input: bad addr %p\n", start);
+		return (EINVAL);
+	}
+
+	sc->sc_rec.dma = p;
+
+	/* */
+	if (sc->sc_devid == AUTRI_DEVICE_ID_4DWAVE_NX) {
+		autri_reg_set_4(sc, AUTRI_NX_ACR0, AUTRI_NX_ACR0_PSB_CAPTURE);
+		TWRITE1(sc, AUTRI_NX_RCI3, AUTRI_NX_RCI3_ENABLE | sc->sc_rec.ch);
+	}
+
+#if 0
+	/* 4DWAVE only allows capturing at a 48KHz rate */
+	if (sc->sc_devid == AUTRI_DEVICE_ID_4DWAVE_DX ||
+	    sc->sc_devid == AUTRI_DEVICE_ID_4DWAVE_NX)
+		param->sample_rate = 48000;
+#endif
+
+	autri_setup_channel(sc, AUMODE_RECORD, param);
+
+	/* enable interrupt */
+	autri_enable_interrupt(sc, sc->sc_rec.ch_intr);
+
+	/* start channel */
+	autri_startch(sc, sc->sc_rec.ch, sc->sc_rec.ch_intr);
+
+	return 0;
+}
+
+#if 0
+static int
+autri_halt(sc)
+	struct autri_softc *sc;
+{
+	DPRINTF(("autri_halt().\n"));
+	/*autri_stopch(sc);*/
+	autri_disable_interrupt(sc, sc->sc_play.channel);
+	autri_disable_interrupt(sc, sc->sc_rec.channel);
+	return 0;
+}
+#endif
+
+static void
+autri_enable_interrupt(sc, ch)
+	struct autri_softc *sc;
+	int ch;
+{
+	int reg;
+
+	reg = (ch & 0x20) ? AUTRI_AINTEN_B : AUTRI_AINTEN_A;
+	ch &= 0x1f;
+
+	autri_reg_set_4(sc, reg, 1 << ch);
+}
+
+static void
+autri_disable_interrupt(sc, ch)
+	struct autri_softc *sc;
+	int ch;
+{
+	int reg;
+
+	reg = (ch & 0x20) ? AUTRI_AINTEN_B : AUTRI_AINTEN_A;
+	ch &= 0x1f;
+
+	autri_reg_clear_4(sc, reg, 1 << ch);
+}
+
+static void
+autri_startch(sc, ch, ch_intr)
+	struct autri_softc *sc;
+	int ch, ch_intr;
+{
+	int reg;
+	u_int32_t chmask;
+
+	reg = (ch & 0x20) ? AUTRI_START_B : AUTRI_START_A;
+	ch &= 0x1f;
+	chmask = (1 << ch) | (1 << ch_intr);
+
+	autri_reg_set_4(sc, reg, chmask);
+}
+
+static void
+autri_stopch(sc, ch, ch_intr)
+	struct autri_softc *sc;
+	int ch, ch_intr;
+{
+	int reg;
+	u_int32_t chmask;
+
+	reg = (ch & 0x20) ? AUTRI_STOP_B : AUTRI_STOP_A;
+	ch &= 0x1f;
+	chmask = (1 << ch) | (1 << ch_intr);
+
+	autri_reg_set_4(sc, reg, chmask);
+}
+
+#if NMIDI > 0
+int
+autri_midi_open(void *addr, int flags,
+	void (*iintr)(void *, int),
+	void (*ointr)(void *),
+	void *arg)
+{
+	struct autri_softc *sc = addr;
+
+	DPRINTF(("autri_midi_open()\n"));
+
+	DPRINTFN(5,("MPUR1 : 0x%02X\n",TREAD1(sc,AUTRI_MPUR1)));
+	DPRINTFN(5,("MPUR2 : 0x%02X\n",TREAD1(sc,AUTRI_MPUR2)));
+
+	sc->sc_iintr = iintr;
+	sc->sc_ointr = ointr;
+	sc->sc_arg = arg;
+
+	if (flags & FREAD)
+		autri_reg_clear_1(sc, AUTRI_MPUR2, AUTRI_MIDIIN_ENABLE_INTR);
+
+	if (flags & FWRITE)
+		autri_reg_set_1(sc, AUTRI_MPUR2, AUTRI_MIDIOUT_CONNECT);
+
+	return (0);
+}
+
+void
+autri_midi_close(void *addr)
+{
+	struct autri_softc *sc = addr;
+
+	DPRINTF(("autri_midi_close()\n"));
+
+	tsleep(sc, PWAIT, "autri", hz/10); /* give uart a chance to drain */
+
+	sc->sc_iintr = NULL;
+	sc->sc_ointr = NULL;
+}
+
+int
+autri_midi_output(void *addr, int d)
+{
+	struct autri_softc *sc = addr;
+	int x;
+
+	for (x = 0; x != MIDI_BUSY_WAIT; x++) {
+		if ((TREAD1(sc, AUTRI_MPUR1) & AUTRI_MIDIOUT_READY) == 0) {
+			TWRITE1(sc, AUTRI_MPUR0, d);
+			return (0);
+		}
+		delay(MIDI_BUSY_DELAY);
+	}
+	return (EIO);
+}
+
+void
+autri_midi_getinfo(void *addr, struct midi_info *mi)
+{
+	mi->name = "4DWAVE MIDI UART";
+	mi->props = MIDI_PROP_CAN_INPUT;
+}
+
+#endif
diff --git a/sys/dev/pci/autrireg.h b/sys/dev/pci/autrireg.h
new file mode 100644
index 00000000000..67644d0ab3c
--- /dev/null
+++ b/sys/dev/pci/autrireg.h
@@ -0,0 +1,169 @@
+/*	$OpenBSD: autrireg.h,v 1.1 2001/11/26 16:38:38 mickey Exp $	*/
+
+/*
+ * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Trident 4DWAVE registers
+ */
+
+#ifndef _DEV_PCI_AUTRIREG_H_
+#define	_DEV_PCI_AUTRIREG_H_
+
+
+#define AUTRI_DEVICE_ID_4DWAVE_DX \
+	((PCI_PRODUCT_TRIDENT_4DWAVE_DX << 16) | PCI_VENDOR_TRIDENT)
+#define AUTRI_DEVICE_ID_4DWAVE_NX \
+	((PCI_PRODUCT_TRIDENT_4DWAVE_NX << 16) | PCI_VENDOR_TRIDENT)
+#define AUTRI_DEVICE_ID_SIS_7018 \
+	((PCI_PRODUCT_SIS_7018 << 16) | PCI_VENDOR_SIS)
+#define AUTRI_DEVICE_ID_ALI_M5451 \
+	((PCI_PRODUCT_ALI_M5451 << 16) | PCI_VENDOR_ALI)
+
+/*
+ * PCI Config Registers
+ */
+#define AUTRI_PCI_MEMORY_BASE	0x14
+#define AUTRI_PCI_DDMA_CFG	0x40
+#define AUTRI_PCI_LEGACY_IOBASE	0x44
+
+/*
+ * AC'97 Registers
+ */
+#define AUTRI_DX_ACR0			0x40
+# define AUTRI_DX_ACR0_CMD_WRITE	0x00008000
+# define AUTRI_DX_ACR0_BUSY_WRITE	0x00008000
+#define AUTRI_DX_ACR1			0x44
+# define AUTRI_DX_ACR1_CMD_READ		0x00008000
+# define AUTRI_DX_ACR1_BUSY_READ	0x00008000
+#define AUTRI_DX_ACR2			0x48
+# define AUTRI_DX_ACR2_CODEC_READY	0x00000010
+
+#define AUTRI_NX_ACR0			0x40
+# define AUTRI_NX_ACR0_PSB_CAPTURE	0x00000200
+# define AUTRI_NX_ACR0_CODEC_READY	0x00000008
+#define AUTRI_NX_ACR1			0x44
+# define AUTRI_NX_ACR1_CMD_WRITE	0x00000800
+# define AUTRI_NX_ACR1_BUSY_WRITE	0x00000800
+#define AUTRI_NX_ACR2			0x48
+# define AUTRI_NX_ACR2_CMD_READ		0x00000800
+# define AUTRI_NX_ACR2_BUSY_READ	0x00000800
+# define AUTRI_NX_ACR2_RECV_WAIT	0x00000400
+#define AUTRI_NX_ACR3			0x4c
+
+#define AUTRI_SIS_ACWR			0x40
+# define AUTRI_SIS_ACWR_CMD_WRITE	0x00008000
+# define AUTRI_SIS_ACWR_BUSY_WRITE	0x00008000
+# define AUTRI_SIS_ACWR_AUDIO_BUSY	0x00004000
+#define AUTRI_SIS_ACRD			0x44
+# define AUTRI_SIS_ACRD_CMD_READ	0x00008000
+# define AUTRI_SIS_ACRD_BUSY_READ	0x00008000
+# define AUTRI_SIS_ACRD_AUDIO_BUSY	0x00004000
+#define AUTRI_SIS_SCTRL			0x48
+# define AUTRI_SIS_SCTRL_CODEC_READY	0x01000000
+#define AUTRI_SIS_ACGPIO		0x4c
+
+#define AUTRI_ALI_ACWR			0x40
+# define AUTRI_ALI_ACWR_CMD_WRITE	0x00008000
+# define AUTRI_ALI_ACWR_BUSY_WRITE	0x00008000
+#define AUTRI_ALI_ACRD			0x44
+# define AUTRI_ALI_ACRD_CMD_READ	0x00008000
+# define AUTRI_ALI_ACRD_BUSY_READ	0x00008000
+#define AUTRI_ALI_SCTRL			0x48
+# define AUTRI_ALI_SCTRL_CODEC_READY	0x01000000
+#define AUTRI_ALI_ACGPIO		0x4c
+/*
+# define AUTRI_ALI_AC97_BUSY_READ  0x00008000
+# define AUTRI_ALI_AC97_BUSY_WRITE 0x00008000
+# define AUTRI_ALI_AC97_CMD_WRITE  0x00008000
+*/
+
+/*
+ * MPU-401 UART
+ */
+#define AUTRI_MPUR0			0x20
+#define AUTRI_MPUR1			0x21
+# define AUTRI_MIDIOUT_READY		0x40
+#define AUTRI_MPUR2			0x22
+# define AUTRI_MIDIOUT_CONNECT		0x10
+# define AUTRI_MIDIIN_ENABLE_INTR	0x08
+
+#define MIDI_BUSY_WAIT			100
+#define MIDI_BUSY_DELAY			100
+
+/*
+ * Channel Registers
+ */
+#define AUTRI_START_A			0x80
+#define AUTRI_STOP_A			0x84
+#define AUTRI_DLY_A			0x88
+#define AUTRI_SIGN_CSO_A		0x8c
+#define AUTRI_CSPF_A			0x90
+#define AUTRI_CEBC_A			0x94
+#define AUTRI_AIN_A			0x98
+#define AUTRI_EINT_A			0x9c
+#define AUTRI_LFO_GC_CIR		0xa0
+# define ENDLP_IE			0x00001000
+# define MIDLP_IE			0x00002000
+# define BANK_B_EN			0x00010000
+#define AUTRI_AINTEN_A			0xa4
+#define AUTRI_MUSICVOL_WAVEVOL		0xa8
+#define AUTRI_MISCINT			0xb0
+# define ST_TARGET_REACHED		0x00008000
+# define MIXER_OVERFLOW			0x00000800
+# define MIXER_UNDERFLOW		0x00000800
+# define ADDRESS_IRQ			0x00000020
+# define MPU401_IRQ			0x00000008
+#define AUTRI_START_B			0xb4
+#define AUTRI_STOP_B			0xb8
+#define AUTRI_CSPF_B			0xbc
+#define AUTRI_AIN_B			0xd8
+#define AUTRI_AINTEN_B			0xdc
+
+/*
+ * Indexed Channel Registers
+ */
+#define AUTRI_ARAM_CR			0xe0
+# define AUTRI_CTRL_WAVEVOL		0x80000000
+# define AUTRI_CTRL_MUTE		0x3fff0000
+# define AUTRI_CTRL_16BIT		0x00008000
+# define AUTRI_CTRL_STEREO		0x00004000
+# define AUTRI_CTRL_SIGNED		0x00002000
+# define AUTRI_CTRL_LOOPMODE		0x00001000
+#define AUTRI_EBUF1			0xf4
+#define AUTRI_EBUF2			0xf8
+# define AUTRI_EMOD_STILL		0x30000000
+
+/*
+ * Others
+ */
+#define AUTRI_NX_RCI3			0x73
+# define AUTRI_NX_RCI3_ENABLE		0x80
+
+#define AUTRI_ALI_GCONTROL		0xd4
+# define AUTRI_ALI_GCONTROL_PCM_IN	0x80000000
+
+
+#endif /* _DEV_PCI_AUTRIREG_H_ */
diff --git a/sys/dev/pci/autrivar.h b/sys/dev/pci/autrivar.h
new file mode 100644
index 00000000000..db977826207
--- /dev/null
+++ b/sys/dev/pci/autrivar.h
@@ -0,0 +1,103 @@
+/*	$OpenBSD: autrivar.h,v 1.1 2001/11/26 16:38:38 mickey Exp $	*/
+
+/*
+ * Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _DEV_PCI_AUTRIVAR_H_
+#define	_DEV_PCI_AUTRIVAR_H_
+
+/*
+ * softc
+ */
+struct autri_dma {
+	bus_dmamap_t		map;
+	caddr_t			addr;		/* VA */
+	bus_dma_segment_t	segs[1];
+	int			nsegs;
+	size_t			size;
+	struct autri_dma	*next;
+};
+
+struct autri_codec_softc {
+	struct device		sc_dev;		/* base device */
+	struct autri_softc	*sc;
+	int			id;
+	int			status_data;
+	int			status_addr;
+	struct ac97_host_if	host_if;
+	struct ac97_codec_if	*codec_if;
+};
+
+struct autri_chstatus {
+	void		(*intr)(void *); /* rint/pint */
+	void		*intr_arg;	/* arg for intr */
+	u_int		offset;		/* filled up to here */
+	u_int		blksize;
+	u_int		factor;		/* byte per sample */
+	u_int		length;		/* ring buffer length */
+	struct autri_dma *dma;		/* DMA handle for ring buf */
+
+	int		ch;
+	int		ch_intr;
+#if 0
+	u_int		csoint;
+	u_int		count;
+#endif
+};
+
+struct autri_softc {
+	struct device		sc_dev;		/* base device */
+	pci_chipset_tag_t	sc_pc;
+	pcitag_t		sc_pt;
+	pcireg_t		sc_devid;
+	void			*sc_ih;		/* interrupt vectoring */
+	bus_space_tag_t		memt;
+	bus_space_handle_t	memh;
+	bus_space_tag_t		iot;
+	bus_space_handle_t	ioh;
+	bus_dma_tag_t		sc_dmatag;	/* DMA tag */
+	u_int			sc_flags;
+
+	struct autri_codec_softc sc_codec;
+	struct autri_dma	*sc_dmas;	/* List of DMA handles */
+
+	u_int32_t		sc_class;
+	int			sc_revision;
+
+	/*
+	 * Play/record status
+	 */
+	struct autri_chstatus	sc_play, sc_rec;
+
+#if NMIDI > 0
+	void	(*sc_iintr)(void *, int);	/* midi input ready handler */
+	void	(*sc_ointr)(void *);		/* midi output ready handler */
+	void	*sc_arg;
+#endif
+
+};
+
+#endif /* _DEV_PCI_AUTRIVAR_H_ */
+
diff --git a/sys/dev/pci/files.pci b/sys/dev/pci/files.pci
index 7104741905e..8ac3b7c6bd8 100644
--- a/sys/dev/pci/files.pci
+++ b/sys/dev/pci/files.pci
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.pci,v 1.118 2001/10/27 05:02:30 deraadt Exp $
+#	$OpenBSD: files.pci,v 1.119 2001/11/26 16:38:37 mickey Exp $
 #	$NetBSD: files.pci,v 1.20 1996/09/24 17:47:15 christos Exp $
 #
 # Config file and device description for machine-independent PCI code.
@@ -97,6 +97,11 @@ device	emu: audio, auconv, mulaw, ac97
 attach	emu at pci
 file	dev/pci/emuxki.c		emu
 
+# Trident 4DWAVE based PCI audio (including SiS 7018, ALi M5451)
+device	autri: audio, auconv, mulaw, ac97, midibus
+attach	autri at pci
+file	dev/pci/autri.c			autri
+
 # CS4280 CrystalClear Audio
 device	clcs: audio, auconv, mulaw, ac97
 attach	clcs at pci
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 419c4834772..116a59e0ab8 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcidevs,v 1.468 2001/11/23 04:17:58 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.469 2001/11/26 16:37:32 mickey Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -1818,6 +1818,7 @@
 #define	PCI_PRODUCT_SIS_730	0x0730		/* 730 Host-PCI */
 #define	PCI_PRODUCT_SIS_900	0x0900		/* 900 10/100BaseTX */
 #define	PCI_PRODUCT_SIS_7016	0x7016		/* 7016 10/100BaseTX */
+#define	PCI_PRODUCT_SIS_7018	0x7018		/* Trident 4D WAVE */
 #define	PCI_PRODUCT_SIS_5511	0x5511		/* 5511 */
 #define	PCI_PRODUCT_SIS_5512	0x5512		/* 5512 */
 #define	PCI_PRODUCT_SIS_5513	0x5513		/* 5513 EIDE */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 6b0c792e24d..182abbddf1a 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *		OpenBSD: pcidevs,v 1.468 2001/11/23 04:17:58 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.469 2001/11/26 16:37:32 mickey Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -3819,6 +3819,10 @@ static const struct pci_known_product pci_known_products[] = {
 	    "7016 10/100BaseTX",
 	},
 	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7018,
+	    "Trident 4D WAVE",
+	},
+	{
 	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5511,
 	    "5511",
 	},