Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pad sc_audiodev should be defined as a device_t as t...



details:   https://anonhg.NetBSD.org/src/rev/1764c58a1993
branches:  trunk
changeset: 825136:1764c58a1993
user:      nat <nat%NetBSD.org@localhost>
date:      Sat Jul 01 05:50:10 2017 +0000

description:
sc_audiodev should be defined as a device_t as this is what audio_attach_mi
returns.

diffstat:

 sys/dev/pad/pad.c    |  6 +++---
 sys/dev/pad/padvar.h |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 90883ce88523 -r 1764c58a1993 sys/dev/pad/pad.c
--- a/sys/dev/pad/pad.c Sat Jul 01 05:44:52 2017 +0000
+++ b/sys/dev/pad/pad.c Sat Jul 01 05:50:10 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
        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");
diff -r 90883ce88523 -r 1764c58a1993 sys/dev/pad/padvar.h
--- a/sys/dev/pad/padvar.h      Sat Jul 01 05:44:52 2017 +0000
+++ b/sys/dev/pad/padvar.h      Sat Jul 01 05:50:10 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -41,7 +41,7 @@
        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



Home | Main Index | Thread Index | Old Index