Module Name: src
Committed By: macallan
Date: Wed Sep 16 16:52:54 UTC 2015
Modified Files:
src/sys/dev/pci: gffb.c pm2fb.c r128fb.c voodoofb.c
Log Message:
prop_dictionary_get_bool() doesn't return FALSE if the property doesn't
exist, so initialize things first.
No more console stealing on sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/gffb.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/pm2fb.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/r128fb.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/voodoofb.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/pci/gffb.c
diff -u src/sys/dev/pci/gffb.c:1.9 src/sys/dev/pci/gffb.c:1.10
--- src/sys/dev/pci/gffb.c:1.9 Sun Jun 29 03:43:06 2014
+++ src/sys/dev/pci/gffb.c Wed Sep 16 16:52:54 2015
@@ -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 @@ gffb_attach(device_t parent, device_t se
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];
Index: src/sys/dev/pci/pm2fb.c
diff -u src/sys/dev/pci/pm2fb.c:1.27 src/sys/dev/pci/pm2fb.c:1.28
--- src/sys/dev/pci/pm2fb.c:1.27 Wed Dec 17 16:50:08 2014
+++ src/sys/dev/pci/pm2fb.c Wed Sep 16 16:52:54 2015
@@ -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 @@ pm2fb_attach(device_t parent, device_t s
struct wsemuldisplaydev_attach_args aa;
prop_dictionary_t dict;
unsigned long defattr;
- bool is_console;
+ bool is_console = FALSE;
uint32_t flags;
int i;
Index: src/sys/dev/pci/r128fb.c
diff -u src/sys/dev/pci/r128fb.c:1.38 src/sys/dev/pci/r128fb.c:1.39
--- src/sys/dev/pci/r128fb.c:1.38 Wed Oct 9 17:18:23 2013
+++ src/sys/dev/pci/r128fb.c Wed Sep 16 16:52:54 2015
@@ -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 @@ r128fb_attach(device_t parent, device_t
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];
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.49 src/sys/dev/pci/voodoofb.c:1.50
--- src/sys/dev/pci/voodoofb.c:1.49 Thu Jul 24 09:39:58 2014
+++ src/sys/dev/pci/voodoofb.c Wed Sep 16 16:52:54 2015
@@ -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 @@ static bool
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);
