From owner-p4-projects@FreeBSD.ORG Wed Jul 25 04:01:38 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA44516A41A; Wed, 25 Jul 2007 04:01:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 643AD16A417 for ; Wed, 25 Jul 2007 04:01:38 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AA2113C458 for ; Wed, 25 Jul 2007 04:01:38 +0000 (UTC) (envelope-from loafier@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6P41bX9045295 for ; Wed, 25 Jul 2007 04:01:38 GMT (envelope-from loafier@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6P41bvv045282 for perforce@freebsd.org; Wed, 25 Jul 2007 04:01:37 GMT (envelope-from loafier@FreeBSD.org) Date: Wed, 25 Jul 2007 04:01:37 GMT Message-Id: <200707250401.l6P41bvv045282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to loafier@FreeBSD.org using -f From: Christopher Davis To: Perforce Change Reviews Cc: Subject: PERFORCE change 124065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jul 2007 04:01:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=124065 Change 124065 by loafier@chrisdsoc on 2007/07/25 04:01:17 Fixed typos in aureal.c haven't tested Affected files ... .. //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/aureal.c#5 edit Differences ... ==== //depot/projects/soc2007/loafier_busalloc/src/sys/dev/sound/pci/aureal.c#5 (text+ko) ==== @@ -76,13 +76,13 @@ static struct resource_spec au_res_spec_mem[] = { {SYS_RES_MEMORY, PCIR_BAR(0), RF_ACTIVE}, - {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, + {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHAREABLE}, {-1, 0, 0} }; static struct resource_spec au_res_spec_io[] = { {SYS_RES_IOPORT, PCIR_BAR(0), RF_ACTIVE}, - {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHARABLE}, + {SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHAREABLE}, {-1, 0, 0} }; @@ -492,7 +492,7 @@ for (i=0; i<124; i++) au_wr4(au, AU_REG_RTBASE+(i<<2), 0xffffffff); /* test */ - i=au_rd4(au, 0, 0x107c0); + i=au_rd4(au, 0x107c0); if (i!=0xdeadbeef) device_printf(dev, "dma check failed: 0x%x\n", i); /* install mixer */ @@ -531,7 +531,7 @@ } static void -au_destroy(device_t dev, au_info *sc) +au_destroy(device_t dev, struct au_info *sc) { if (!sc) return; @@ -610,7 +610,7 @@ /*filter*/NULL, /*filterarg*/NULL, /*maxsize*/AU_BUFFSIZE, /*nsegments*/1, /*maxsegz*/0x3ffff, /*flags*/0, /*lockfunc*/busdma_lock_mutex, - /*lockarg*/&Giant, &au->parent_dmat) != 0) { + /*lockarg*/&Giant, &sc->parent_dmat) != 0) { device_printf(dev, "unable to create dma tag\n"); goto bad; }