add device file interface for UCB1200
This commit is contained in:
uch
parent
40b13c16c0
commit
630279a800
@ -1,4 +1,4 @@
|
||||
# $NetBSD: files.hpcmips,v 1.22 2000/02/27 16:34:14 uch Exp $
|
||||
# $NetBSD: files.hpcmips,v 1.23 2000/03/03 19:54:37 uch Exp $
|
||||
|
||||
# maxpartitions must be first item in files.${ARCH}.
|
||||
maxpartitions 8
|
||||
@ -230,7 +230,7 @@ file arch/hpcmips/dev/ucbtp.c ucbtp
|
||||
|
||||
device ucbsnd
|
||||
attach ucbsnd at ucbif
|
||||
file arch/hpcmips/dev/ucbsnd.c ucbsnd
|
||||
file arch/hpcmips/dev/ucbsnd.c ucbsnd needs-flag
|
||||
|
||||
device ucbio: newgpbusif
|
||||
attach ucbio at ucbif
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ucb1200reg.h,v 1.3 2000/02/27 16:37:51 uch Exp $ */
|
||||
/* $NetBSD: ucb1200reg.h,v 1.4 2000/03/03 19:54:35 uch Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000, by UCHIYAMA Yasushi
|
||||
@ -111,11 +111,14 @@
|
||||
#define UCB1200_AUDIOCTRLB_ATT_MAX 0x1f
|
||||
#define UCB1200_AUDIOCTRLB_ATT_SHIFT 0
|
||||
#define UCB1200_AUDIOCTRLB_ATT_MASK 0x1f
|
||||
#define UCB1200_AUDIOCTRLB_ATT(cr) \
|
||||
(((cr) >> UCB1200_AUDIOCTRLB_ATT_SHIFT) & \
|
||||
#define UCB1200_AUDIOCTRLB_ATT(cr) \
|
||||
(((cr) >> UCB1200_AUDIOCTRLB_ATT_SHIFT) & \
|
||||
UCB1200_AUDIOCTRLB_ATT_MASK)
|
||||
#define UCB1200_AUDIOCTRLB_ATT_SET(cr, val) \
|
||||
((cr) | (((val) << UCB1200_AUDIOCTRLB_ATT_SHIFT) & \
|
||||
#define UCB1200_AUDIOCTRLB_ATT_CLR(cr) \
|
||||
((cr) & ~(UCB1200_AUDIOCTRLB_ATT_MASK << \
|
||||
UCB1200_AUDIOCTRLB_ATT_SHIFT))
|
||||
#define UCB1200_AUDIOCTRLB_ATT_SET(cr, val) \
|
||||
((cr) | (((val) << UCB1200_AUDIOCTRLB_ATT_SHIFT) & \
|
||||
(UCB1200_AUDIOCTRLB_ATT_MASK << UCB1200_AUDIOCTRLB_ATT_SHIFT)))
|
||||
|
||||
#define UCB1200_AUDIOCTRLB_CLIPSTATCLR 0x0040
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: ucbsnd.c,v 1.2 2000/01/16 21:47:01 uch Exp $ */
|
||||
/* $NetBSD: ucbsnd.c,v 1.3 2000/03/03 19:54:34 uch Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000, by UCHIYAMA Yasushi
|
||||
@ -29,6 +29,8 @@
|
||||
/*
|
||||
* Device driver for PHILIPS UCB1200 Advanced modem/audio analog front-end
|
||||
* Audio codec part.
|
||||
*
|
||||
* /dev/ucbsnd0 : sampling rate 22.154kHz monoral 16bit straight PCM device.
|
||||
*/
|
||||
#define UCBSNDDEBUG
|
||||
|
||||
@ -37,7 +39,11 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/conf.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/device.h>
|
||||
#include <sys/proc.h>
|
||||
#include <sys/endian.h>
|
||||
|
||||
#include <machine/bus.h>
|
||||
#include <machine/intr.h>
|
||||
@ -51,6 +57,9 @@
|
||||
#include <hpcmips/dev/ucb1200var.h>
|
||||
#include <hpcmips/dev/ucb1200reg.h>
|
||||
|
||||
#define AUDIOUNIT(x) (minor(x)&0x0f)
|
||||
#define AUDIODEV(x) (minor(x)&0xf0)
|
||||
|
||||
#ifdef UCBSNDDEBUG
|
||||
int ucbsnd_debug = 1;
|
||||
#define DPRINTF(arg) if (ucbsnd_debug) printf arg;
|
||||
@ -60,11 +69,19 @@ int ucbsnd_debug = 1;
|
||||
#define DPRINTFN(n, arg)
|
||||
#endif
|
||||
|
||||
#define UCBSND_BUFBLOCK 5
|
||||
/*
|
||||
* XXX temporary DMA buffer
|
||||
*/
|
||||
static u_int8_t dmabuf_static[TX39_SIBDMA_SIZE * UCBSND_BUFBLOCK] __attribute__((__aligned__(16))); /* XXX */
|
||||
static size_t dmabufcnt_static[UCBSND_BUFBLOCK]; /* XXX */
|
||||
|
||||
enum ucbsnd_state {
|
||||
/* 0 */ UCBSND_IDLE,
|
||||
/* 1 */ UCBSND_INIT,
|
||||
/* 2 */ UCBSND_ENABLE_SAMPLERATE,
|
||||
/* 3 */ UCBSND_ENABLE_OUTPUTPATH,
|
||||
/* 4 */ UCBSND_ENABLE_SETVOLUME,
|
||||
/* 5 */ UCBSND_ENABLE_SPEAKER0,
|
||||
/* 6 */ UCBSND_ENABLE_SPEAKER1,
|
||||
/* 7 */ UCBSND_TRANSITION_PIO,
|
||||
@ -73,7 +90,21 @@ enum ucbsnd_state {
|
||||
/*10 */ UCBSND_DISABLE_OUTPUTPATH,
|
||||
/*11 */ UCBSND_DISABLE_SPEAKER0,
|
||||
/*12 */ UCBSND_DISABLE_SPEAKER1,
|
||||
/*13 */ UCBSND_DISABLE_SIB
|
||||
/*13 */ UCBSND_DISABLE_SIB,
|
||||
/*14 */ UCBSND_DMASTART,
|
||||
/*15 */ UCBSND_DMAEND,
|
||||
};
|
||||
|
||||
struct ring_buf {
|
||||
u_int32_t rb_buf; /* buffer start address */
|
||||
size_t *rb_bufcnt; /* effective data count (max rb_blksize)*/
|
||||
|
||||
size_t rb_bufsize; /* total amount of buffer */
|
||||
int rb_blksize; /* DMA block size */
|
||||
int rb_maxblks; /* # of blocks in ring */
|
||||
|
||||
int rb_inp; /* start of input (to buffer) */
|
||||
int rb_outp; /* output pointer */
|
||||
};
|
||||
|
||||
struct ucbsnd_softc {
|
||||
@ -82,14 +113,18 @@ struct ucbsnd_softc {
|
||||
struct device *sc_ucb; /* parent (UCB1200 module) */
|
||||
tx_chipset_tag_t sc_tc;
|
||||
|
||||
struct tx_sound_tag sc_tag;
|
||||
int sc_mute;
|
||||
struct tx_sound_tag sc_tag;
|
||||
int sc_mute;
|
||||
|
||||
/*
|
||||
* audio codec state machine
|
||||
*/
|
||||
int sa_transfer_mode;
|
||||
#define UCBSND_TRANSFERMODE_DMA 0
|
||||
#define UCBSND_TRANSFERMODE_PIO 1
|
||||
enum ucbsnd_state sa_state;
|
||||
|
||||
int sa_snd_attenuation;
|
||||
#define UCBSND_DEFAULT_ATTENUATION 0 /* Full volume */
|
||||
int sa_snd_rate; /* passed down from SIB module */
|
||||
int sa_tel_rate;
|
||||
int sa_enabled;
|
||||
@ -97,19 +132,38 @@ struct ucbsnd_softc {
|
||||
void* sa_sndih;
|
||||
int sa_retry;
|
||||
int sa_cnt; /* misc counter */
|
||||
|
||||
|
||||
/*
|
||||
* input buffer
|
||||
*/
|
||||
size_t sa_dmacnt;
|
||||
struct ring_buf sc_rb;
|
||||
};
|
||||
|
||||
cdev_decl(ucbsnd);
|
||||
|
||||
int ucbsnd_match __P((struct device*, struct cfdata*, void*));
|
||||
void ucbsnd_attach __P((struct device*, struct device*, void*));
|
||||
|
||||
int ucbsnd_exec_output __P((void*));
|
||||
int ucbsnd_busy __P((void*));
|
||||
int ucbsnd_busy __P((void*));
|
||||
|
||||
void ucbsnd_sound_init __P((struct ucbsnd_softc*));
|
||||
void __ucbsnd_sound_click __P((tx_sound_tag_t));
|
||||
void __ucbsnd_sound_mute __P((tx_sound_tag_t, int));
|
||||
|
||||
int ucbsndwrite_subr __P((struct ucbsnd_softc *, u_int32_t *, size_t,
|
||||
struct uio *));
|
||||
|
||||
int ringbuf_allocate __P((struct ring_buf*, size_t, int));
|
||||
void ringbuf_deallocate __P((struct ring_buf*));
|
||||
void ringbuf_reset __P((struct ring_buf*));
|
||||
int ringbuf_full __P((struct ring_buf*));
|
||||
void *ringbuf_producer_get __P((struct ring_buf*));
|
||||
void ringbuf_producer_return __P((struct ring_buf*, size_t));
|
||||
void *ringbuf_consumer_get __P((struct ring_buf*, size_t*));
|
||||
void ringbuf_consumer_return __P((struct ring_buf*));
|
||||
|
||||
struct cfattach ucbsnd_ca = {
|
||||
sizeof(struct ucbsnd_softc), ucbsnd_match, ucbsnd_attach
|
||||
};
|
||||
@ -143,6 +197,7 @@ ucbsnd_attach(parent, self, aux)
|
||||
sc->sa_snd_rate = ucba->ucba_snd_rate;
|
||||
sc->sa_tel_rate = ucba->ucba_tel_rate;
|
||||
|
||||
sc->sa_snd_attenuation = UCBSND_DEFAULT_ATTENUATION;
|
||||
#define KHZ(a) ((a) / 1000), (((a) % 1000))
|
||||
printf(": audio %d.%03d kHz telecom %d.%03d kHz",
|
||||
KHZ((tx39sib_clock(sc->sc_sib) * 2) /
|
||||
@ -153,6 +208,8 @@ ucbsnd_attach(parent, self, aux)
|
||||
ucb1200_state_install(parent, ucbsnd_busy, self,
|
||||
UCB1200_SND_MODULE);
|
||||
|
||||
ringbuf_allocate(&sc->sc_rb, TX39_SIBDMA_SIZE, UCBSND_BUFBLOCK);
|
||||
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
@ -172,6 +229,8 @@ ucbsnd_exec_output(arg)
|
||||
struct ucbsnd_softc *sc = arg;
|
||||
tx_chipset_tag_t tc = sc->sc_tc;
|
||||
txreg_t reg;
|
||||
u_int32_t *buf;
|
||||
size_t bufcnt;
|
||||
|
||||
switch (sc->sa_state) {
|
||||
default:
|
||||
@ -197,15 +256,15 @@ ucbsnd_exec_output(arg)
|
||||
reg = TX39_SIBSF0_REGADDR_SET(reg, UCB1200_AUDIOCTRLA_REG);
|
||||
reg = TX39_SIBSF0_REGDATA_SET(reg, sc->sa_snd_rate);
|
||||
tx_conf_write(tc, TX39_SIBSF0CTRL_REG, reg);
|
||||
|
||||
|
||||
sc->sa_state = UCBSND_ENABLE_OUTPUTPATH;
|
||||
return 0;
|
||||
|
||||
|
||||
case UCBSND_ENABLE_OUTPUTPATH:
|
||||
/* Enable UCB1200 side */
|
||||
reg = TX39_SIBSF0_WRITE;
|
||||
reg = TX39_SIBSF0_REGADDR_SET(reg, UCB1200_AUDIOCTRLB_REG);
|
||||
reg = TX39_SIBSF0_REGDATA_SET(reg,
|
||||
reg = TX39_SIBSF0_REGDATA_SET(reg, sc->sa_snd_attenuation |
|
||||
UCB1200_AUDIOCTRLB_OUTEN);
|
||||
tx_conf_write(tc, TX39_SIBSF0CTRL_REG, reg);
|
||||
|
||||
@ -217,7 +276,6 @@ ucbsnd_exec_output(arg)
|
||||
sc->sa_state = UCBSND_ENABLE_SPEAKER0;
|
||||
sc->sa_retry = 10;
|
||||
return 0;
|
||||
|
||||
case UCBSND_ENABLE_SPEAKER0:
|
||||
/* Speaker on */
|
||||
|
||||
@ -247,13 +305,72 @@ ucbsnd_exec_output(arg)
|
||||
reg |= UCB1200_IO_DATA_SPEAKER;
|
||||
tx_conf_write(tc, TX39_SIBSF0CTRL_REG, reg);
|
||||
|
||||
sc->sa_state = UCBSND_TRANSITION_PIO;
|
||||
return 0;
|
||||
/*
|
||||
* Begin to transfer.
|
||||
*/
|
||||
switch (sc->sa_transfer_mode) {
|
||||
case UCBSND_TRANSFERMODE_DMA:
|
||||
sc->sa_state = UCBSND_DMASTART;
|
||||
sc->sa_dmacnt = 0;
|
||||
break;
|
||||
case UCBSND_TRANSFERMODE_PIO:
|
||||
sc->sa_state = UCBSND_TRANSITION_PIO;
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
case UCBSND_DMASTART:
|
||||
/* get data */
|
||||
if (sc->sa_dmacnt) /* return previous buffer */
|
||||
ringbuf_consumer_return(&sc->sc_rb);
|
||||
buf = ringbuf_consumer_get(&sc->sc_rb, &bufcnt);
|
||||
if (buf == 0) {
|
||||
sc->sa_state = UCBSND_DMAEND;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (sc->sa_dmacnt == 0) {
|
||||
/* change interrupt source */
|
||||
if (sc->sa_sf0ih) {
|
||||
tx_intr_disestablish(tc, sc->sa_sf0ih);
|
||||
sc->sa_sf0ih = 0;
|
||||
}
|
||||
sc->sa_sndih = tx_intr_establish(
|
||||
tc, MAKEINTR(1, TX39_INTRSTATUS1_SND1_0INT),
|
||||
IST_EDGE, IPL_TTY, ucbsnd_exec_output, sc);
|
||||
} else {
|
||||
wakeup(&sc->sc_rb);
|
||||
}
|
||||
|
||||
/* set DMA buffer address */
|
||||
tx_conf_write(tc, TX39_SIBSNDTXSTART_REG,
|
||||
MIPS_KSEG0_TO_PHYS(buf));
|
||||
|
||||
/* set DMA buffer size */
|
||||
tx_conf_write(tc, TX39_SIBSIZE_REG,
|
||||
TX39_SIBSIZE_SNDSIZE_SET(0, bufcnt));
|
||||
|
||||
tx_conf_write(tc, TX39_SIBSF0CTRL_REG, TX39_SIBSF0_SNDVALID);
|
||||
|
||||
/* kick DMA */
|
||||
reg = tx_conf_read(tc, TX39_SIBDMACTRL_REG);
|
||||
reg |= TX39_SIBDMACTRL_ENDMATXSND;
|
||||
tx_conf_write(tc, TX39_SIBDMACTRL_REG, reg);
|
||||
|
||||
/* set next */
|
||||
sc->sa_dmacnt += bufcnt;
|
||||
|
||||
break;
|
||||
|
||||
case UCBSND_DMAEND:
|
||||
sc->sa_state = UCBSND_TRANSITION_DISABLE;
|
||||
break;
|
||||
case UCBSND_TRANSITION_PIO:
|
||||
/* change interrupt source */
|
||||
tx_intr_disestablish(tc, sc->sa_sf0ih);
|
||||
|
||||
if (sc->sa_sf0ih) {
|
||||
tx_intr_disestablish(tc, sc->sa_sf0ih);
|
||||
sc->sa_sf0ih = 0;
|
||||
}
|
||||
sc->sa_sndih = tx_intr_establish(
|
||||
tc, MAKEINTR(1, TX39_INTRSTATUS1_SNDININT),
|
||||
IST_EDGE, IPL_TTY, ucbsnd_exec_output, sc);
|
||||
@ -264,24 +381,24 @@ ucbsnd_exec_output(arg)
|
||||
return 0;
|
||||
|
||||
case UCBSND_PIO:
|
||||
sc->sa_cnt++;
|
||||
|
||||
if ((sc->sa_cnt % 20) == 0)
|
||||
tx_conf_write(tc, TX39_SIBSNDHOLD_REG, sc->sa_cnt + 5000);
|
||||
else
|
||||
tx_conf_write(tc, TX39_SIBSNDHOLD_REG, 0);
|
||||
|
||||
{
|
||||
/* PIO test routine */
|
||||
int dummy_data = sc->sa_cnt * 3;
|
||||
tx_conf_write(tc, TX39_SIBSNDHOLD_REG,
|
||||
dummy_data << 16 | dummy_data);
|
||||
tx_conf_write(tc, TX39_SIBSF0CTRL_REG, TX39_SIBSF0_SNDVALID);
|
||||
|
||||
if (sc->sa_cnt > 50)
|
||||
if (sc->sa_cnt++ > 50) {
|
||||
sc->sa_state = UCBSND_TRANSITION_DISABLE;
|
||||
|
||||
}
|
||||
return 0;
|
||||
|
||||
}
|
||||
case UCBSND_TRANSITION_DISABLE:
|
||||
/* change interrupt source */
|
||||
sc->sa_enabled = 0;
|
||||
tx_intr_disestablish(tc, sc->sa_sndih);
|
||||
if (sc->sa_sndih) {
|
||||
tx_intr_disestablish(tc, sc->sa_sndih);
|
||||
sc->sa_sndih = 0;
|
||||
}
|
||||
sc->sa_sf0ih = tx_intr_establish(
|
||||
tc, MAKEINTR(1, TX39_INTRSTATUS1_SIBSF0INT),
|
||||
IST_EDGE, IPL_TTY, ucbsnd_exec_output, sc);
|
||||
@ -338,7 +455,10 @@ ucbsnd_exec_output(arg)
|
||||
tx_conf_write(tc, TX39_SIBCTRL_REG, reg);
|
||||
|
||||
/* end audio disable sequence */
|
||||
tx_intr_disestablish(tc, sc->sa_sf0ih);
|
||||
if (sc->sa_sf0ih) {
|
||||
tx_intr_disestablish(tc, sc->sa_sf0ih);
|
||||
sc->sa_sf0ih = 0;
|
||||
}
|
||||
sc->sa_state = UCBSND_IDLE;
|
||||
|
||||
return 0;
|
||||
@ -371,6 +491,7 @@ __ucbsnd_sound_click(arg)
|
||||
struct ucbsnd_softc *sc = (void*)arg;
|
||||
|
||||
if (!sc->sc_mute && sc->sa_state == UCBSND_IDLE) {
|
||||
sc->sa_transfer_mode = UCBSND_TRANSFERMODE_PIO;
|
||||
sc->sa_state = UCBSND_INIT;
|
||||
ucbsnd_exec_output((void*)sc);
|
||||
}
|
||||
@ -384,3 +505,302 @@ __ucbsnd_sound_mute(arg, onoff)
|
||||
struct ucbsnd_softc *sc = (void*)arg;
|
||||
sc->sc_mute = onoff;
|
||||
}
|
||||
|
||||
/*
|
||||
* device access
|
||||
*/
|
||||
extern struct cfdriver ucbsnd_cd;
|
||||
|
||||
int
|
||||
ucbsndopen(dev, flags, ifmt, p)
|
||||
dev_t dev;
|
||||
int flags, ifmt;
|
||||
struct proc *p;
|
||||
{
|
||||
int unit = AUDIOUNIT(dev);
|
||||
struct ucbsnd_softc *sc;
|
||||
|
||||
if (unit >= ucbsnd_cd.cd_ndevs ||
|
||||
(sc = ucbsnd_cd.cd_devs[unit]) == NULL)
|
||||
return (ENXIO);
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
ucbsndclose(dev, flags, ifmt, p)
|
||||
dev_t dev;
|
||||
int flags, ifmt;
|
||||
struct proc *p;
|
||||
{
|
||||
int unit = AUDIOUNIT(dev);
|
||||
struct ucbsnd_softc *sc;
|
||||
|
||||
if (unit >= ucbsnd_cd.cd_ndevs ||
|
||||
(sc = ucbsnd_cd.cd_devs[unit]) == NULL)
|
||||
return (ENXIO);
|
||||
|
||||
DPRINTF(("ucbsndclose\n"));
|
||||
|
||||
return (0);
|
||||
}
|
||||
|
||||
int
|
||||
ucbsndread(dev, uio, ioflag)
|
||||
dev_t dev;
|
||||
struct uio *uio;
|
||||
int ioflag;
|
||||
{
|
||||
int unit = AUDIOUNIT(dev);
|
||||
struct ucbsnd_softc *sc;
|
||||
int error = 0;
|
||||
|
||||
if (unit >= ucbsnd_cd.cd_ndevs ||
|
||||
(sc = ucbsnd_cd.cd_devs[unit]) == NULL)
|
||||
return (ENXIO);
|
||||
/* not supported yet */
|
||||
|
||||
return (error);
|
||||
}
|
||||
|
||||
int
|
||||
ucbsndwrite_subr(sc, buf, bufsize, uio)
|
||||
struct ucbsnd_softc *sc;
|
||||
u_int32_t *buf;
|
||||
size_t bufsize;
|
||||
struct uio *uio;
|
||||
{
|
||||
int i, s, error;
|
||||
|
||||
error = uiomove(buf, bufsize, uio);
|
||||
/*
|
||||
* inverse endian for UCB1200
|
||||
*/
|
||||
for (i = 0; i < bufsize / sizeof(int); i++)
|
||||
buf[i] = htobe32(buf[i]);
|
||||
MachFlushCache();
|
||||
|
||||
ringbuf_producer_return(&sc->sc_rb, bufsize);
|
||||
|
||||
s = splhigh();
|
||||
if (sc->sa_state == UCBSND_IDLE && ringbuf_full(&sc->sc_rb)) {
|
||||
sc->sa_transfer_mode = UCBSND_TRANSFERMODE_DMA;
|
||||
sc->sa_state = UCBSND_INIT;
|
||||
ucbsnd_exec_output((void*)sc);
|
||||
}
|
||||
splx(s);
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
int
|
||||
ucbsndwrite(dev, uio, ioflag)
|
||||
dev_t dev;
|
||||
struct uio *uio;
|
||||
int ioflag;
|
||||
{
|
||||
int unit = AUDIOUNIT(dev);
|
||||
struct ucbsnd_softc *sc;
|
||||
int len, error = 0;
|
||||
int i, n, rest;
|
||||
void *buf;
|
||||
|
||||
if (unit >= ucbsnd_cd.cd_ndevs ||
|
||||
(sc = ucbsnd_cd.cd_devs[unit]) == NULL)
|
||||
return (ENXIO);
|
||||
|
||||
len = uio->uio_resid;
|
||||
n = (len + TX39_SIBDMA_SIZE - 1) / TX39_SIBDMA_SIZE;
|
||||
rest = len % TX39_SIBDMA_SIZE;
|
||||
|
||||
if (rest)
|
||||
--n;
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
while (!(buf = ringbuf_producer_get(&sc->sc_rb)))
|
||||
tsleep(&sc->sc_rb, PRIBIO, "ucbsnd", 0);
|
||||
|
||||
error = ucbsndwrite_subr(sc, buf, TX39_SIBDMA_SIZE, uio);
|
||||
if (error)
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (rest) {
|
||||
while (!(buf = ringbuf_producer_get(&sc->sc_rb)))
|
||||
tsleep(&sc->sc_rb, PRIBIO, "ucbsnd", 0);
|
||||
|
||||
error = ucbsndwrite_subr(sc, buf, rest, uio);
|
||||
}
|
||||
|
||||
out:
|
||||
|
||||
return (error);
|
||||
}
|
||||
|
||||
int
|
||||
ucbsndioctl(dev, cmd, addr, flag, p)
|
||||
dev_t dev;
|
||||
u_long cmd;
|
||||
caddr_t addr;
|
||||
int flag;
|
||||
struct proc *p;
|
||||
{
|
||||
int error = 0;
|
||||
|
||||
/* not coded yet */
|
||||
|
||||
return (error);
|
||||
}
|
||||
|
||||
int
|
||||
ucbsndpoll(dev, events, p)
|
||||
dev_t dev;
|
||||
int events;
|
||||
struct proc *p;
|
||||
{
|
||||
int error = 0;
|
||||
|
||||
/* not coded yet */
|
||||
|
||||
return (error);
|
||||
}
|
||||
|
||||
int
|
||||
ucbsndmmap(dev, off, prot)
|
||||
dev_t dev;
|
||||
int off, prot;
|
||||
{
|
||||
int error = 0;
|
||||
|
||||
/* not coded yet */
|
||||
|
||||
return (error);
|
||||
}
|
||||
|
||||
/*
|
||||
* Ring buffer.
|
||||
*/
|
||||
int
|
||||
ringbuf_allocate(rb, blksize, maxblk)
|
||||
struct ring_buf *rb;
|
||||
size_t blksize;
|
||||
int maxblk;
|
||||
{
|
||||
rb->rb_bufsize = blksize * maxblk;
|
||||
rb->rb_blksize = blksize;
|
||||
rb->rb_maxblks = maxblk;
|
||||
#if notyet
|
||||
rb->rb_buf = (u_int32_t)malloc(rb->rb_bufsize, M_DEVBUF, M_WAITOK);
|
||||
#else
|
||||
rb->rb_buf = (u_int32_t)dmabuf_static;
|
||||
#endif
|
||||
if (rb->rb_buf == 0) {
|
||||
printf("ringbuf_allocate: can't allocate buffer\n");
|
||||
return 1;
|
||||
}
|
||||
memset((char*)rb->rb_buf, 0, rb->rb_bufsize);
|
||||
#if notyet
|
||||
rb->rb_bufcnt = malloc(rb->rb_maxblks * sizeof(size_t), M_DEVBUF,
|
||||
M_WAITOK);
|
||||
#else
|
||||
rb->rb_bufcnt = dmabufcnt_static;
|
||||
#endif
|
||||
if (rb->rb_bufcnt == 0) {
|
||||
printf("ringbuf_allocate: can't allocate buffer\n");
|
||||
return 1;
|
||||
}
|
||||
memset((char*)rb->rb_bufcnt, 0, rb->rb_maxblks * sizeof(size_t));
|
||||
|
||||
ringbuf_reset(rb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
ringbuf_deallocate(rb)
|
||||
struct ring_buf *rb;
|
||||
{
|
||||
#if notyet
|
||||
free((void*)rb->rb_buf, M_DEVBUF);
|
||||
free(rb->rb_bufcnt, M_DEVBUF);
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
ringbuf_reset(rb)
|
||||
struct ring_buf *rb;
|
||||
{
|
||||
rb->rb_outp = 0;
|
||||
rb->rb_inp = 0;
|
||||
}
|
||||
|
||||
int
|
||||
ringbuf_full(rb)
|
||||
struct ring_buf *rb;
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = rb->rb_outp == rb->rb_maxblks;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void*
|
||||
ringbuf_producer_get(rb)
|
||||
struct ring_buf *rb;
|
||||
{
|
||||
u_int32_t ret;
|
||||
int s;
|
||||
|
||||
s = splhigh();
|
||||
ret = ringbuf_full(rb) ? 0 :
|
||||
rb->rb_buf + rb->rb_inp * rb->rb_blksize;
|
||||
splx(s);
|
||||
|
||||
return (void*)ret;
|
||||
}
|
||||
|
||||
void
|
||||
ringbuf_producer_return(rb, cnt)
|
||||
struct ring_buf *rb;
|
||||
size_t cnt;
|
||||
{
|
||||
int s;
|
||||
|
||||
assert(cnt <= rb->rb_blksize);
|
||||
|
||||
s = splhigh();
|
||||
rb->rb_outp++;
|
||||
|
||||
rb->rb_bufcnt[rb->rb_inp] = cnt;
|
||||
rb->rb_inp = (rb->rb_inp + 1) % rb->rb_maxblks;
|
||||
splx(s);
|
||||
}
|
||||
|
||||
void*
|
||||
ringbuf_consumer_get(rb, cntp)
|
||||
struct ring_buf *rb;
|
||||
size_t *cntp;
|
||||
{
|
||||
u_int32_t p;
|
||||
int idx;
|
||||
|
||||
if (rb->rb_outp == 0)
|
||||
return 0;
|
||||
|
||||
idx = (rb->rb_inp - rb->rb_outp + rb->rb_maxblks) % rb->rb_maxblks;
|
||||
|
||||
p = rb->rb_buf + idx * rb->rb_blksize;
|
||||
*cntp = rb->rb_bufcnt[idx];
|
||||
|
||||
return (void*)p;
|
||||
}
|
||||
|
||||
void
|
||||
ringbuf_consumer_return(rb)
|
||||
struct ring_buf *rb;
|
||||
{
|
||||
|
||||
if (rb->rb_outp > 0)
|
||||
rb->rb_outp--;
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: conf.c,v 1.3 2000/02/29 19:08:54 augustss Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.4 2000/03/03 19:54:40 uch Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992, 1993
|
||||
@ -129,6 +129,8 @@ cdev_decl(ipl);
|
||||
cdev_decl(com);
|
||||
#include "tx39uart.h"
|
||||
cdev_decl(txcom);
|
||||
#include "ucbsnd.h"
|
||||
cdev_decl(ucbsnd);
|
||||
#if notyet
|
||||
#include "lpt.h"
|
||||
cdev_decl(lpt);
|
||||
@ -226,8 +228,13 @@ struct cdevsw cdevsw[] =
|
||||
#else
|
||||
cdev_notdef(),
|
||||
#endif
|
||||
#if NUCBSND > 0
|
||||
cdev_audio_init(NUCBSND,ucbsnd),/* 36: UCB1200 Codec (TX39 companion chip) */
|
||||
#else
|
||||
cdev_notdef(),
|
||||
#endif
|
||||
#if notyet
|
||||
cdev_tty_init(NUCOM, ucom), /* 36: USB tty */
|
||||
cdev_tty_init(NUCOM, ucom), /* 37: USB tty */
|
||||
#endif
|
||||
};
|
||||
|
||||
@ -294,6 +301,8 @@ static int chrtoblktbl[] = {
|
||||
/* 33 */ NODEV,
|
||||
/* 34 */ NODEV,
|
||||
/* 35 */ NODEV,
|
||||
/* 36 */ NODEV,
|
||||
/* 37 */ NODEV,
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: tx39sib.c,v 1.3 2000/01/16 21:47:01 uch Exp $ */
|
||||
/* $NetBSD: tx39sib.c,v 1.4 2000/03/03 19:54:36 uch Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000, by UCHIYAMA Yasushi
|
||||
@ -47,8 +47,8 @@
|
||||
#include "locators.h"
|
||||
|
||||
#ifdef TX39SIBDEBUG
|
||||
int tx39sib_debug = 0;
|
||||
#define DPRINTF(arg) if (tx39sib_debug) printf arg;
|
||||
int tx39sibdebug = 0;
|
||||
#define DPRINTF(arg) if (tx39sibdebug) printf arg;
|
||||
#else
|
||||
#define DPRINTF(arg)
|
||||
#endif
|
||||
@ -83,7 +83,7 @@ struct tx39sib_param {
|
||||
int sp_snd_rate; /* SNDFSDIV + 1 */
|
||||
int sp_tel_rate; /* TELFSDIV + 1 */
|
||||
/*
|
||||
* Fs = (SIBSCLK * 2) / ((FSDIV + 1) * 64
|
||||
* Fs = (SIBSCLK * 2) / ((FSDIV + 1) * 64)
|
||||
* FSDIV + 1 sampling rate
|
||||
* 15 19.2k (1.6% error vs. CD-XA)
|
||||
* 13 22.154k (0.47% error vs. CD-Audio)
|
||||
@ -94,9 +94,22 @@ struct tx39sib_param {
|
||||
int sp_sf0telmode;
|
||||
};
|
||||
|
||||
struct tx39sib_param tx39sib_param_default = {
|
||||
struct tx39sib_param tx39sib_param_default_3912 = {
|
||||
0, /* SIBSCLK = 9.216MHz */
|
||||
13, /* audio: CD-Audio */
|
||||
#if 0 /* setting sample */
|
||||
40, /* audio: 7.2kHz */
|
||||
26, /* audio: CD-Audio(/4) 11.077kHz*/
|
||||
6, /* audio: 48kHz */
|
||||
#endif
|
||||
13, /* audio: CD-Audio(/2 = 22.050) 22.154kHz*/
|
||||
40, /* telecom: 7.2kHz */
|
||||
TX39_SIBCTRL_SND16, /* Audio 16bit mono */
|
||||
TX39_SIBCTRL_TEL16 /* Telecom 16bit mono */
|
||||
};
|
||||
|
||||
struct tx39sib_param tx39sib_param_default_3922 = {
|
||||
0, /* SIBSCLK = 9.216MHz */
|
||||
13, /* audio: CD-Audio(/4) 11.077kHz */
|
||||
40, /* telecom: 7.2kHz */
|
||||
TX39_SIBCTRL_SND16, /* Audio 16bit mono */
|
||||
TX39_SIBCTRL_TEL16 /* Telecom 16bit mono */
|
||||
@ -111,7 +124,9 @@ struct tx39sib_softc {
|
||||
};
|
||||
|
||||
__inline int __txsibsf0_ready __P((tx_chipset_tag_t));
|
||||
#ifdef TX39SIBDEBUG
|
||||
void tx39sib_dump __P((struct tx39sib_softc*));
|
||||
#endif
|
||||
|
||||
struct cfattach tx39sib_ca = {
|
||||
sizeof(struct tx39sib_softc), tx39sib_match, tx39sib_attach
|
||||
@ -139,13 +154,20 @@ tx39sib_attach(parent, self, aux)
|
||||
sc->sc_tc = tc = ta->ta_tc;
|
||||
|
||||
/* set default param */
|
||||
sc->sc_param = tx39sib_param_default;
|
||||
#ifdef TX391X
|
||||
sc->sc_param = tx39sib_param_default_3912;
|
||||
#endif /* TX391X */
|
||||
#ifdef TX392X
|
||||
sc->sc_param = tx39sib_param_default_3922;
|
||||
#endif /* TX392X */
|
||||
|
||||
#define MHZ(a) ((a) / 1000000), (((a) % 1000000) / 1000)
|
||||
printf(": %d.%03d MHz", MHZ(tx39sib_clock(self)));
|
||||
|
||||
printf("\n");
|
||||
#ifdef TX39SIBDEBUG
|
||||
tx39sib_dump(sc);
|
||||
if (tx39sibdebug)
|
||||
tx39sib_dump(sc);
|
||||
#endif
|
||||
/* enable subframe0 */
|
||||
tx39sib_enable1(self);
|
||||
@ -153,7 +175,8 @@ tx39sib_attach(parent, self, aux)
|
||||
tx39sib_enable2(self);
|
||||
|
||||
#ifdef TX39SIBDEBUG
|
||||
tx39sib_dump(sc);
|
||||
if (tx39sibdebug)
|
||||
tx39sib_dump(sc);
|
||||
#endif
|
||||
|
||||
config_search(tx39sib_search, self, tx39sib_print);
|
||||
@ -304,12 +327,12 @@ __txsibsf0_ready(tc)
|
||||
|
||||
tx_conf_write(tc, TX39_INTRSTATUS1_REG, TX39_INTRSTATUS1_SIBSF0INT);
|
||||
for (i = 0; (!(tx_conf_read(tc, TX39_INTRSTATUS1_REG) &
|
||||
TX39_INTRSTATUS1_SIBSF0INT)) && i < 100; i++)
|
||||
TX39_INTRSTATUS1_SIBSF0INT)) && i < 200; i++)
|
||||
;
|
||||
if (i == 100) {
|
||||
if (i >= 200) {
|
||||
printf("sf0 busy\n");
|
||||
return 0;
|
||||
} else if (i > 50) {
|
||||
} else if (i > 100) {
|
||||
printf("sf0 busy loop:%d\n", i);
|
||||
return 0;
|
||||
}
|
||||
@ -366,10 +389,7 @@ txsibsf0_read(tc, addr)
|
||||
return reg;
|
||||
}
|
||||
|
||||
/*
|
||||
* debug functions.
|
||||
*/
|
||||
|
||||
#ifdef TX39SIBDEBUG
|
||||
#define ISSETPRINT_CTRL(r, m) \
|
||||
__is_set_print(r, TX39_SIBCTRL_##m, #m)
|
||||
#define ISSETPRINT_DMACTRL(r, m) \
|
||||
@ -417,3 +437,4 @@ tx39sib_dump(sc)
|
||||
printf("TELDMAPTR %d\n", TX39_SIBDMACTRL_SNDDMAPTR(reg));
|
||||
|
||||
}
|
||||
#endif /* TX39SIBDEBUG */
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: tx39sibreg.h,v 1.1 2000/01/08 21:07:03 uch Exp $ */
|
||||
/* $NetBSD: tx39sibreg.h,v 1.2 2000/03/03 19:54:37 uch Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2000, by UCHIYAMA Yasushi
|
||||
@ -43,6 +43,11 @@
|
||||
#define TX39_SIBSF1STAT_REG 0x08c /* R */
|
||||
#define TX39_SIBDMACTRL_REG 0x090 /* R/W */
|
||||
|
||||
/*
|
||||
* SIB DMA
|
||||
*/
|
||||
#define TX39_SIBDMA_SIZE 16384
|
||||
|
||||
/*
|
||||
* SIB Size Register
|
||||
*/
|
||||
@ -50,12 +55,12 @@
|
||||
#define TX39_SIBSIZE_TEL_SHIFT 2
|
||||
#define TX39_SIBSIZE_MASK 0xfff
|
||||
|
||||
#define TX39_SIBSIZE_SNDSIZE_SET(val) \
|
||||
(((((val) >> 2) - 1) << TX39_SIBSIZE_SND_SHIFT) & \
|
||||
(TX39_SIBSIZE_MASK << TX39_SIBSIZE_SND_SHIFT))
|
||||
#define TX39_SIBSIZE_TELSIZE_SET(val) \
|
||||
(((((val) >> 2) - 1) << TX39_SIBSIZE_TEL_SHIFT) & \
|
||||
(TX39_SIBSIZE_MASK << TX39_SIBSIZE_TEL_SHIFT))
|
||||
#define TX39_SIBSIZE_SNDSIZE_SET(cr, val) \
|
||||
((cr) | (((((val) >> 2) - 1) << TX39_SIBSIZE_SND_SHIFT) & \
|
||||
(TX39_SIBSIZE_MASK << TX39_SIBSIZE_SND_SHIFT)))
|
||||
#define TX39_SIBSIZE_TELSIZE_SET(cr, val) \
|
||||
((cr) | (((((val) >> 2) - 1) << TX39_SIBSIZE_TEL_SHIFT) & \
|
||||
(TX39_SIBSIZE_MASK << TX39_SIBSIZE_TEL_SHIFT)))
|
||||
|
||||
/*
|
||||
* SIB Sound RX Start Register
|
||||
|
||||
Loading…
Reference in New Issue
Block a user