Module Name: src
Committed By: nat
Date: Sat Jul 1 05:50:10 UTC 2017
Modified Files:
src/sys/dev/pad: pad.c padvar.h
Log Message:
sc_audiodev should be defined as a device_t as this is what audio_attach_mi
returns.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pad/pad.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pad/padvar.h
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/pad/pad.c
diff -u src/sys/dev/pad/pad.c:1.37 src/sys/dev/pad/pad.c:1.38
--- src/sys/dev/pad/pad.c:1.37 Mon Jun 19 23:54:00 2017
+++ src/sys/dev/pad/pad.c Sat Jul 1 05:50:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.37 2017/06/19 23:54:00 nat Exp $ */
+/* $NetBSD: pad.c,v 1.38 2017/07/01 05:50:10 nat Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.37 2017/06/19 23:54:00 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.38 2017/07/01 05:50:10 nat Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -277,7 +277,7 @@ pad_attach(device_t parent, device_t sel
sc->sc_swvol = 255;
sc->sc_buflen = 0;
sc->sc_rpos = sc->sc_wpos = 0;
- sc->sc_audiodev = (void *)audio_attach_mi(&pad_hw_if, sc, sc->sc_dev);
+ sc->sc_audiodev = audio_attach_mi(&pad_hw_if, sc, sc->sc_dev);
if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
Index: src/sys/dev/pad/padvar.h
diff -u src/sys/dev/pad/padvar.h:1.9 src/sys/dev/pad/padvar.h:1.10
--- src/sys/dev/pad/padvar.h:1.9 Tue Jun 6 07:31:40 2017
+++ src/sys/dev/pad/padvar.h Sat Jul 1 05:50:10 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: padvar.h,v 1.9 2017/06/06 07:31:40 nat Exp $ */
+/* $NetBSD: padvar.h,v 1.10 2017/07/01 05:50:10 nat Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -41,7 +41,7 @@ typedef struct pad_softc {
kmutex_t sc_lock;
kmutex_t sc_intr_lock;
- struct audio_softc *sc_audiodev;
+ device_t sc_audiodev;
int sc_blksize;
#define PAD_BLKSIZE 8192
