CVS commit: src/sys/dev/sbus

[Martin Husemann]

Module Name:    src
Committed By:   martin
Date:           Tue May  2 08:11:16 UTC 2017

Modified Files:
        src/sys/dev/sbus: cs4231_sbus.c

Log Message:
Make it compile with AUDIODEBUG


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/sbus/cs4231_sbus.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/dev/sbus/cs4231_sbus.c
diff -u src/sys/dev/sbus/cs4231_sbus.c:1.49 src/sys/dev/sbus/cs4231_sbus.c:1.50
--- src/sys/dev/sbus/cs4231_sbus.c:1.49	Wed Nov 23 23:07:36 2011
+++ src/sys/dev/sbus/cs4231_sbus.c	Tue May  2 08:11:16 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs4231_sbus.c,v 1.49 2011/11/23 23:07:36 jmcneill Exp $	*/
+/*	$NetBSD: cs4231_sbus.c,v 1.50 2017/05/02 08:11:16 martin Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2002, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.49 2011/11/23 23:07:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4231_sbus.c,v 1.50 2017/05/02 08:11:16 martin Exp $");
 
 #include "audio.h"
 #if NAUDIO > 0
@@ -129,7 +129,7 @@ const struct audio_hw_if audiocs_sbus_hw
 
 
 #ifdef AUDIO_DEBUG
-static void	cs4231_sbus_regdump(char *, struct cs4231_sbus_softc *);
+static void	cs4231_sbus_regdump(const char *, struct cs4231_sbus_softc *);
 #endif
 
 static int	cs4231_sbus_intr(void *);
@@ -200,30 +200,30 @@ cs4231_sbus_attach(device_t parent, devi
 
 #ifdef AUDIO_DEBUG
 static void
-cs4231_sbus_regdump(char *label, struct cs4231_sbus_softc *sc)
+cs4231_sbus_regdump(const char *label, struct cs4231_sbus_softc *sc)
 {
 	char bits[128];
 
 	printf("cs4231regdump(%s): regs:", label);
 	printf("dmapva: 0x%x; ",
-		bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_PVA));
+		bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_PVA));
 	printf("dmapc: 0x%x; ",
-		bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_PC));
+		bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_PC));
 	printf("dmapnva: 0x%x; ",
-		bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_PNVA));
+		bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_PNVA));
 	printf("dmapnc: 0x%x\n",
-		bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_PNC));
+		bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_PNC));
 	printf("dmacva: 0x%x; ",
-		bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_CVA));
+		bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_CVA));
 	printf("dmacc: 0x%x; ",
-		bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_CC));
+		bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_CC));
 	printf("dmacnva: 0x%x; ",
-		bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_CNVA));
+		bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_CNVA));
 	printf("dmacnc: 0x%x\n",
-		bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_CNC));
+		bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_CNC));
 
 	snprintb(bits, sizeof(bits), APC_BITS,
-	    bus_space_read_4(sc->sc_bh, sc->sc_bh, APC_DMA_CSR));
+	    bus_space_read_4(sc->sc_bt, sc->sc_bh, APC_DMA_CSR));
 	printf("apc_dmacsr=%s\n", bits);
 
 	ad1848_dump_regs(&sc->sc_cs4231.sc_ad1848);