Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci prop_dictionary_get_bool() doesn't return FALSE ...



details:   https://anonhg.NetBSD.org/src/rev/79f0dd1695e7
branches:  trunk
changeset: 340599:79f0dd1695e7
user:      macallan <macallan%NetBSD.org@localhost>
date:      Wed Sep 16 16:52:54 2015 +0000

description:
prop_dictionary_get_bool() doesn't return FALSE if the property doesn't
exist, so initialize things first.
No more console stealing on sparc64.

diffstat:

 sys/dev/pci/gffb.c     |  6 +++---
 sys/dev/pci/pm2fb.c    |  6 +++---
 sys/dev/pci/r128fb.c   |  6 +++---
 sys/dev/pci/voodoofb.c |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs (108 lines):

diff -r 6e5dc6bd2b32 -r 79f0dd1695e7 sys/dev/pci/gffb.c
--- a/sys/dev/pci/gffb.c        Wed Sep 16 15:32:53 2015 +0000
+++ b/sys/dev/pci/gffb.c        Wed Sep 16 16:52:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gffb.c,v 1.9 2014/06/29 03:43:06 tsutsui Exp $ */
+/*     $NetBSD: gffb.c,v 1.10 2015/09/16 16:52:54 macallan Exp $       */
 
 /*
  * Copyright (c) 2013 Michael Lorenz
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.9 2014/06/29 03:43:06 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gffb.c,v 1.10 2015/09/16 16:52:54 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -181,7 +181,7 @@
        struct wsemuldisplaydev_attach_args aa;
        prop_dictionary_t       dict;
        unsigned long           defattr;
-       bool                    is_console;
+       bool                    is_console = FALSE;
        int                     i, j, f;
        uint8_t                 cmap[768];
 
diff -r 6e5dc6bd2b32 -r 79f0dd1695e7 sys/dev/pci/pm2fb.c
--- a/sys/dev/pci/pm2fb.c       Wed Sep 16 15:32:53 2015 +0000
+++ b/sys/dev/pci/pm2fb.c       Wed Sep 16 16:52:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pm2fb.c,v 1.27 2014/12/17 16:50:08 macallan Exp $      */
+/*     $NetBSD: pm2fb.c,v 1.28 2015/09/16 16:52:54 macallan Exp $      */
 
 /*
  * Copyright (c) 2009, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.27 2014/12/17 16:50:08 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pm2fb.c,v 1.28 2015/09/16 16:52:54 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -315,7 +315,7 @@
        struct wsemuldisplaydev_attach_args aa;
        prop_dictionary_t       dict;
        unsigned long           defattr;
-       bool                    is_console;
+       bool                    is_console = FALSE;
        uint32_t                flags;
        int                     i;
 
diff -r 6e5dc6bd2b32 -r 79f0dd1695e7 sys/dev/pci/r128fb.c
--- a/sys/dev/pci/r128fb.c      Wed Sep 16 15:32:53 2015 +0000
+++ b/sys/dev/pci/r128fb.c      Wed Sep 16 16:52:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: r128fb.c,v 1.38 2013/10/09 17:18:23 macallan Exp $     */
+/*     $NetBSD: r128fb.c,v 1.39 2015/09/16 16:52:54 macallan Exp $     */
 
 /*
  * Copyright (c) 2007, 2012 Michael Lorenz
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.38 2013/10/09 17:18:23 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: r128fb.c,v 1.39 2015/09/16 16:52:54 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -201,7 +201,7 @@
        struct wsemuldisplaydev_attach_args aa;
        prop_dictionary_t       dict;
        unsigned long           defattr;
-       bool                    is_console;
+       bool                    is_console = FALSE;
        int                     i, j;
        uint32_t                reg, flags;
        uint8_t                 cmap[768];
diff -r 6e5dc6bd2b32 -r 79f0dd1695e7 sys/dev/pci/voodoofb.c
--- a/sys/dev/pci/voodoofb.c    Wed Sep 16 15:32:53 2015 +0000
+++ b/sys/dev/pci/voodoofb.c    Wed Sep 16 16:52:54 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: voodoofb.c,v 1.49 2014/07/24 09:39:58 macallan Exp $   */
+/*     $NetBSD: voodoofb.c,v 1.50 2015/09/16 16:52:54 macallan Exp $   */
 
 /*
  * Copyright (c) 2005, 2006, 2012 Michael Lorenz
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.49 2014/07/24 09:39:58 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.50 2015/09/16 16:52:54 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -694,7 +694,7 @@
 voodoofb_is_console(struct voodoofb_softc *sc)
 {
        prop_dictionary_t dict;
-       bool console;
+       bool console = FALSE;
 
        dict = device_properties(sc->sc_dev);
        prop_dictionary_get_bool(dict, "is_console", &console);



Home | Main Index | Thread Index | Old Index