Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Add am7930 audio driver.
details: https://anonhg.NetBSD.org/src/rev/ac6930b00b12
branches: trunk
changeset: 485614:ac6930b00b12
user: augustss <augustss%NetBSD.org@localhost>
date: Tue May 02 06:43:05 2000 +0000
description:
Add am7930 audio driver.
diffstat:
sys/arch/pmax/pmax/conf.c | 7 +-
sys/arch/pmax/pmax/dec_maxine.c | 10 +-
sys/dev/tc/bba.c | 802 ++++++++++++++++++++++++++++++++++++++++
sys/dev/tc/files.tc | 10 +-
4 files changed, 817 insertions(+), 12 deletions(-)
diffs (truncated from 900 to 300 lines):
diff -r f8368d8e11c2 -r ac6930b00b12 sys/arch/pmax/pmax/conf.c
--- a/sys/arch/pmax/pmax/conf.c Tue May 02 06:41:44 2000 +0000
+++ b/sys/arch/pmax/pmax/conf.c Tue May 02 06:43:05 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.38 2000/02/19 09:43:40 nisimura Exp $ */
+/* $NetBSD: conf.c,v 1.39 2000/05/02 06:43:43 augustss Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -58,7 +58,8 @@
bdev_decl(st);
bdev_decl(sw);
bdev_decl(vnd);
-
+#include "audio.h"
+cdev_decl(audio);
#include "rz.h"
#include "tz.h"
bdev_decl(rz);
@@ -285,6 +286,7 @@
cdev_disk_init(NRAID,raid), /* 96: RAIDframe disk driver */
cdev_disk_init(NMD,md), /* 97: memory disk driver */
cdev_fbm_init(NPX,px), /* 98: PixelStamp board driver */
+ cdev_audio_init(NAUDIO,audio), /* 99 generic audio I/O */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
@@ -422,6 +424,7 @@
/* 96 */ 32, /* RAIDframe */
/* 97 */ 17, /* memory disk */
/* 98 */ NODEV,
+ /* 99 */ NODEV,
};
/*
diff -r f8368d8e11c2 -r ac6930b00b12 sys/arch/pmax/pmax/dec_maxine.c
--- a/sys/arch/pmax/pmax/dec_maxine.c Tue May 02 06:41:44 2000 +0000
+++ b/sys/arch/pmax/pmax/dec_maxine.c Tue May 02 06:43:05 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_maxine.c,v 1.31 2000/04/11 06:50:38 nisimura Exp $ */
+/* $NetBSD: dec_maxine.c,v 1.32 2000/05/02 06:43:43 augustss Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.31 2000/04/11 06:50:38 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.32 2000/05/02 06:43:43 augustss Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -326,13 +326,13 @@
CHECKINTR(SYS_DEV_LANCE, IOASIC_INTR_LANCE);
CHECKINTR(SYS_DEV_SCSI, IOASIC_INTR_SCSI);
/* CHECKINTR(SYS_DEV_OPT2, XINE_INTR_VINT); */
- /* CHECKINTR(SYS_DEV_ISDN, IOASIC_INTR_ISDN); */
+ CHECKINTR(SYS_DEV_ISDN, (IOASIC_INTR_ISDN_DS_TXLOAD | IOASIC_INTR_ISDN_DS_RXLOAD));
/* CHECKINTR(SYS_DEV_FDC, IOASIC_INTR_FDC); */
CHECKINTR(SYS_DEV_OPT1, XINE_INTR_TC_1);
CHECKINTR(SYS_DEV_OPT0, XINE_INTR_TC_0);
-#define ERRORS (IOASIC_INTR_ISDN_OVRUN|IOASIC_INTR_ISDN_READ_E|IOASIC_INTR_SCSI_OVRUN|IOASIC_INTR_SCSI_READ_E|IOASIC_INTR_LANCE_READ_E)
-#define PTRLOAD (IOASIC_INTR_ISDN_PTR_LOAD|IOASIC_INTR_SCSI_PTR_LOAD)
+#define ERRORS (IOASIC_INTR_ISDN|IOASIC_INTR_ISDN_OVRUN|IOASIC_INTR_ISDN_READ_E|IOASIC_INTR_SCSI_OVRUN|IOASIC_INTR_SCSI_READ_E|IOASIC_INTR_LANCE_READ_E)
+#define PTRLOAD (IOASIC_INTR_ISDN_DS_TXLOAD|IOASIC_INTR_ISDN_DS_RXLOAD|IOASIC_INTR_SCSI_PTR_LOAD)
#if 0
if (can_serve & IOASIC_INTR_SCSI_PTR_LOAD) {
diff -r f8368d8e11c2 -r ac6930b00b12 sys/dev/tc/bba.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/tc/bba.c Tue May 02 06:43:05 2000 +0000
@@ -0,0 +1,802 @@
+/* $NetBSD: bba.c,v 1.1 2000/05/02 06:43:05 augustss Exp $ */
+
+/*
+ * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
+
+/* maxine/alpha baseboard audio (bba) */
+
+#include "audio.h"
+#if NAUDIO > 0
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+
+#include <machine/bus.h>
+#include <machine/autoconf.h>
+#include <machine/cpu.h>
+
+#include <vm/vm.h> /* for PAGE_SIZE */
+
+#include <sys/audioio.h>
+#include <dev/audio_if.h>
+
+#include <dev/ic/am7930reg.h>
+#include <dev/ic/am7930var.h>
+
+#include <dev/tc/tcvar.h>
+#include <dev/tc/ioasicreg.h>
+#include <dev/tc/ioasicvar.h>
+
+#ifdef pmax
+#include <pmax/pmax/maxine.h>
+#define IOASIC_CSR_ISDN_ENABLE XINE_CSR_ISDN_ENABLE
+#define IOASIC_INTR_ISDN_TXLOAD IOASIC_INTR_ISDN_DS_TXLOAD
+#define IOASIC_INTR_ISDN_RXLOAD IOASIC_INTR_ISDN_DS_RXLOAD
+#ifdef IOASIC_INTR_ISDN_OVRUN
+#undef IOASIC_INTR_ISDN_OVRUN
+#endif
+#define IOASIC_INTR_ISDN_OVRUN IOASIC_INTR_ISDN_DS_OVRUN
+#endif
+
+#ifdef AUDIO_DEBUG
+#define DPRINTF(x) if (am7930debug) printf x
+#else
+#define DPRINTF(x)
+#endif /* AUDIO_DEBUG */
+
+#define BBA_MAX_DMA_SEGMENTS 16
+
+struct bba_mem {
+ bus_addr_t addr;
+ bus_size_t size;
+ caddr_t kva;
+ struct bba_mem *next;
+};
+
+struct bba_dma_state {
+ bus_dmamap_t dmam; /* dma map */
+ int active;
+ int curseg; /* current segment in dma buffer */
+ void (*intr)__P((void *)); /* higher-level audio handler */
+ void *intr_arg;
+};
+
+struct bba_softc {
+ struct am7930_softc sc_am7930; /* glue to MI code */
+
+ bus_space_tag_t sc_bst; /* IOASIC bus tag/handle */
+ bus_space_handle_t sc_bsh;
+ bus_dma_tag_t sc_dmat;
+ bus_space_handle_t sc_codec_bsh; /* codec bus space handle */
+
+ struct bba_mem *sc_mem_head; /* list of buffers */
+
+ struct bba_dma_state sc_tx_dma_state;
+ struct bba_dma_state sc_rx_dma_state;
+};
+
+int bba_match __P((struct device *, struct cfdata *, void *));
+void bba_attach __P((struct device *, struct device *, void *));
+
+struct cfattach bba_ca = {
+ sizeof(struct bba_softc), bba_match, bba_attach
+};
+
+/*
+ * Define our interface into the am7930 MI driver.
+ */
+
+u_int8_t bba_codec_iread __P((struct am7930_softc *, int));
+u_int16_t bba_codec_iread16 __P((struct am7930_softc *, int));
+void bba_codec_iwrite __P((struct am7930_softc *, int, u_int8_t));
+void bba_codec_iwrite16 __P((struct am7930_softc *, int, u_int16_t));
+void bba_onopen __P((struct am7930_softc *sc));
+void bba_onclose __P((struct am7930_softc *sc));
+void bba_output_conv __P((void *, u_int8_t *, int));
+void bba_input_conv __P((void *, u_int8_t *, int));
+
+struct am7930_glue bba_glue = {
+ bba_codec_iread,
+ bba_codec_iwrite,
+ bba_codec_iread16,
+ bba_codec_iwrite16,
+ bba_onopen,
+ bba_onclose,
+ 4,
+ bba_input_conv,
+ bba_output_conv,
+};
+
+/*
+ * Define our interface to the higher level audio driver.
+ */
+
+int bba_round_blocksize __P((void *, int));
+int bba_halt_output __P((void *));
+int bba_halt_input __P((void *));
+int bba_getdev __P((void *, struct audio_device *));
+void *bba_allocm __P((void *, int, size_t, int, int));
+void bba_freem __P((void *, void *, int));
+size_t bba_round_buffersize __P((void *, int, size_t));
+int bba_trigger_output __P((void *, void *, void *, int,
+ void (*)(void *), void *, struct audio_params *));
+int bba_trigger_input __P((void *, void *, void *, int,
+ void (*)(void *), void *, struct audio_params *));
+
+struct audio_hw_if sa_hw_if = {
+ am7930_open,
+ am7930_close,
+ 0,
+ am7930_query_encoding,
+ am7930_set_params,
+ bba_round_blocksize, /* md */
+ am7930_commit_settings,
+ 0,
+ 0,
+ 0,
+ 0,
+ bba_halt_output, /* md */
+ bba_halt_input, /* md */
+ 0,
+ bba_getdev,
+ 0,
+ am7930_set_port,
+ am7930_get_port,
+ am7930_query_devinfo,
+ bba_allocm, /* md */
+ bba_freem, /* md */
+ bba_round_buffersize, /* md */
+ 0,
+ am7930_get_props,
+ bba_trigger_output, /* md */
+ bba_trigger_input /* md */
+};
+
+struct audio_device bba_device = {
+ "am7930",
+ "x",
+ "bba"
+};
+
+int bba_intr __P((void *));
+void bba_reset __P((struct bba_softc *, int));
+void bba_codec_dwrite __P((struct am7930_softc *, int, u_int8_t));
+u_int8_t bba_codec_dread __P((struct am7930_softc *, int));
+
+int bba_match(parent, cf, aux)
+ struct device *parent;
+ struct cfdata *cf;
+ void *aux;
+{
+ struct ioasicdev_attach_args *ia = aux;
+
+ if (strcmp(ia->iada_modname, "isdn") != 0 &&
+ strcmp(ia->iada_modname, "AMD79c30") != 0)
+ return 0;
+
+ return 1;
+}
+
+
+void
+bba_attach(parent, self, aux)
+ struct device *parent;
+ struct device *self;
+ void *aux;
+{
+ struct ioasicdev_attach_args *ia = aux;
+ struct bba_softc *sc = (struct bba_softc *)self;
+ struct am7930_softc *asc = &sc->sc_am7930;
+
+ sc->sc_bst = ((struct ioasic_softc *)parent)->sc_bst;
+ sc->sc_bsh = ((struct ioasic_softc *)parent)->sc_bsh;
+ sc->sc_dmat = ((struct ioasic_softc *)parent)->sc_dmat;
Home |
Main Index |
Thread Index |
Old Index