Module Name: src
Committed By: macallan
Date: Fri Jul 15 22:10:47 UTC 2016
Modified Files:
src/sys/arch/macppc/dev: awacs.c esp.c if_bm.c if_mc.c kauai.c mesh.c
snapper.c
Log Message:
adjust to dbdma changes
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/macppc/dev/awacs.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/dev/esp.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/macppc/dev/if_bm.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/macppc/dev/if_mc.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/macppc/dev/kauai.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/macppc/dev/mesh.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/macppc/dev/snapper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/dev/awacs.c
diff -u src/sys/arch/macppc/dev/awacs.c:1.43 src/sys/arch/macppc/dev/awacs.c:1.44
--- src/sys/arch/macppc/dev/awacs.c:1.43 Fri Nov 2 20:09:02 2012
+++ src/sys/arch/macppc/dev/awacs.c Fri Jul 15 22:10:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: awacs.c,v 1.43 2012/11/02 20:09:02 phx Exp $ */
+/* $NetBSD: awacs.c,v 1.44 2016/07/15 22:10:47 macallan Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.43 2012/11/02 20:09:02 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.44 2016/07/15 22:10:47 macallan Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -345,8 +345,8 @@ awacs_attach(device_t parent, device_t s
sc->sc_odma = bus_space_vaddr(sc->sc_tag, sc->sc_odmah);
sc->sc_idma = bus_space_vaddr(sc->sc_tag, sc->sc_idmah);
- sc->sc_odmacmd = dbdma_alloc(20 * sizeof(struct dbdma_command));
- sc->sc_idmacmd = dbdma_alloc(20 * sizeof(struct dbdma_command));
+ sc->sc_odmacmd = dbdma_alloc(20 * sizeof(struct dbdma_command), NULL);
+ sc->sc_idmacmd = dbdma_alloc(20 * sizeof(struct dbdma_command), NULL);
if (strcmp(ca->ca_name, "i2s") == 0) {
int node, intr[6];
Index: src/sys/arch/macppc/dev/esp.c
diff -u src/sys/arch/macppc/dev/esp.c:1.31 src/sys/arch/macppc/dev/esp.c:1.32
--- src/sys/arch/macppc/dev/esp.c:1.31 Thu Jun 30 00:52:57 2011
+++ src/sys/arch/macppc/dev/esp.c Fri Jul 15 22:10:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.31 2011/06/30 00:52:57 matt Exp $ */
+/* $NetBSD: esp.c,v 1.32 2016/07/15 22:10:47 macallan Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.31 2011/06/30 00:52:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.32 2016/07/15 22:10:47 macallan Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -184,7 +184,7 @@ espattach(device_t parent, device_t self
esc->sc_dmareg = mapiodev(ca->ca_baseaddr + reg[2], reg[3], false);
/* Allocate 16-byte aligned DMA command space */
- esc->sc_dmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 20);
+ esc->sc_dmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 20, NULL);
/* Other settings */
sc->sc_id = 7;
Index: src/sys/arch/macppc/dev/if_bm.c
diff -u src/sys/arch/macppc/dev/if_bm.c:1.48 src/sys/arch/macppc/dev/if_bm.c:1.49
--- src/sys/arch/macppc/dev/if_bm.c:1.48 Fri Jun 10 13:27:11 2016
+++ src/sys/arch/macppc/dev/if_bm.c Fri Jul 15 22:10:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bm.c,v 1.48 2016/06/10 13:27:11 ozaki-r Exp $ */
+/* $NetBSD: if_bm.c,v 1.49 2016/07/15 22:10:47 macallan Exp $ */
/*-
* Copyright (C) 1998, 1999, 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.48 2016/06/10 13:27:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.49 2016/07/15 22:10:47 macallan Exp $");
#include "opt_inet.h"
@@ -214,8 +214,9 @@ bmac_attach(device_t parent, device_t se
sc->sc_txdma = mapiodev(ca->ca_reg[2], PAGE_SIZE, false);
sc->sc_rxdma = mapiodev(ca->ca_reg[4], PAGE_SIZE, false);
- sc->sc_txcmd = dbdma_alloc(BMAC_TXBUFS * sizeof(dbdma_command_t));
- sc->sc_rxcmd = dbdma_alloc((BMAC_RXBUFS + 1) * sizeof(dbdma_command_t));
+ sc->sc_txcmd = dbdma_alloc(BMAC_TXBUFS * sizeof(dbdma_command_t), NULL);
+ sc->sc_rxcmd = dbdma_alloc((BMAC_RXBUFS + 1) * sizeof(dbdma_command_t),
+ NULL);
sc->sc_txbuf = malloc(BMAC_BUFLEN * BMAC_TXBUFS, M_DEVBUF, M_NOWAIT);
sc->sc_rxbuf = malloc(BMAC_BUFLEN * BMAC_RXBUFS, M_DEVBUF, M_NOWAIT);
if (sc->sc_txbuf == NULL || sc->sc_rxbuf == NULL ||
Index: src/sys/arch/macppc/dev/if_mc.c
diff -u src/sys/arch/macppc/dev/if_mc.c:1.22 src/sys/arch/macppc/dev/if_mc.c:1.23
--- src/sys/arch/macppc/dev/if_mc.c:1.22 Tue Jul 26 08:36:02 2011
+++ src/sys/arch/macppc/dev/if_mc.c Fri Jul 15 22:10:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.22 2011/07/26 08:36:02 macallan Exp $ */
+/* $NetBSD: if_mc.c,v 1.23 2016/07/15 22:10:47 macallan Exp $ */
/*-
* Copyright (c) 1997 David Huang <[email protected]>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.22 2011/07/26 08:36:02 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.23 2016/07/15 22:10:47 macallan Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -123,8 +123,9 @@ mc_attach(device_t parent, device_t self
bus_space_map(sc->sc_regt, reg[0], reg[1], 0, &sc->sc_regh);
sc->sc_tail = 0;
- sc->sc_txdmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 2);
- sc->sc_rxdmacmd = (void *)dbdma_alloc(sizeof(dbdma_command_t) * 8);
+ sc->sc_txdmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 2, NULL);
+ sc->sc_rxdmacmd = (void *)dbdma_alloc(sizeof(dbdma_command_t) * 8,
+ NULL);
memset(sc->sc_txdmacmd, 0, sizeof(dbdma_command_t) * 2);
memset(sc->sc_rxdmacmd, 0, sizeof(dbdma_command_t) * 8);
Index: src/sys/arch/macppc/dev/kauai.c
diff -u src/sys/arch/macppc/dev/kauai.c:1.35 src/sys/arch/macppc/dev/kauai.c:1.36
--- src/sys/arch/macppc/dev/kauai.c:1.35 Sat Mar 29 19:28:29 2014
+++ src/sys/arch/macppc/dev/kauai.c Fri Jul 15 22:10:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: kauai.c,v 1.35 2014/03/29 19:28:29 christos Exp $ */
+/* $NetBSD: kauai.c,v 1.36 2016/07/15 22:10:47 macallan Exp $ */
/*-
* Copyright (c) 2003 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.35 2014/03/29 19:28:29 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.36 2016/07/15 22:10:47 macallan Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,7 +117,7 @@ kauai_attach(device_t parent, device_t s
sc->sc_wdcdev.sc_atac.atac_dev = self;
- sc->sc_dmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 20);
+ sc->sc_dmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 20, NULL);
node = pcidev_to_ofdev(pa->pa_pc, pa->pa_tag);
if (node == 0) {
aprint_error(": cannot find kauai node\n");
Index: src/sys/arch/macppc/dev/mesh.c
diff -u src/sys/arch/macppc/dev/mesh.c:1.36 src/sys/arch/macppc/dev/mesh.c:1.37
--- src/sys/arch/macppc/dev/mesh.c:1.36 Fri Mar 14 21:59:41 2014
+++ src/sys/arch/macppc/dev/mesh.c Fri Jul 15 22:10:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mesh.c,v 1.36 2014/03/14 21:59:41 mrg Exp $ */
+/* $NetBSD: mesh.c,v 1.37 2016/07/15 22:10:47 macallan Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.36 2014/03/14 21:59:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.37 2016/07/15 22:10:47 macallan Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -236,7 +236,7 @@ mesh_attach(device_t parent, device_t se
for (i = 0; i < sizeof(sc->sc_scb)/sizeof(sc->sc_scb[0]); i++)
TAILQ_INSERT_TAIL(&sc->free_scb, &sc->sc_scb[i], chain);
- sc->sc_dmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 20);
+ sc->sc_dmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 20, NULL);
mesh_reset(sc);
mesh_bus_reset(sc);
Index: src/sys/arch/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.39 src/sys/arch/macppc/dev/snapper.c:1.40
--- src/sys/arch/macppc/dev/snapper.c:1.39 Fri Mar 14 21:59:41 2014
+++ src/sys/arch/macppc/dev/snapper.c Fri Jul 15 22:10:47 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.39 2014/03/14 21:59:41 mrg Exp $ */
+/* $NetBSD: snapper.c,v 1.40 2016/07/15 22:10:47 macallan Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.39 2014/03/14 21:59:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.40 2016/07/15 22:10:47 macallan Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -756,9 +756,9 @@ snapper_attach(device_t parent, device_t
}
sc->sc_odmacmd = dbdma_alloc((SNAPPER_MAXPAGES + 4) *
- sizeof(struct dbdma_command));
+ sizeof(struct dbdma_command), NULL);
sc->sc_idmacmd = dbdma_alloc((SNAPPER_MAXPAGES + 4) *
- sizeof(struct dbdma_command));
+ sizeof(struct dbdma_command), NULL);
sc->sc_baseaddr = ca->ca_baseaddr;
OF_getprop(soundbus, "reg", reg, sizeof reg);
