From owner-freebsd-bugs Sun Aug 26 4:51:53 2001 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id B671E37B406 for ; Sun, 26 Aug 2001 04:50:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f7QBo2a68015; Sun, 26 Aug 2001 04:50:02 -0700 (PDT) (envelope-from gnats) Received: from pod.cse.unsw.edu.au (pod.cse.unsw.EDU.AU [129.94.172.95]) by hub.freebsd.org (Postfix) with ESMTP id AD45237B405 for ; Sun, 26 Aug 2001 04:45:01 -0700 (PDT) (envelope-from ada@pod.cse.unsw.edu.au) Received: (from ada@localhost) by pod.cse.unsw.edu.au (8.11.3/8.11.3) id f7QBj0g50172; Sun, 26 Aug 2001 11:45:00 GMT (envelope-from ada) Message-Id: <200108261145.f7QBj0g50172@pod.cse.unsw.edu.au> Date: Sun, 26 Aug 2001 11:45:00 GMT From: ada@unsw.edu.au Reply-To: ada@unsw.edu.au To: FreeBSD-gnats-submit@freebsd.org Cc: ada@unsw.edu.au X-Send-Pr-Version: 3.113 Subject: kern/30100: added support for SIS 630/730 soundcard Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 30100 >Category: kern >Synopsis: added support for SIS 630/730 soundcard >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Aug 26 04:50:02 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Ada Lim >Release: FreeBSD 4.3-RELEASE i386 >Organization: University of NSW >Environment: System: FreeBSD pod.cse.unsw.edu.au 4.3-RELEASE FreeBSD 4.3-RELEASE #0: Sat Apr 21 10:54:49 GMT 2001 jkh@narf.osd.bsdi.com:/usr/src/sys/compile/GENERIC i386 >Description: Patch for sys/dev/sound/pci/t4dwave.[ch] to support the SIS 7018 chip which is a part of the SiS 630/730 all-in-one mb chipset. (Apologies for broken diff) It plays mp3s now, which is all I care about (-: >How-To-Repeat: >Fix: *** t4dwave.c.old Sun Aug 26 11:42:18 2001 --- t4dwave.c Sun Aug 26 11:39:47 2001 *************** *** 23,30 **** * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * ! * $FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.9.2.4 2001/02/03 01:29:10 cg E ! xp $ */ #include --- 23,29 ---- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * ! * $FreeBSD: src/sys/dev/sound/pci/t4dwave.c,v 1.9.2.4 2001/02/03 01:29:10 cg Exp $ */ #include *************** *** 36,112 **** /* -------------------------------------------------------------------- */ ! #define TDX_PCI_ID 0x20001023 ! #define TNX_PCI_ID 0x20011023 ! #define TR_BUFFSIZE 0x1000 ! #define TR_TIMEOUT_CDC 0xffff ! #define TR_MAXPLAYCH 4 struct tr_info; /* channel registers */ struct tr_chinfo { ! u_int32_t cso, alpha, fms, fmc, ec; ! u_int32_t lba; ! u_int32_t eso, delta; ! u_int32_t rvol, cvol; ! u_int32_t gvsel, pan, vol, ctrl; ! int index, bufhalf; ! snd_dbuf *buffer; ! pcm_channel *channel; ! struct tr_info *parent; }; struct tr_rchinfo { ! u_int32_t delta; ! snd_dbuf *buffer; ! pcm_channel *channel; ! struct tr_info *parent; }; /* device private data */ struct tr_info { ! u_int32_t type; ! bus_space_tag_t st; ! bus_space_handle_t sh; ! bus_dma_tag_t parent_dmat; ! ! struct resource *reg, *irq; ! int regtype, regid, irqid; ! void *ih; ! ! u_int32_t playchns; ! struct tr_chinfo chinfo[TR_MAXPLAYCH]; ! struct tr_rchinfo recchinfo; }; /* -------------------------------------------------------------------- */ static u_int32_t tr_recfmt[] = { ! AFMT_U8, ! AFMT_STEREO | AFMT_U8, ! AFMT_S8, ! AFMT_STEREO | AFMT_S8, ! AFMT_S16_LE, ! AFMT_STEREO | AFMT_S16_LE, ! AFMT_U16_LE, ! AFMT_STEREO | AFMT_U16_LE, ! 0 }; static pcmchan_caps tr_reccaps = {4000, 48000, tr_recfmt, 0}; static u_int32_t tr_playfmt[] = { ! AFMT_U8, ! AFMT_STEREO | AFMT_U8, ! AFMT_S8, ! AFMT_STEREO | AFMT_S8, ! AFMT_S16_LE, ! AFMT_STEREO | AFMT_S16_LE, ! AFMT_U16_LE, ! AFMT_STEREO | AFMT_U16_LE, ! 0 }; static pcmchan_caps tr_playcaps = {4000, 48000, tr_playfmt, 0}; --- 35,121 ---- /* -------------------------------------------------------------------- */ ! #define PCI_VENDOR_SIS 0x1039 ! #define PCI_VENDOR_TRIDENT 0x1023 ! #define TRIDENT_DX 0x2000 ! #define TRIDENT_NX 0x2001 ! #define SIS_7018 0x7018 ! ! #define PCI_MAKE_DEVID(vendor, dev) ((dev)<<16|(vendor)) ! #define TDX_PCI_ID PCI_MAKE_DEVID(PCI_VENDOR_TRIDENT, TRIDENT_DX) ! #define TNX_PCI_ID PCI_MAKE_DEVID(PCI_VENDOR_TRIDENT, TRIDENT_NX) ! #define SPA_PCI_ID PCI_MAKE_DEVID(PCI_VENDOR_SIS, SIS_7018) ! ! ! #define TR_BUFFSIZE 0x1000 ! #define TR_TIMEOUT_CDC 0xffff ! #define TR_MAXPLAYCH 4 struct tr_info; /* channel registers */ struct tr_chinfo { ! u_int32_t cso, alpha, fms, fmc, ec; ! u_int32_t lba; ! u_int32_t eso, delta; ! u_int32_t rvol, cvol; ! u_int32_t gvsel, pan, vol, ctrl; ! int index, bufhalf; ! snd_dbuf *buffer; ! pcm_channel *channel; ! struct tr_info *parent; }; struct tr_rchinfo { ! u_int32_t delta; ! snd_dbuf *buffer; ! pcm_channel *channel; ! struct tr_info *parent; }; /* device private data */ struct tr_info { ! u_int32_t type; ! bus_space_tag_t st; ! bus_space_handle_t sh; ! bus_dma_tag_t parent_dmat; ! ! struct resource *reg, *irq; ! int regtype, regid, irqid; ! void *ih; ! ! u_int32_t playchns; ! struct tr_chinfo chinfo[TR_MAXPLAYCH]; ! struct tr_rchinfo recchinfo; }; /* -------------------------------------------------------------------- */ static u_int32_t tr_recfmt[] = { ! AFMT_U8, ! AFMT_STEREO | AFMT_U8, ! AFMT_S8, ! AFMT_STEREO | AFMT_S8, ! AFMT_S16_LE, ! AFMT_STEREO | AFMT_S16_LE, ! AFMT_U16_LE, ! AFMT_STEREO | AFMT_U16_LE, ! 0 }; static pcmchan_caps tr_reccaps = {4000, 48000, tr_recfmt, 0}; static u_int32_t tr_playfmt[] = { ! AFMT_U8, ! AFMT_STEREO | AFMT_U8, ! AFMT_S8, ! AFMT_STEREO | AFMT_S8, ! AFMT_S16_LE, ! AFMT_STEREO | AFMT_S16_LE, ! AFMT_U16_LE, ! AFMT_STEREO | AFMT_U16_LE, ! 0 }; static pcmchan_caps tr_playcaps = {4000, 48000, tr_playfmt, 0}; *************** *** 117,148 **** static u_int32_t tr_rd(struct tr_info *tr, int regno, int size) { ! switch(size) { ! case 1: ! return bus_space_read_1(tr->st, tr->sh, regno); ! case 2: ! return bus_space_read_2(tr->st, tr->sh, regno); ! case 4: ! return bus_space_read_4(tr->st, tr->sh, regno); ! default: ! return 0xffffffff; ! } } static void tr_wr(struct tr_info *tr, int regno, u_int32_t data, int size) { ! switch(size) { ! case 1: ! bus_space_write_1(tr->st, tr->sh, regno, data); ! break; ! case 2: ! bus_space_write_2(tr->st, tr->sh, regno, data); ! break; ! case 4: ! bus_space_write_4(tr->st, tr->sh, regno, data); ! break; ! } } /* -------------------------------------------------------------------- */ --- 126,157 ---- static u_int32_t tr_rd(struct tr_info *tr, int regno, int size) { ! switch(size) { ! case 1: ! return bus_space_read_1(tr->st, tr->sh, regno); ! case 2: ! return bus_space_read_2(tr->st, tr->sh, regno); ! case 4: ! return bus_space_read_4(tr->st, tr->sh, regno); ! default: ! return 0xffffffff; ! } } static void tr_wr(struct tr_info *tr, int regno, u_int32_t data, int size) { ! switch(size) { ! case 1: ! bus_space_write_1(tr->st, tr->sh, regno, data); ! break; ! case 2: ! bus_space_write_2(tr->st, tr->sh, regno, data); ! break; ! case 4: ! bus_space_write_4(tr->st, tr->sh, regno, data); ! break; ! } } /* -------------------------------------------------------------------- */ *************** *** 151,220 **** static int tr_rdcd(kobj_t obj, void *devinfo, int regno) { ! struct tr_info *tr = (struct tr_info *)devinfo; ! int i, j, treg, trw; ! switch (tr->type) { ! case TDX_PCI_ID: ! treg=TDX_REG_CODECRD; ! trw=TDX_CDC_RWSTAT; ! break; ! case TNX_PCI_ID: ! treg=(regno & 0x100)? TNX_REG_CODEC2RD : TNX_REG_CODEC1RD; ! trw=TNX_CDC_RWSTAT; ! break; ! default: ! printf("!!! tr_rdcd defaulted !!!\n"); ! return -1; ! } ! ! regno &= 0x7f; ! tr_wr(tr, treg, regno | trw, 4); ! j=trw; ! for (i=TR_TIMEOUT_CDC; (i > 0) && (j & trw); i--) j=tr_rd(tr, treg, 4); ! if (i == 0) printf("codec timeout during read of register %x\n", regno) ! ; ! return (j >> TR_CDC_DATA) & 0xffff; } static int tr_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data) { ! struct tr_info *tr = (struct tr_info *)devinfo; ! int i, j, treg, trw; ! switch (tr->type) { ! case TDX_PCI_ID: ! treg=TDX_REG_CODECWR; ! trw=TDX_CDC_RWSTAT; ! break; ! case TNX_PCI_ID: ! treg=TNX_REG_CODECWR; ! trw=TNX_CDC_RWSTAT | ((regno & 0x100)? TNX_CDC_SEC : 0); ! break; ! default: ! printf("!!! tr_wrcd defaulted !!!"); ! return -1; ! } ! regno &= 0x7f; #if 0 ! printf("tr_wrcd: reg %x was %x", regno, tr_rdcd(devinfo, regno)); #endif ! j=trw; ! for (i=TR_TIMEOUT_CDC; (i>0) && (j & trw); i--) j=tr_rd(tr, treg, 4); ! tr_wr(tr, treg, (data << TR_CDC_DATA) | regno | trw, 4); #if 0 ! printf(" - wrote %x, now %x\n", data, tr_rdcd(devinfo, regno)); #endif ! if (i==0) printf("codec timeout writing %x, data %x\n", regno, data); ! return (i > 0)? 0 : -1; } static kobj_method_t tr_ac97_methods[] = { ! KOBJMETHOD(ac97_read, tr_rdcd), ! KOBJMETHOD(ac97_write, tr_wrcd), ! { 0, 0 } }; AC97_DECLARE(tr_ac97); --- 160,236 ---- static int tr_rdcd(kobj_t obj, void *devinfo, int regno) { ! struct tr_info *tr = (struct tr_info *)devinfo; ! int i, j, treg, trw; ! switch (tr->type) { ! case SPA_PCI_ID: ! treg=SPA_REG_CODECRD; ! trw=SPA_CDC_RWSTAT; ! break; ! case TDX_PCI_ID: ! treg=TDX_REG_CODECRD; ! trw=TDX_CDC_RWSTAT; ! break; ! case TNX_PCI_ID: ! treg=(regno & 0x100)? TNX_REG_CODEC2RD : TNX_REG_CODEC1RD; ! trw=TNX_CDC_RWSTAT; ! break; ! default: ! printf("!!! tr_rdcd defaulted !!!\n"); ! return -1; ! } ! ! regno &= 0x7f; ! tr_wr(tr, treg, regno | trw, 4); ! j=trw; ! for (i=TR_TIMEOUT_CDC; (i > 0) && (j & trw); i--) j=tr_rd(tr, treg, 4); ! if (i == 0) printf("codec timeout during read of register %x\n", regno); ! return (j >> TR_CDC_DATA) & 0xffff; } static int tr_wrcd(kobj_t obj, void *devinfo, int regno, u_int32_t data) { ! struct tr_info *tr = (struct tr_info *)devinfo; ! int i, j, treg, trw; ! switch (tr->type) { ! case SPA_PCI_ID: ! treg=SPA_REG_CODECWR; ! trw=SPA_CDC_RWSTAT; ! break; ! case TDX_PCI_ID: ! treg=TDX_REG_CODECWR; ! trw=TDX_CDC_RWSTAT; ! break; ! case TNX_PCI_ID: ! treg=TNX_REG_CODECWR; ! trw=TNX_CDC_RWSTAT | ((regno & 0x100)? TNX_CDC_SEC : 0); ! break; ! default: ! printf("!!! tr_wrcd defaulted !!!"); ! return -1; ! } ! regno &= 0x7f; #if 0 ! printf("tr_wrcd: reg %x was %x", regno, tr_rdcd(devinfo, regno)); #endif ! j=trw; ! for (i=TR_TIMEOUT_CDC; (i>0) && (j & trw); i--) j=tr_rd(tr, treg, 4); ! tr_wr(tr, treg, (data << TR_CDC_DATA) | regno | trw, 4); #if 0 ! printf(" - wrote %x, now %x\n", data, tr_rdcd(devinfo, regno)); #endif ! if (i==0) printf("codec timeout writing %x, data %x\n", regno, data); ! return (i > 0)? 0 : -1; } static kobj_method_t tr_ac97_methods[] = { ! KOBJMETHOD(ac97_read, tr_rdcd), ! KOBJMETHOD(ac97_write, tr_wrcd), ! { 0, 0 } }; AC97_DECLARE(tr_ac97); *************** *** 225,268 **** static u_int32_t tr_testint(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int bank, chan; ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! return tr_rd(tr, bank? TR_REG_ADDRINTB : TR_REG_ADDRINTA, 4) & (1 << ch ! an); } #endif static void tr_clrint(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int bank, chan; ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! tr_wr(tr, bank? TR_REG_ADDRINTB : TR_REG_ADDRINTA, 1 << chan, 4); } static void tr_enaint(struct tr_chinfo *ch, int enable) { ! struct tr_info *tr = ch->parent; ! u_int32_t i, reg; ! int bank, chan; ! ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! reg = bank? TR_REG_INTENB : TR_REG_INTENA; ! ! i = tr_rd(tr, reg, 4); ! i &= ~(1 << chan); ! i |= (enable? 1 : 0) << chan; ! tr_clrint(ch); ! tr_wr(tr, reg, i, 4); } /* playback channels */ --- 241,283 ---- static u_int32_t tr_testint(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int bank, chan; ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! return tr_rd(tr, bank? TR_REG_ADDRINTB : TR_REG_ADDRINTA, 4) & (1 << chan); } #endif static void tr_clrint(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int bank, chan; ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! tr_wr(tr, bank? TR_REG_ADDRINTB : TR_REG_ADDRINTA, 1 << chan, 4); } static void tr_enaint(struct tr_chinfo *ch, int enable) { ! struct tr_info *tr = ch->parent; ! u_int32_t i, reg; ! int bank, chan; ! ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! reg = bank? TR_REG_INTENB : TR_REG_INTENA; ! ! i = tr_rd(tr, reg, 4); ! i &= ~(1 << chan); ! i |= (enable? 1 : 0) << chan; ! tr_clrint(ch); ! tr_wr(tr, reg, i, 4); } /* playback channels */ *************** *** 270,400 **** static void tr_selch(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int i; ! i = tr_rd(tr, TR_REG_CIR, 4); ! i &= ~TR_CIR_MASK; ! i |= ch->index & 0x3f; ! tr_wr(tr, TR_REG_CIR, i, 4); } static void tr_startch(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int bank, chan; ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! tr_wr(tr, bank? TR_REG_STARTB : TR_REG_STARTA, 1 << chan, 4); } static void tr_stopch(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int bank, chan; ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! tr_wr(tr, bank? TR_REG_STOPB : TR_REG_STOPA, 1 << chan, 4); } static void tr_wrch(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! u_int32_t cr[TR_CHN_REGS], i; ! ch->gvsel &= 0x00000001; ! ch->fmc &= 0x00000003; ! ch->fms &= 0x0000000f; ! ch->ctrl &= 0x0000000f; ! ch->pan &= 0x0000007f; ! ch->rvol &= 0x0000007f; ! ch->cvol &= 0x0000007f; ! ch->vol &= 0x000000ff; ! ch->ec &= 0x00000fff; ! ch->alpha &= 0x00000fff; ! ch->delta &= 0x0000ffff; ! ch->lba &= 0x3fffffff; ! ! cr[1]=ch->lba; ! cr[3]=(ch->fmc<<14) | (ch->rvol<<7) | (ch->cvol); ! cr[4]=(ch->gvsel<<31) | (ch->pan<<24) | (ch->vol<<16) | (ch->ctrl<<12) ! | (ch->ec); ! ! switch (tr->type) { ! case TDX_PCI_ID: ! ch->cso &= 0x0000ffff; ! ch->eso &= 0x0000ffff; ! cr[0]=(ch->cso<<16) | (ch->alpha<<4) | (ch->fms); ! cr[2]=(ch->eso<<16) | (ch->delta); ! break; ! case TNX_PCI_ID: ! ch->cso &= 0x00ffffff; ! ch->eso &= 0x00ffffff; ! cr[0]=((ch->delta & 0xff)<<24) | (ch->cso); ! cr[2]=((ch->delta>>16)<<24) | (ch->eso); ! cr[3]|=(ch->alpha<<20) | (ch->fms<<16) | (ch->fmc<<14); ! break; ! } ! tr_selch(ch); ! for (i=0; iparent; ! u_int32_t cr[5], i; ! tr_selch(ch); ! for (i=0; i<5; i++) ! cr[i]=tr_rd(tr, TR_REG_CHNBASE+(i<<2), 4); ! ! ! ch->lba= (cr[1] & 0x3fffffff); ! ch->fmc= (cr[3] & 0x0000c000) >> 14; ! ch->rvol= (cr[3] & 0x00003f80) >> 7; ! ch->cvol= (cr[3] & 0x0000007f); ! ch->gvsel= (cr[4] & 0x80000000) >> 31; ! ch->pan= (cr[4] & 0x7f000000) >> 24; ! ch->vol= (cr[4] & 0x00ff0000) >> 16; ! ch->ctrl= (cr[4] & 0x0000f000) >> 12; ! ch->ec= (cr[4] & 0x00000fff); ! switch(tr->type) { ! case TDX_PCI_ID: ! ch->cso= (cr[0] & 0xffff0000) >> 16; ! ch->alpha= (cr[0] & 0x0000fff0) >> 4; ! ch->fms= (cr[0] & 0x0000000f); ! ch->eso= (cr[2] & 0xffff0000) >> 16; ! ch->delta= (cr[2] & 0x0000ffff); ! break; ! case TNX_PCI_ID: ! ch->cso= (cr[0] & 0x00ffffff); ! ch->eso= (cr[2] & 0x00ffffff); ! ch->delta= ((cr[2] & 0xff000000) >> 16) | ((cr[0] & 0xff00 ! 0000) >> 24); ! ch->alpha= (cr[3] & 0xfff00000) >> 20; ! ch->fms= (cr[3] & 0x000f0000) >> 16; ! break; ! } } static u_int32_t tr_fmttobits(u_int32_t fmt) { ! u_int32_t bits; ! bits = 0; ! bits |= (fmt & AFMT_SIGNED)? 0x2 : 0; ! bits |= (fmt & AFMT_STEREO)? 0x4 : 0; ! bits |= (fmt & AFMT_16BIT)? 0x8 : 0; ! return bits; } /* -------------------------------------------------------------------- */ --- 285,415 ---- static void tr_selch(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int i; ! i = tr_rd(tr, TR_REG_CIR, 4); ! i &= ~TR_CIR_MASK; ! i |= ch->index & 0x3f; ! tr_wr(tr, TR_REG_CIR, i, 4); } static void tr_startch(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int bank, chan; ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! tr_wr(tr, bank? TR_REG_STARTB : TR_REG_STARTA, 1 << chan, 4); } static void tr_stopch(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! int bank, chan; ! bank = (ch->index & 0x20) ? 1 : 0; ! chan = ch->index & 0x1f; ! tr_wr(tr, bank? TR_REG_STOPB : TR_REG_STOPA, 1 << chan, 4); } static void tr_wrch(struct tr_chinfo *ch) { ! struct tr_info *tr = ch->parent; ! u_int32_t cr[TR_CHN_REGS], i; ! ch->gvsel &= 0x00000001; ! ch->fmc &= 0x00000003; ! ch->fms &= 0x0000000f; ! ch->ctrl &= 0x0000000f; ! ch->pan &= 0x0000007f; ! ch->rvol &= 0x0000007f; ! ch->cvol &= 0x0000007f; ! ch->vol &= 0x000000ff; ! ch->ec &= 0x00000fff; ! ch->alpha &= 0x00000fff; ! ch->delta &= 0x0000ffff; ! ch->lba &= 0x3fffffff; ! ! cr[1]=ch->lba; ! cr[3]=(ch->fmc<<14) | (ch->rvol<<7) | (ch->cvol); ! cr[4]=(ch->gvsel<<31) | (ch->pan<<24) | (ch->vol<<16) | (ch->ctrl<<12) | (ch->ec); ! ! switch (tr->type) { ! case TDX_PCI_ID: ! case SPA_PCI_ID: ! ch->cso &= 0x0000ffff; ! ch->eso &= 0x0000ffff; ! cr[0]=(ch->cso<<16) | (ch->alpha<<4) | (ch->fms); ! cr[2]=(ch->eso<<16) | (ch->delta); ! break; ! case TNX_PCI_ID: ! ch->cso &= 0x00ffffff; ! ch->eso &= 0x00ffffff; ! cr[0]=((ch->delta & 0xff)<<24) | (ch->cso); ! cr[2]=((ch->delta>>16)<<24) | (ch->eso); ! cr[3]|=(ch->alpha<<20) | (ch->fms<<16) | (ch->fmc<<14); ! break; ! } ! tr_selch(ch); ! for (i=0; iparent; ! u_int32_t cr[5], i; ! tr_selch(ch); ! for (i=0; i<5; i++) ! cr[i]=tr_rd(tr, TR_REG_CHNBASE+(i<<2), 4); ! ! ! ch->lba= (cr[1] & 0x3fffffff); ! ch->fmc= (cr[3] & 0x0000c000) >> 14; ! ch->rvol= (cr[3] & 0x00003f80) >> 7; ! ch->cvol= (cr[3] & 0x0000007f); ! ch->gvsel= (cr[4] & 0x80000000) >> 31; ! ch->pan= (cr[4] & 0x7f000000) >> 24; ! ch->vol= (cr[4] & 0x00ff0000) >> 16; ! ch->ctrl= (cr[4] & 0x0000f000) >> 12; ! ch->ec= (cr[4] & 0x00000fff); ! switch(tr->type) { ! case TDX_PCI_ID: ! case SPA_PCI_ID: ! ch->cso= (cr[0] & 0xffff0000) >> 16; ! ch->alpha= (cr[0] & 0x0000fff0) >> 4; ! ch->fms= (cr[0] & 0x0000000f); ! ch->eso= (cr[2] & 0xffff0000) >> 16; ! ch->delta= (cr[2] & 0x0000ffff); ! break; ! case TNX_PCI_ID: ! ch->cso= (cr[0] & 0x00ffffff); ! ch->eso= (cr[2] & 0x00ffffff); ! ch->delta= ((cr[2] & 0xff000000) >> 16) | ((cr[0] & 0xff000000) >> 24); ! ch->alpha= (cr[3] & 0xfff00000) >> 20; ! ch->fms= (cr[3] & 0x000f0000) >> 16; ! break; ! } } static u_int32_t tr_fmttobits(u_int32_t fmt) { ! u_int32_t bits; ! bits = 0; ! bits |= (fmt & AFMT_SIGNED)? 0x2 : 0; ! bits |= (fmt & AFMT_STEREO)? 0x4 : 0; ! bits |= (fmt & AFMT_16BIT)? 0x8 : 0; ! return bits; } /* -------------------------------------------------------------------- */ *************** *** 403,506 **** static void * trpchan_init(kobj_t obj, void *devinfo, snd_dbuf *b, pcm_channel *c, int dir) { ! struct tr_info *tr = devinfo; ! struct tr_chinfo *ch; ! KASSERT(dir == PCMDIR_PLAY, ("trpchan_init: bad direction")); ! ch = &tr->chinfo[tr->playchns]; ! ch->index = tr->playchns++; ! ch->buffer = b; ! ch->parent = tr; ! ch->channel = c; ! if (sndbuf_alloc(ch->buffer, tr->parent_dmat, TR_BUFFSIZE) == -1) ! return NULL; ! return ch; } static int trpchan_setformat(kobj_t obj, void *data, u_int32_t format) { ! struct tr_chinfo *ch = data; ! ch->ctrl = tr_fmttobits(format) | 0x01; ! return 0; } static int trpchan_setspeed(kobj_t obj, void *data, u_int32_t speed) { ! struct tr_chinfo *ch = data; ! ch->delta = (speed << 12) / 48000; ! return (ch->delta * 48000) >> 12; } static int trpchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) { ! struct tr_chinfo *ch = data; ! sndbuf_resize(ch->buffer, 2, blocksize); ! return blocksize; } static int trpchan_trigger(kobj_t obj, void *data, int go) { ! struct tr_chinfo *ch = data; ! if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) ! return 0; ! if (go == PCMTRIG_START) { ! ch->fmc = 3; ! ch->fms = 0; ! ch->ec = 0; ! ch->alpha = 0; ! ch->lba = vtophys(sndbuf_getbuf(ch->buffer)); ! ch->cso = 0; ! ch->eso = (sndbuf_getsize(ch->buffer) / sndbuf_getbps(ch->buffe ! r)) - 1; ! ch->rvol = ch->cvol = 0x7f; ! ch->gvsel = 0; ! ch->pan = 0; ! ch->vol = 0; ! ch->bufhalf = 0; ! tr_wrch(ch); ! tr_enaint(ch, 1); ! tr_startch(ch); ! } else ! tr_stopch(ch); ! return 0; } static int trpchan_getptr(kobj_t obj, void *data) { ! struct tr_chinfo *ch = data; ! tr_rdch(ch); ! return ch->cso * sndbuf_getbps(ch->buffer); } static pcmchan_caps * trpchan_getcaps(kobj_t obj, void *data) { ! return &tr_playcaps; } static kobj_method_t trpchan_methods[] = { ! KOBJMETHOD(channel_init, trpchan_init), ! KOBJMETHOD(channel_setformat, trpchan_setformat), ! KOBJMETHOD(channel_setspeed, trpchan_setspeed), ! KOBJMETHOD(channel_setblocksize, trpchan_setblocksize), ! KOBJMETHOD(channel_trigger, trpchan_trigger), ! KOBJMETHOD(channel_getptr, trpchan_getptr), ! KOBJMETHOD(channel_getcaps, trpchan_getcaps), ! { 0, 0 } }; CHANNEL_DECLARE(trpchan); --- 418,520 ---- static void * trpchan_init(kobj_t obj, void *devinfo, snd_dbuf *b, pcm_channel *c, int dir) { ! struct tr_info *tr = devinfo; ! struct tr_chinfo *ch; ! KASSERT(dir == PCMDIR_PLAY, ("trpchan_init: bad direction")); ! ch = &tr->chinfo[tr->playchns]; ! ch->index = tr->playchns++; ! ch->buffer = b; ! ch->parent = tr; ! ch->channel = c; ! if (sndbuf_alloc(ch->buffer, tr->parent_dmat, TR_BUFFSIZE) == -1) ! return NULL; ! return ch; } static int trpchan_setformat(kobj_t obj, void *data, u_int32_t format) { ! struct tr_chinfo *ch = data; ! ch->ctrl = tr_fmttobits(format) | 0x01; ! return 0; } static int trpchan_setspeed(kobj_t obj, void *data, u_int32_t speed) { ! struct tr_chinfo *ch = data; ! ch->delta = (speed << 12) / 48000; ! return (ch->delta * 48000) >> 12; } static int trpchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) { ! struct tr_chinfo *ch = data; ! sndbuf_resize(ch->buffer, 2, blocksize); ! return blocksize; } static int trpchan_trigger(kobj_t obj, void *data, int go) { ! struct tr_chinfo *ch = data; ! if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) ! return 0; ! if (go == PCMTRIG_START) { ! ch->fmc = 3; ! ch->fms = 0; ! ch->ec = 0; ! ch->alpha = 0; ! ch->lba = vtophys(sndbuf_getbuf(ch->buffer)); ! ch->cso = 0; ! ch->eso = (sndbuf_getsize(ch->buffer) / sndbuf_getbps(ch->buffer)) - 1; ! ch->rvol = ch->cvol = 0x7f; ! ch->gvsel = 0; ! ch->pan = 0; ! ch->vol = 0; ! ch->bufhalf = 0; ! tr_wrch(ch); ! tr_enaint(ch, 1); ! tr_startch(ch); ! } else ! tr_stopch(ch); ! return 0; } static int trpchan_getptr(kobj_t obj, void *data) { ! struct tr_chinfo *ch = data; ! tr_rdch(ch); ! return ch->cso * sndbuf_getbps(ch->buffer); } static pcmchan_caps * trpchan_getcaps(kobj_t obj, void *data) { ! return &tr_playcaps; } static kobj_method_t trpchan_methods[] = { ! KOBJMETHOD(channel_init, trpchan_init), ! KOBJMETHOD(channel_setformat, trpchan_setformat), ! KOBJMETHOD(channel_setspeed, trpchan_setspeed), ! KOBJMETHOD(channel_setblocksize, trpchan_setblocksize), ! KOBJMETHOD(channel_trigger, trpchan_trigger), ! KOBJMETHOD(channel_getptr, trpchan_getptr), ! KOBJMETHOD(channel_getcaps, trpchan_getcaps), ! { 0, 0 } }; CHANNEL_DECLARE(trpchan); *************** *** 510,626 **** static void * trrchan_init(kobj_t obj, void *devinfo, snd_dbuf *b, pcm_channel *c, int dir) { ! struct tr_info *tr = devinfo; ! struct tr_rchinfo *ch; ! KASSERT(dir == PCMDIR_REC, ("trrchan_init: bad direction")); ! ch = &tr->recchinfo; ! ch->buffer = b; ! ch->parent = tr; ! ch->channel = c; ! if (sndbuf_alloc(ch->buffer, tr->parent_dmat, TR_BUFFSIZE) == -1) ! return NULL; ! return ch; } static int trrchan_setformat(kobj_t obj, void *data, u_int32_t format) { ! struct tr_rchinfo *ch = data; ! struct tr_info *tr = ch->parent; ! u_int32_t i, bits; ! ! bits = tr_fmttobits(format); ! /* set # of samples between interrupts */ ! i = (sndbuf_runsz(ch->buffer) >> ((bits & 0x08)? 1 : 0)) - 1; ! tr_wr(tr, TR_REG_SBBL, i | (i << 16), 4); ! /* set sample format */ ! i = 0x18 | (bits << 4); ! tr_wr(tr, TR_REG_SBCTRL, i, 1); ! return 0; } static int trrchan_setspeed(kobj_t obj, void *data, u_int32_t speed) { ! struct tr_rchinfo *ch = data; ! struct tr_info *tr = ch->parent; ! /* setup speed */ ! ch->delta = (48000 << 12) / speed; ! tr_wr(tr, TR_REG_SBDELTA, ch->delta, 2); ! /* return closest possible speed */ ! return (48000 << 12) / ch->delta; } static int trrchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) { ! struct tr_rchinfo *ch = data; ! sndbuf_resize(ch->buffer, 2, blocksize); ! return blocksize; } static int trrchan_trigger(kobj_t obj, void *data, int go) { ! struct tr_rchinfo *ch = data; ! struct tr_info *tr = ch->parent; ! u_int32_t i; ! ! if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) ! return 0; ! ! if (go == PCMTRIG_START) { ! /* set up dma mode regs */ ! tr_wr(tr, TR_REG_DMAR15, 0, 1); ! i = tr_rd(tr, TR_REG_DMAR11, 1) & 0x03; ! tr_wr(tr, TR_REG_DMAR11, i | 0x54, 1); ! /* set up base address */ ! tr_wr(tr, TR_REG_DMAR0, vtophys(sndbuf_getbuf(ch->buffer)), 4); ! /* set up buffer size */ ! i = tr_rd(tr, TR_REG_DMAR4, 4) & ~0x00ffffff; ! tr_wr(tr, TR_REG_DMAR4, i | (sndbuf_runsz(ch->buffer) - 1), 4); ! /* start */ ! tr_wr(tr, TR_REG_SBCTRL, tr_rd(tr, TR_REG_SBCTRL, 1) | 1, 1); ! } else ! tr_wr(tr, TR_REG_SBCTRL, tr_rd(tr, TR_REG_SBCTRL, 1) & ~7, 1); ! /* return 0 if ok */ ! return 0; } static int trrchan_getptr(kobj_t obj, void *data) { ! struct tr_rchinfo *ch = data; ! struct tr_info *tr = ch->parent; ! /* return current byte offset of channel */ ! return tr_rd(tr, TR_REG_DMAR0, 4) - vtophys(sndbuf_getbuf(ch->buffer)); } static pcmchan_caps * trrchan_getcaps(kobj_t obj, void *data) { ! return &tr_reccaps; } static kobj_method_t trrchan_methods[] = { ! KOBJMETHOD(channel_init, trrchan_init), ! KOBJMETHOD(channel_setformat, trrchan_setformat), ! KOBJMETHOD(channel_setspeed, trrchan_setspeed), ! KOBJMETHOD(channel_setblocksize, trrchan_setblocksize), ! KOBJMETHOD(channel_trigger, trrchan_trigger), ! KOBJMETHOD(channel_getptr, trrchan_getptr), ! KOBJMETHOD(channel_getcaps, trrchan_getcaps), ! { 0, 0 } }; CHANNEL_DECLARE(trrchan); --- 524,640 ---- static void * trrchan_init(kobj_t obj, void *devinfo, snd_dbuf *b, pcm_channel *c, int dir) { ! struct tr_info *tr = devinfo; ! struct tr_rchinfo *ch; ! KASSERT(dir == PCMDIR_REC, ("trrchan_init: bad direction")); ! ch = &tr->recchinfo; ! ch->buffer = b; ! ch->parent = tr; ! ch->channel = c; ! if (sndbuf_alloc(ch->buffer, tr->parent_dmat, TR_BUFFSIZE) == -1) ! return NULL; ! return ch; } static int trrchan_setformat(kobj_t obj, void *data, u_int32_t format) { ! struct tr_rchinfo *ch = data; ! struct tr_info *tr = ch->parent; ! u_int32_t i, bits; ! ! bits = tr_fmttobits(format); ! /* set # of samples between interrupts */ ! i = (sndbuf_runsz(ch->buffer) >> ((bits & 0x08)? 1 : 0)) - 1; ! tr_wr(tr, TR_REG_SBBL, i | (i << 16), 4); ! /* set sample format */ ! i = 0x18 | (bits << 4); ! tr_wr(tr, TR_REG_SBCTRL, i, 1); ! return 0; } static int trrchan_setspeed(kobj_t obj, void *data, u_int32_t speed) { ! struct tr_rchinfo *ch = data; ! struct tr_info *tr = ch->parent; ! /* setup speed */ ! ch->delta = (48000 << 12) / speed; ! tr_wr(tr, TR_REG_SBDELTA, ch->delta, 2); ! /* return closest possible speed */ ! return (48000 << 12) / ch->delta; } static int trrchan_setblocksize(kobj_t obj, void *data, u_int32_t blocksize) { ! struct tr_rchinfo *ch = data; ! sndbuf_resize(ch->buffer, 2, blocksize); ! return blocksize; } static int trrchan_trigger(kobj_t obj, void *data, int go) { ! struct tr_rchinfo *ch = data; ! struct tr_info *tr = ch->parent; ! u_int32_t i; ! ! if (go == PCMTRIG_EMLDMAWR || go == PCMTRIG_EMLDMARD) ! return 0; ! ! if (go == PCMTRIG_START) { ! /* set up dma mode regs */ ! tr_wr(tr, TR_REG_DMAR15, 0, 1); ! i = tr_rd(tr, TR_REG_DMAR11, 1) & 0x03; ! tr_wr(tr, TR_REG_DMAR11, i | 0x54, 1); ! /* set up base address */ ! tr_wr(tr, TR_REG_DMAR0, vtophys(sndbuf_getbuf(ch->buffer)), 4); ! /* set up buffer size */ ! i = tr_rd(tr, TR_REG_DMAR4, 4) & ~0x00ffffff; ! tr_wr(tr, TR_REG_DMAR4, i | (sndbuf_runsz(ch->buffer) - 1), 4); ! /* start */ ! tr_wr(tr, TR_REG_SBCTRL, tr_rd(tr, TR_REG_SBCTRL, 1) | 1, 1); ! } else ! tr_wr(tr, TR_REG_SBCTRL, tr_rd(tr, TR_REG_SBCTRL, 1) & ~7, 1); ! /* return 0 if ok */ ! return 0; } static int trrchan_getptr(kobj_t obj, void *data) { ! struct tr_rchinfo *ch = data; ! struct tr_info *tr = ch->parent; ! /* return current byte offset of channel */ ! return tr_rd(tr, TR_REG_DMAR0, 4) - vtophys(sndbuf_getbuf(ch->buffer)); } static pcmchan_caps * trrchan_getcaps(kobj_t obj, void *data) { ! return &tr_reccaps; } static kobj_method_t trrchan_methods[] = { ! KOBJMETHOD(channel_init, trrchan_init), ! KOBJMETHOD(channel_setformat, trrchan_setformat), ! KOBJMETHOD(channel_setspeed, trrchan_setspeed), ! KOBJMETHOD(channel_setblocksize, trrchan_setblocksize), ! KOBJMETHOD(channel_trigger, trrchan_trigger), ! KOBJMETHOD(channel_getptr, trrchan_getptr), ! KOBJMETHOD(channel_getcaps, trrchan_getcaps), ! { 0, 0 } }; CHANNEL_DECLARE(trrchan); *************** *** 630,685 **** static void tr_intr(void *p) { ! struct tr_info *tr = (struct tr_info *)p; ! struct tr_chinfo *ch; ! u_int32_t active, mask, bufhalf, chnum, intsrc; ! int tmp; ! ! intsrc = tr_rd(tr, TR_REG_MISCINT, 4); ! if (intsrc & TR_INT_ADDR) { ! chnum = 0; ! while (chnum < 64) { ! mask = 0x00000001; ! active = tr_rd(tr, (chnum < 32)? TR_REG_ADDRINTA : TR_R ! EG_ADDRINTB, 4); ! bufhalf = tr_rd(tr, (chnum < 32)? TR_REG_CSPF_A : TR_RE ! G_CSPF_B, 4); ! if (active) { ! do { ! if (active & mask) { ! tmp = (bufhalf & mask)? 1 : 0; ! if (chnum < tr->playchns) { ! ch = &tr->chinfo[chnum] ! ; ! /* printf("%d @ %d, ", ! chnum, trpchan_getptr(NULL, ch)); */ ! if (ch->bufhalf != tmp) ! { ! chn_intr(ch->ch ! annel); ! ch->bufhalf = t ! mp; ! } else ! printf("same bu ! fhalf\n"); ! ! } ! } ! chnum++; ! mask <<= 1; ! } while (chnum & 31); ! } else ! chnum += 32; ! ! tr_wr(tr, (chnum <= 32)? TR_REG_ADDRINTA : TR_REG_ADDRI ! NTB, active, 4); ! } ! } ! if (intsrc & TR_INT_SB) { ! chn_intr(tr->recchinfo.channel); ! tr_rd(tr, TR_REG_SBR9, 1); ! tr_rd(tr, TR_REG_SBR10, 1); ! } } /* -------------------------------------------------------------------- */ --- 644,690 ---- static void tr_intr(void *p) { ! struct tr_info *tr = (struct tr_info *)p; ! struct tr_chinfo *ch; ! u_int32_t active, mask, bufhalf, chnum, intsrc; ! int tmp; ! ! intsrc = tr_rd(tr, TR_REG_MISCINT, 4); ! if (intsrc & TR_INT_ADDR) { ! chnum = 0; ! while (chnum < 64) { ! mask = 0x00000001; ! active = tr_rd(tr, (chnum < 32)? TR_REG_ADDRINTA : TR_REG_ADDRINTB, 4); ! bufhalf = tr_rd(tr, (chnum < 32)? TR_REG_CSPF_A : TR_REG_CSPF_B, 4); ! if (active) { ! do { ! if (active & mask) { ! tmp = (bufhalf & mask)? 1 : 0; ! if (chnum < tr->playchns) { ! ch = &tr->chinfo[chnum]; ! /* printf("%d @ %d, ", chnum, trpchan_getptr(NULL, ch)); */ ! if (ch->bufhalf != tmp) { ! chn_intr(ch->channel); ! ch->bufhalf = tmp; ! } else ! printf("same bufhalf\n"); ! ! } ! } ! chnum++; ! mask <<= 1; ! } while (chnum & 31); ! } else ! chnum += 32; ! ! tr_wr(tr, (chnum <= 32)? TR_REG_ADDRINTA : TR_REG_ADDRINTB, active, 4); ! } ! } ! if (intsrc & TR_INT_SB) { ! chn_intr(tr->recchinfo.channel); ! tr_rd(tr, TR_REG_SBR9, 1); ! tr_rd(tr, TR_REG_SBR10, 1); ! } } /* -------------------------------------------------------------------- */ *************** *** 691,839 **** static int tr_init(struct tr_info *tr) { ! if (tr->type == TDX_PCI_ID) { ! tr_wr(tr, TDX_REG_CODECST, TDX_CDC_ON, 4); ! } else tr_wr(tr, TNX_REG_CODECST, TNX_CDC_ON, 4); ! ! tr_wr(tr, TR_REG_CIR, TR_CIR_MIDENA | TR_CIR_ADDRENA, 4); ! tr->playchns = 0; ! return 0; } static int tr_pci_probe(device_t dev) { ! if (pci_get_devid(dev) == TDX_PCI_ID) { ! device_set_desc(dev, "Trident 4DWave DX"); ! return 0; ! } ! if (pci_get_devid(dev) == TNX_PCI_ID) { ! device_set_desc(dev, "Trident 4DWave NX"); ! return 0; ! } ! ! return ENXIO; } static int tr_pci_attach(device_t dev) { ! u_int32_t data; ! struct tr_info *tr; ! struct ac97_info *codec = 0; ! int i; ! char status[SND_STATUSLEN]; ! ! if ((tr = malloc(sizeof(*tr), M_DEVBUF, M_NOWAIT)) == NULL) { ! device_printf(dev, "cannot allocate softc\n"); ! return ENXIO; ! } ! ! bzero(tr, sizeof(*tr)); ! tr->type = pci_get_devid(dev); ! ! data = pci_read_config(dev, PCIR_COMMAND, 2); ! data |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN); ! pci_write_config(dev, PCIR_COMMAND, data, 2); ! data = pci_read_config(dev, PCIR_COMMAND, 2); ! ! tr->regid = PCIR_MAPS; ! tr->regtype = SYS_RES_IOPORT; ! tr->reg = bus_alloc_resource(dev, tr->regtype, &tr->regid, 0, ~0, 1, RF ! _ACTIVE); ! if (tr->reg) { ! tr->st = rman_get_bustag(tr->reg); ! tr->sh = rman_get_bushandle(tr->reg); ! } else { ! device_printf(dev, "unable to map register space\n"); ! goto bad; ! } ! ! if (tr_init(tr) == -1) { ! device_printf(dev, "unable to initialize the card\n"); ! goto bad; ! } ! ! codec = AC97_CREATE(dev, tr, tr_ac97); ! if (codec == NULL) goto bad; ! if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) goto bad; ! ! tr->irqid = 0; ! tr->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &tr->irqid, ! 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); ! if (!tr->irq || ! bus_setup_intr(dev, tr->irq, INTR_TYPE_TTY, tr_intr, tr, &tr->ih)) ! { ! device_printf(dev, "unable to map interrupt\n"); ! goto bad; ! } ! ! if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, ! /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, ! /*highaddr*/BUS_SPACE_MAXADDR, ! /*filter*/NULL, /*filterarg*/NULL, ! /*maxsize*/TR_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff, ! /*flags*/0, &tr->parent_dmat) != 0) { ! device_printf(dev, "unable to create dma tag\n"); ! goto bad; ! } ! ! snprintf(status, 64, "at io 0x%lx irq %ld", ! rman_get_start(tr->reg), rman_get_start(tr->irq)); ! ! if (pcm_register(dev, tr, TR_MAXPLAYCH, 1)) goto bad; ! pcm_addchan(dev, PCMDIR_REC, &trrchan_class, tr); ! for (i = 0; i < TR_MAXPLAYCH; i++) ! pcm_addchan(dev, PCMDIR_PLAY, &trpchan_class, tr); ! pcm_setstatus(dev, status); ! return 0; bad: ! if (codec) ac97_destroy(codec); ! if (tr->reg) bus_release_resource(dev, tr->regtype, tr->regid, tr->reg) ! ; ! if (tr->ih) bus_teardown_intr(dev, tr->irq, tr->ih); ! if (tr->irq) bus_release_resource(dev, SYS_RES_IRQ, tr->irqid, tr->irq) ! ; ! if (tr->parent_dmat) bus_dma_tag_destroy(tr->parent_dmat); ! free(tr, M_DEVBUF); ! return ENXIO; } static int tr_pci_detach(device_t dev) { ! int r; ! struct tr_info *tr; ! r = pcm_unregister(dev); ! if (r) ! return r; ! ! tr = pcm_getdevinfo(dev); ! bus_release_resource(dev, tr->regtype, tr->regid, tr->reg); ! bus_teardown_intr(dev, tr->irq, tr->ih); ! bus_release_resource(dev, SYS_RES_IRQ, tr->irqid, tr->irq); ! bus_dma_tag_destroy(tr->parent_dmat); ! free(tr, M_DEVBUF); ! return 0; } static device_method_t tr_methods[] = { ! /* Device interface */ ! DEVMETHOD(device_probe, tr_pci_probe), ! DEVMETHOD(device_attach, tr_pci_attach), ! DEVMETHOD(device_detach, tr_pci_detach), ! { 0, 0 } }; static driver_t tr_driver = { ! "pcm", ! tr_methods, ! sizeof(snddev_info), }; static devclass_t pcm_devclass; --- 696,853 ---- static int tr_init(struct tr_info *tr) { ! switch(tr->type) { ! case SPA_PCI_ID: ! tr_wr(tr, SPA_REG_GPIO, 0, 4); ! tr_wr(tr, SPA_REG_CODECST, SPA_RST_OFF, 4); ! break; ! case TDX_PCI_ID: ! tr_wr(tr, TDX_REG_CODECST, TDX_CDC_ON, 4); ! break; ! case TNX_PCI_ID: ! tr_wr(tr, TNX_REG_CODECST, TNX_CDC_ON, 4); ! break; ! } ! ! tr_wr(tr, TR_REG_CIR, TR_CIR_MIDENA | TR_CIR_ADDRENA, 4); ! tr->playchns = 0; ! return 0; } static int tr_pci_probe(device_t dev) { ! switch(pci_get_devid(dev)) { ! case SPA_PCI_ID: ! device_set_desc(dev, "SiS [76]30 Integrated Sound"); ! break; ! case TDX_PCI_ID: ! device_set_desc(dev, "Trident 4DWave DX"); ! break; ! case TNX_PCI_ID: ! device_set_desc(dev, "Trident 4DWave NX"); ! break; ! default: ! return ENXIO; ! } ! return 0; } static int tr_pci_attach(device_t dev) { ! u_int32_t data; ! struct tr_info *tr; ! struct ac97_info *codec = 0; ! int i; ! char status[SND_STATUSLEN]; ! ! if ((tr = malloc(sizeof(*tr), M_DEVBUF, M_NOWAIT)) == NULL) { ! device_printf(dev, "cannot allocate softc\n"); ! return ENXIO; ! } ! ! bzero(tr, sizeof(*tr)); ! tr->type = pci_get_devid(dev); ! ! data = pci_read_config(dev, PCIR_COMMAND, 2); ! data |= (PCIM_CMD_PORTEN|PCIM_CMD_MEMEN|PCIM_CMD_BUSMASTEREN); ! pci_write_config(dev, PCIR_COMMAND, data, 2); ! data = pci_read_config(dev, PCIR_COMMAND, 2); ! ! tr->regid = PCIR_MAPS; ! tr->regtype = SYS_RES_IOPORT; ! tr->reg = bus_alloc_resource(dev, tr->regtype, &tr->regid, 0, ~0, 1, RF_ACTIVE); ! if (tr->reg) { ! tr->st = rman_get_bustag(tr->reg); ! tr->sh = rman_get_bushandle(tr->reg); ! } else { ! device_printf(dev, "unable to map register space\n"); ! goto bad; ! } ! ! if (tr_init(tr) == -1) { ! device_printf(dev, "unable to initialize the card\n"); ! goto bad; ! } ! ! codec = AC97_CREATE(dev, tr, tr_ac97); ! if (codec == NULL) goto bad; ! if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) goto bad; ! ! tr->irqid = 0; ! tr->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &tr->irqid, ! 0, ~0, 1, RF_ACTIVE | RF_SHAREABLE); ! if (!tr->irq || ! bus_setup_intr(dev, tr->irq, INTR_TYPE_TTY, tr_intr, tr, &tr->ih)) { ! device_printf(dev, "unable to map interrupt\n"); ! goto bad; ! } ! ! if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, ! /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, ! /*highaddr*/BUS_SPACE_MAXADDR, ! /*filter*/NULL, /*filterarg*/NULL, ! /*maxsize*/TR_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff, ! /*flags*/0, &tr->parent_dmat) != 0) { ! device_printf(dev, "unable to create dma tag\n"); ! goto bad; ! } ! ! snprintf(status, 64, "at io 0x%lx irq %ld", ! rman_get_start(tr->reg), rman_get_start(tr->irq)); ! ! if (pcm_register(dev, tr, TR_MAXPLAYCH, 1)) goto bad; ! pcm_addchan(dev, PCMDIR_REC, &trrchan_class, tr); ! for (i = 0; i < TR_MAXPLAYCH; i++) ! pcm_addchan(dev, PCMDIR_PLAY, &trpchan_class, tr); ! pcm_setstatus(dev, status); ! return 0; bad: ! if (codec) ac97_destroy(codec); ! if (tr->reg) bus_release_resource(dev, tr->regtype, tr->regid, tr->reg); ! if (tr->ih) bus_teardown_intr(dev, tr->irq, tr->ih); ! if (tr->irq) bus_release_resource(dev, SYS_RES_IRQ, tr->irqid, tr->irq); ! if (tr->parent_dmat) bus_dma_tag_destroy(tr->parent_dmat); ! free(tr, M_DEVBUF); ! return ENXIO; } static int tr_pci_detach(device_t dev) { ! int r; ! struct tr_info *tr; ! r = pcm_unregister(dev); ! if (r) ! return r; ! ! tr = pcm_getdevinfo(dev); ! bus_release_resource(dev, tr->regtype, tr->regid, tr->reg); ! bus_teardown_intr(dev, tr->irq, tr->ih); ! bus_release_resource(dev, SYS_RES_IRQ, tr->irqid, tr->irq); ! bus_dma_tag_destroy(tr->parent_dmat); ! free(tr, M_DEVBUF); ! return 0; } static device_method_t tr_methods[] = { ! /* Device interface */ ! DEVMETHOD(device_probe, tr_pci_probe), ! DEVMETHOD(device_attach, tr_pci_attach), ! DEVMETHOD(device_detach, tr_pci_detach), ! { 0, 0 } }; static driver_t tr_driver = { ! "pcm", ! tr_methods, ! sizeof(snddev_info), }; static devclass_t pcm_devclass; *************** *** 841,844 **** DRIVER_MODULE(snd_t4dwave, pci, tr_driver, pcm_devclass, 0, 0); MODULE_DEPEND(snd_t4dwave, snd_pcm, PCM_MINVER, PCM_PREFVER, PCM_MAXVER); MODULE_VERSION(snd_t4dwave, 1); - --- 855,857 ---- *** t4dwave.h.old Sun Aug 26 11:41:55 2001 --- t4dwave.h Sun Aug 26 11:39:47 2001 *************** *** 23,99 **** * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ! * $FreeBSD: src/sys/dev/sound/pci/t4dwave.h,v 1.3.2.1 2001/02/03 01:29:10 cg E ! xp $ */ #ifndef _T4DWAVE_REG_H #define _T4DWAVE_REG_H ! #define TR_REG_CIR 0xa0 ! #define TR_CIR_MASK 0x0000003f ! #define TR_CIR_ADDRENA 0x00001000 ! #define TR_CIR_MIDENA 0x00002000 ! #define TR_REG_MISCINT 0xb0 ! #define TR_INT_ADDR 0x00000020 ! #define TR_INT_SB 0x00000004 ! ! #define TR_REG_DMAR0 0x00 ! #define TR_REG_DMAR4 0x04 ! #define TR_REG_DMAR11 0x0b ! #define TR_REG_DMAR15 0x0f ! #define TR_REG_SBR4 0x14 ! #define TR_REG_SBR5 0x15 ! #define TR_SB_INTSTATUS 0x82 ! #define TR_REG_SBR9 0x1e ! #define TR_REG_SBR10 0x1f ! #define TR_REG_SBBL 0xc0 ! #define TR_REG_SBCTRL 0xc4 ! #define TR_REG_SBDELTA 0xac ! ! #define TR_CDC_DATA 16 ! #define TDX_REG_CODECWR 0x40 ! #define TDX_REG_CODECRD 0x44 ! #define TDX_CDC_RWSTAT 0x00008000 ! #define TDX_REG_CODECST 0x48 ! #define TDX_CDC_SBCTRL 0x40 ! #define TDX_CDC_ACTIVE 0x20 ! #define TDX_CDC_READY 0x10 ! #define TDX_CDC_ADCON 0x08 ! #define TDX_CDC_DACON 0x02 ! #define TDX_CDC_RESET 0x01 ! #define TDX_CDC_ON (TDX_CDC_ADCON|TDX_CDC_DACON) ! #define TNX_REG_CODECWR 0x44 #define TNX_REG_CODEC1RD 0x48 #define TNX_REG_CODEC2RD 0x4c ! #define TNX_CDC_RWSTAT 0x00000c00 ! #define TNX_CDC_SEC 0x00000100 ! #define TNX_REG_CODECST 0x40 ! #define TNX_CDC_READY2 0x40 ! #define TNX_CDC_ADC2ON 0x20 ! #define TNX_CDC_DAC2ON 0x10 ! #define TNX_CDC_READY1 0x08 ! #define TNX_CDC_ADC1ON 0x04 ! #define TNX_CDC_DAC1ON 0x02 ! #define TNX_CDC_RESET 0x01 ! #define TNX_CDC_ON (TNX_CDC_ADC1ON|TNX_CDC_DAC1ON) ! ! ! #define TR_REG_STARTA 0x80 ! #define TR_REG_STOPA 0x84 ! #define TR_REG_CSPF_A 0x90 ! #define TR_REG_ADDRINTA 0x98 ! #define TR_REG_INTENA 0xa4 ! ! #define TR_REG_STARTB 0xb4 ! #define TR_REG_STOPB 0xb8 ! #define TR_REG_CSPF_B 0xbc ! #define TR_REG_ADDRINTB 0xd8 ! #define TR_REG_INTENB 0xdc ! #define TR_REG_CHNBASE 0xe0 ! #define TR_CHN_REGS 5 #endif - --- 23,104 ---- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ! * $FreeBSD: src/sys/dev/sound/pci/t4dwave.h,v 1.3.2.1 2001/02/03 01:29:10 cg Exp $ */ #ifndef _T4DWAVE_REG_H #define _T4DWAVE_REG_H ! #define TR_REG_CIR 0xa0 ! #define TR_CIR_MASK 0x0000003f ! #define TR_CIR_ADDRENA 0x00001000 ! #define TR_CIR_MIDENA 0x00002000 ! #define TR_REG_MISCINT 0xb0 ! #define TR_INT_ADDR 0x00000020 ! #define TR_INT_SB 0x00000004 ! ! #define TR_REG_DMAR0 0x00 ! #define TR_REG_DMAR4 0x04 ! #define TR_REG_DMAR11 0x0b ! #define TR_REG_DMAR15 0x0f ! #define TR_REG_SBR4 0x14 ! #define TR_REG_SBR5 0x15 ! #define TR_SB_INTSTATUS 0x82 ! #define TR_REG_SBR9 0x1e ! #define TR_REG_SBR10 0x1f ! #define TR_REG_SBBL 0xc0 ! #define TR_REG_SBCTRL 0xc4 ! #define TR_REG_SBDELTA 0xac ! ! #define TR_CDC_DATA 16 ! #define TDX_REG_CODECWR 0x40 ! #define TDX_REG_CODECRD 0x44 ! #define TDX_CDC_RWSTAT 0x00008000 ! #define TDX_REG_CODECST 0x48 ! #define TDX_CDC_SBCTRL 0x40 ! #define TDX_CDC_ACTIVE 0x20 ! #define TDX_CDC_READY 0x10 ! #define TDX_CDC_ADCON 0x08 ! #define TDX_CDC_DACON 0x02 ! #define TDX_CDC_RESET 0x01 ! #define TDX_CDC_ON (TDX_CDC_ADCON|TDX_CDC_DACON) ! ! #define SPA_REG_CODECRD 0x44 ! #define SPA_REG_CODECWR 0x40 ! #define SPA_REG_CODECST 0x48 ! #define SPA_REG_GPIO 0x48 ! #define SPA_CDC_RWSTAT 0x00008000 ! #define SPA_RST_OFF 0x0f0000 ! #define TNX_REG_CODECWR 0x44 #define TNX_REG_CODEC1RD 0x48 #define TNX_REG_CODEC2RD 0x4c ! #define TNX_CDC_RWSTAT 0x00000c00 ! #define TNX_CDC_SEC 0x00000100 ! #define TNX_REG_CODECST 0x40 ! #define TNX_CDC_READY2 0x40 ! #define TNX_CDC_ADC2ON 0x20 ! #define TNX_CDC_DAC2ON 0x10 ! #define TNX_CDC_READY1 0x08 ! #define TNX_CDC_ADC1ON 0x04 ! #define TNX_CDC_DAC1ON 0x02 ! #define TNX_CDC_RESET 0x01 ! #define TNX_CDC_ON (TNX_CDC_ADC1ON|TNX_CDC_DAC1ON) ! ! ! #define TR_REG_STARTA 0x80 ! #define TR_REG_STOPA 0x84 ! #define TR_REG_CSPF_A 0x90 ! #define TR_REG_ADDRINTA 0x98 ! #define TR_REG_INTENA 0xa4 ! ! #define TR_REG_STARTB 0xb4 ! #define TR_REG_STOPB 0xb8 ! #define TR_REG_CSPF_B 0xbc ! #define TR_REG_ADDRINTB 0xd8 ! #define TR_REG_INTENB 0xdc ! #define TR_REG_CHNBASE 0xe0 ! #define TR_CHN_REGS 5 #endif >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message