Date: Fri, 28 Jul 2006 18:59:39 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 102677 for review Message-ID: <200607281859.k6SIxdor074513@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=102677 Change 102677 by jhb@jhb_mutex on 2006/07/28 18:59:07 IFC @102676 - loopback. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#18 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#36 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#38 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#79 integrate .. //depot/projects/smpng/sys/notes#90 edit Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#18 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.16 2006/07/11 20:52:07 jhb Exp $ + $FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.17 2006/07/28 18:55:18 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#36 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.68 2006/07/14 01:57:09 davidxu Exp $ + $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.69 2006/07/28 18:55:18 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; ==== //depot/projects/smpng/sys/dev/sound/pci/envy24.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THEPOSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.2 2006/06/17 15:11:36 netchild Exp $ + * $FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.3 2006/07/28 18:06:39 netchild Exp $ */ #include <dev/sound/pcm/sound.h> @@ -781,9 +781,9 @@ if (buff == NULL) return NULL; - if (dir == PCMDIR_PLAY && sc->adc[num] != NULL) + if (dir == PCMDIR_REC && sc->adc[num] != NULL) buff->info = ((struct envy24_delta_ak4524_codec *)sc->adc[num])->info; - else if (dir == PCMDIR_REC && sc->dac[num] != NULL) + else if (dir == PCMDIR_PLAY && sc->dac[num] != NULL) buff->info = ((struct envy24_delta_ak4524_codec *)sc->dac[num])->info; else buff->info = ak452x_create(dev, buff, num, envy24_delta_ak4524_ctl); @@ -810,11 +810,11 @@ #endif if (ptr->dir == PCMDIR_PLAY) { - if (ptr->parent->adc[ptr->num] == NULL) + if (ptr->parent->adc[ptr->num] != NULL) ak452x_destroy(ptr->info); } else { - if (ptr->parent->dac[ptr->num] == NULL) + if (ptr->parent->dac[ptr->num] != NULL) ak452x_destroy(ptr->info); } @@ -1591,9 +1591,9 @@ struct sc_info *sc = ch->parent; u_int32_t ptr; int slot; +#if 0 int i; -#if(0) device_printf(sc->dev, "envy24chan_trigger(obj, data, %d)\n", go); #endif snd_mtxlock(sc->lock); @@ -1667,6 +1667,7 @@ envy24_stop(sc, ch->dir); sc->intr[slot] = 0; } +#if 0 else if (ch->blk == sc->blk[slot]) { sc->blk[slot] = ENVY24_SAMPLE_NUM / 2; for (i = 0; i < ENVY24_CHAN_NUM; i++) { @@ -1678,6 +1679,7 @@ if (ch->blk != sc->blk[slot]) envy24_updintr(sc, ch->dir); } +#endif break; } snd_mtxunlock(sc->lock); @@ -2432,6 +2434,12 @@ envy24_dmafree(sc); if (sc->dmat) bus_dma_tag_destroy(sc->dmat); + if (sc->cfg->codec->destroy != NULL) { + for (i = 0; i < sc->adcn; i++) + sc->cfg->codec->destroy(sc->adc[i]); + for (i = 0; i < sc->dacn; i++) + sc->cfg->codec->destroy(sc->dac[i]); + } envy24_cfgfree(sc->cfg); if (sc->cs) bus_release_resource(dev, SYS_RES_IOPORT, sc->csid, sc->cs); ==== //depot/projects/smpng/sys/i386/linux/syscalls.master#38 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.74 2006/07/21 20:22:13 jhb Exp $ + $FreeBSD: src/sys/i386/linux/syscalls.master,v 1.75 2006/07/28 18:55:18 jhb Exp $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). ==== //depot/projects/smpng/sys/kern/syscalls.master#79 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/kern/syscalls.master,v 1.219 2006/07/13 06:26:43 davidxu Exp $ + $FreeBSD: src/sys/kern/syscalls.master,v 1.220 2006/07/28 18:55:18 jhb Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. ==== //depot/projects/smpng/sys/notes#90 (text+ko) ==== @@ -77,8 +77,8 @@ + push Giant down and mark all remaining syscalls MPSAFE - remove SYF_MPSAFE + stop conditionally acquiring Giant in syscall() functions - - remove all the 'M's from the syscall files - - remove support for the 'M' prefix from the syscall scripts + + remove all the 'M's from the syscall files + + remove support for the 'M' prefix from the syscall scripts - retire SYF_ARGMASK, sy_narg is now back to just being an argument count Active child branches:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607281859.k6SIxdor074513>