From owner-p4-projects@FreeBSD.ORG Mon Feb 5 18:32:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0474116A405; Mon, 5 Feb 2007 18:32:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7AF1C16A411 for ; Mon, 5 Feb 2007 18:32:05 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3042F13C481 for ; Mon, 5 Feb 2007 18:32:05 +0000 (UTC) (envelope-from netchild@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l15IW5VX012127 for ; Mon, 5 Feb 2007 18:32:05 GMT (envelope-from netchild@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l15IW3AN012122 for perforce@freebsd.org; Mon, 5 Feb 2007 18:32:03 GMT (envelope-from netchild@freebsd.org) Date: Mon, 5 Feb 2007 18:32:03 GMT Message-Id: <200702051832.l15IW3AN012122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to netchild@freebsd.org using -f From: Alexander Leidinger To: Perforce Change Reviews Cc: Subject: PERFORCE change 114068 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: Mon, 05 Feb 2007 18:32:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=114068 Change 114068 by netchild@netchild_magellan on 2007/02/05 18:31:08 Use bus_get_dma_tag() to obtain the parent DMA tag to make the drivers a little bit more non-ia32/amd64 friendly. There is no man page for bus_get_dma_tag, so this is modelled after rev. 1.62 of src/sys/dev/sound/pci/es137x.c by marius. So far this is compile tested only. Inspired by: commit by marius Affected files ... .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/es137x.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/fm801.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro3.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/solo.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.c#2 edit .. //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#2 edit Differences ... ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ad1816.c#2 (text+ko) ==== @@ -613,7 +613,8 @@ if (mixer_init(dev, &ad1816mixer_class, ad1816)) goto no; snd_setup_intr(dev, ad1816->irq, 0, ad1816_intr, ad1816, &ad1816->ih); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/ess.c#2 (text+ko) ==== @@ -851,7 +851,8 @@ if (!sc->duplex) pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/mss.c#2 (text+ko) ==== @@ -1744,7 +1744,8 @@ } if (pdma == rdma) pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb16.c#2 (text+ko) ==== @@ -841,7 +841,8 @@ sb->prio = 0; - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/isa/sb8.c#2 (text+ko) ==== @@ -735,7 +735,8 @@ pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/als4000.c#2 (text+ko) ==== @@ -773,7 +773,7 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, ALS_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/atiixp.c#2 (text+ko) ==== @@ -1194,7 +1194,8 @@ /* * DMA tag for scatter-gather buffers and link pointers */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -1205,7 +1206,8 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/au88x0.c#2 (text+ko) ==== @@ -636,7 +636,7 @@ /* DMA mapping */ aui->aui_bufsize = pcm_getbuffersize(dev, AU88X0_BUFSIZE_MIN, AU88X0_BUFSIZE_DFLT, AU88X0_BUFSIZE_MAX); - error = bus_dma_tag_create(NULL, + error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, /* 16-bit alignment, no boundary */ BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, /* restrict to 4GB */ NULL, NULL, /* no filter */ ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/aureal.c#2 (text+ko) ==== @@ -637,7 +637,8 @@ if (codec == NULL) goto bad; if (mixer_init(dev, ac97_getmixerclass(), codec) == -1) goto bad; - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cmi.c#2 (text+ko) ==== @@ -959,7 +959,8 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, CMI_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/cs4281.c#2 (text+ko) ==== @@ -824,7 +824,8 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, CS4281_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/csapcm.c#2 (text+ko) ==== @@ -704,7 +704,9 @@ if (resp->irq == NULL) return (1); } - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/CS461x_BUFFSIZE, /*boundary*/CS461x_BUFFSIZE, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), + /*alignment*/CS461x_BUFFSIZE, + /*boundary*/CS461x_BUFFSIZE, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/ds1.c#2 (text+ko) ==== @@ -157,7 +157,7 @@ */ /* stuff */ -static int ds_init(struct sc_info *); +static int ds_init(struct sc_info *, device_t); static void ds_intr(void *); /* talk to the card */ @@ -785,7 +785,7 @@ } static int -ds_init(struct sc_info *sc) +ds_init(struct sc_info *sc, device_t dev) { int i; u_int32_t *ci, r, pcs, rcs, ecs, ws, memsz, cb; @@ -833,7 +833,9 @@ memsz += (64 + 1) * 4; if (sc->regbase == NULL) { - if (bus_dma_tag_create(NULL, 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, + if (bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, + BUS_SPACE_MAXADDR_32BIT, + BUS_SPACE_MAXADDR, NULL, NULL, memsz, 1, memsz, 0, NULL, NULL, &sc->control_dmat)) return -1; @@ -970,7 +972,8 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, DS1_BUFFSIZE, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -982,7 +985,7 @@ } sc->regbase = NULL; - if (ds_init(sc) == -1) { + if (ds_init(sc, dev) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; } @@ -1050,7 +1053,7 @@ sc = pcm_getdevinfo(dev); - if (ds_init(sc) == -1) { + if (ds_init(sc, dev) == -1) { device_printf(dev, "unable to reinitialize the card\n"); return ENXIO; } ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10k1.c#2 (text+ko) ==== @@ -2011,7 +2011,8 @@ sc->bufsz = pcm_getbuffersize(dev, 4096, EMU_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/1 << 31, /* can only access 0-2gb */ /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/emu10kx.c#2 (text+ko) ==== @@ -385,7 +385,7 @@ static void emu_initefx(struct emu_sc_info *sc); static int emu_cardbus_init(struct emu_sc_info *sc); -static int emu_init(struct emu_sc_info *sc); +static int emu_init(struct emu_sc_info *sc, device_t dev); static int emu_uninit(struct emu_sc_info *sc); static int emu_read_ivar(device_t bus __unused, device_t dev, int ivar_index, uintptr_t * result); @@ -2338,7 +2338,7 @@ /* Probe and attach the card */ static int -emu_init(struct emu_sc_info *sc) +emu_init(struct emu_sc_info *sc, device_t dev) { uint32_t ch, tmp; uint32_t spdif_sr; @@ -2385,7 +2385,8 @@ emu_wrptr(sc, 0, SPBYPASS, 0xf00); /* What will happen if * we write 1 here? */ - if (bus_dma_tag_create( /* parent */ NULL, /* alignment */ 2, /* boundary */ 0, + if (bus_dma_tag_create( /* parent */ bus_get_dma_tag(dev), + /* alignment */ 2, /* boundary */ 0, /* lowaddr */ 1 << 31, /* can only access 0-2gb */ /* highaddr */ BUS_SPACE_MAXADDR, /* filter */ NULL, /* filterarg */ NULL, @@ -2853,7 +2854,7 @@ sc->root = device_get_sysctl_tree(dev); if (sc->root == NULL) goto bad; - if (emu_init(sc) == -1) { + if (emu_init(sc, dev) == -1) { device_printf(dev, "unable to initialize the card\n"); goto bad; } ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24.c#2 (text+ko) ==== @@ -2301,7 +2301,7 @@ } static int -envy24_alloc_resource(struct sc_info *sc) +envy24_alloc_resource(struct sc_info *sc, device_t dev) { /* allocate I/O port resource */ sc->csid = PCIR_CCS; @@ -2348,7 +2348,8 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/4, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/4, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, /*highaddr*/BUS_SPACE_MAXADDR_ENVY24, /*filter*/NULL, /*filterarg*/NULL, @@ -2394,7 +2395,7 @@ data = pci_read_config(dev, PCIR_COMMAND, 2); /* allocate resources */ - err = envy24_alloc_resource(sc); + err = envy24_alloc_resource(sc, dev); if (err) { device_printf(dev, "unable to allocate system resources\n"); goto bad; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/envy24ht.c#2 (text+ko) ==== @@ -2332,7 +2332,7 @@ } static int -envy24ht_alloc_resource(struct sc_info *sc) +envy24ht_alloc_resource(struct sc_info *sc, device_t dev) { /* allocate I/O port resource */ sc->csid = PCIR_CCS; @@ -2367,7 +2367,8 @@ } /* allocate DMA resource */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/4, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/4, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_ENVY24, /*highaddr*/BUS_SPACE_MAXADDR_ENVY24, /*filter*/NULL, /*filterarg*/NULL, @@ -2413,7 +2414,7 @@ data = pci_read_config(dev, PCIR_COMMAND, 2); /* allocate resources */ - err = envy24ht_alloc_resource(sc); + err = envy24ht_alloc_resource(sc, dev); if (err) { device_printf(dev, "unable to allocate system resources\n"); goto bad; ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/es137x.c#2 (text+ko) ==== ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/fm801.c#2 (text+ko) ==== @@ -630,7 +630,8 @@ goto oops; } - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/hda/hdac.c#2 (text+ko) ==== @@ -1167,7 +1167,7 @@ /* * Create a DMA tag */ - result = bus_dma_tag_create(NULL, /* parent */ + result = bus_dma_tag_create(bus_get_dma_tag(sc->dev), /* parent */ HDAC_DMA_ALIGNMENT, /* alignment */ 0, /* boundary */ lowaddr, /* lowaddr */ @@ -3200,7 +3200,7 @@ } else sc->chan_blkcnt = HDA_BDL_DEFAULT; - result = bus_dma_tag_create(NULL, /* parent */ + result = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ HDAC_DMA_ALIGNMENT, /* alignment */ 0, /* boundary */ BUS_SPACE_MAXADDR_32BIT, /* lowaddr */ ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/ich.c#2 (text+ko) ==== @@ -934,7 +934,8 @@ else sc->fixedrate = 0; - if (bus_dma_tag_create(NULL, 8, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, + if (bus_dma_tag_create(bus_get_dma_tag(dev), 8, 0, + BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, sc->bufsz, 1, 0x3ffff, 0, NULL, NULL, &sc->dmat) != 0) { device_printf(dev, "unable to create dma tag\n"); ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro.c#2 (text+ko) ==== @@ -1793,7 +1793,7 @@ #endif ess->bufsz = pcm_getbuffersize(dev, 4096, AGG_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/ NULL, + if (bus_dma_tag_create(/*parent*/ bus_get_dma_tag(dev), /*align */ 4, 1 << (16+1), /*limit */ MAESTRO_MAXADDR, BUS_SPACE_MAXADDR, /*filter*/ NULL, NULL, @@ -1808,7 +1808,7 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/NULL, + if (bus_dma_tag_create(/*parent*/ bus_dma_tag_create, /*align */ 1 << WAVCACHE_BASEADDR_SHIFT, 1 << (16+1), /*limit */ MAESTRO_MAXADDR, BUS_SPACE_MAXADDR, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/maestro3.c#2 (text+ko) ==== @@ -1240,7 +1240,7 @@ M3_BUFSIZE_MAX); if (bus_dma_tag_create( - NULL, /* parent */ + bus_get_dma_tag(dev), /* parent */ 2, 0, /* alignment, boundary */ M3_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/solo.c#2 (text+ko) ==== @@ -1030,9 +1030,9 @@ pcm_setflags(dev, pcm_getflags(dev) | SD_F_SIMPLEX); #if 0 - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/65536, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/65536, /*boundary*/0, #endif - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/t4dwave.c#2 (text+ko) ==== @@ -860,7 +860,8 @@ goto bad; } - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/TR_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/via8233.c#2 (text+ko) ==== @@ -1237,7 +1237,8 @@ nsegs = (via_dxs_chnum + via_sgd_chnum) * via->blkcnt; /* DMA tag for buffers */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -1253,7 +1254,8 @@ * requires a list in memory of work to do. We need only 16 bytes * for this list, and it is wasteful to allocate 16K. */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/via82c686.c#2 (text+ko) ==== @@ -555,7 +555,8 @@ via->codec_caps & (AC97_EXTCAP_VRA | AC97_EXTCAP_VRM)); /* DMA tag for buffers */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, @@ -571,7 +572,8 @@ * requires a list in memory of work to do. We need only 16 bytes * for this list, and it is wasteful to allocate 16K. */ - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_32BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, ==== //depot/projects/soundsystem/src/sys/dev/sound/pci/vibes.c#2 (text+ko) ==== @@ -768,7 +768,8 @@ } sc->bufsz = pcm_getbuffersize(dev, 4096, SV_DEFAULT_BUFSZ, 65536); - if (bus_dma_tag_create(/*parent*/NULL, /*alignment*/2, /*boundary*/0, + if (bus_dma_tag_create(/*parent*/bus_get_dma_tag(dev), /*alignment*/2, + /*boundary*/0, /*lowaddr*/BUS_SPACE_MAXADDR_24BIT, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL,