Module Name: src
Committed By: riastradh
Date: Wed Jan 29 19:52:12 UTC 2014
Modified Files:
src/sys/dev/wscons [riastradh-drm2]: wsdisplay_vconsvar.h
src/sys/dev/wsfb [riastradh-drm2]: genfb.c genfbvar.h
Log Message:
Make genfb a little friendlier to modules.
This is not enough to make it actually work as a module itself, but
it's enough to make the i915drm module use genfb.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.8.1 src/sys/dev/wscons/wsdisplay_vconsvar.h
cvs rdiff -u -r1.50.8.2 -r1.50.8.3 src/sys/dev/wsfb/genfb.c
cvs rdiff -u -r1.21 -r1.21.24.1 src/sys/dev/wsfb/genfbvar.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/wscons/wsdisplay_vconsvar.h
diff -u src/sys/dev/wscons/wsdisplay_vconsvar.h:1.22 src/sys/dev/wscons/wsdisplay_vconsvar.h:1.22.8.1
--- src/sys/dev/wscons/wsdisplay_vconsvar.h:1.22 Sun Jan 27 03:59:09 2013
+++ src/sys/dev/wscons/wsdisplay_vconsvar.h Wed Jan 29 19:52:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vconsvar.h,v 1.22 2013/01/27 03:59:09 macallan Exp $ */
+/* $NetBSD: wsdisplay_vconsvar.h,v 1.22.8.1 2014/01/29 19:52:11 riastradh Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -29,8 +29,10 @@
#ifndef _WSDISPLAY_VCONS_H_
#define _WSDISPLAY_VCONS_H_
+#ifdef _KERNEL_OPT
#include "opt_wsdisplay_compat.h"
#include "opt_vcons.h"
+#endif
struct vcons_data;
Index: src/sys/dev/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.50.8.2 src/sys/dev/wsfb/genfb.c:1.50.8.3
--- src/sys/dev/wsfb/genfb.c:1.50.8.2 Wed Jan 29 19:48:45 2014
+++ src/sys/dev/wsfb/genfb.c Wed Jan 29 19:52:11 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $ */
+/* $NetBSD: genfb.c,v 1.50.8.3 2014/01/29 19:52:11 riastradh Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50.8.2 2014/01/29 19:48:45 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.50.8.3 2014/01/29 19:52:11 riastradh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,10 @@ __KERNEL_RCSID(0, "$NetBSD: genfb.c,v 1.
AB_VERBOSE | AB_DEBUG) )
#endif
+#ifdef _KERNEL_OPT
#include "opt_genfb.h"
#include "opt_wsfb.h"
+#endif
#ifdef GENFB_DEBUG
#define GPRINTF panic
Index: src/sys/dev/wsfb/genfbvar.h
diff -u src/sys/dev/wsfb/genfbvar.h:1.21 src/sys/dev/wsfb/genfbvar.h:1.21.24.1
--- src/sys/dev/wsfb/genfbvar.h:1.21 Wed Jul 13 22:47:29 2011
+++ src/sys/dev/wsfb/genfbvar.h Wed Jan 29 19:52:12 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: genfbvar.h,v 1.21 2011/07/13 22:47:29 macallan Exp $ */
+/* $NetBSD: genfbvar.h,v 1.21.24.1 2014/01/29 19:52:12 riastradh Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,12 +27,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.21 2011/07/13 22:47:29 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v 1.21.24.1 2014/01/29 19:52:12 riastradh Exp $");
#ifndef GENFBVAR_H
#define GENFBVAR_H
+#ifdef _KERNEL_OPT
#include "opt_splash.h"
+#endif
#include <sys/param.h>
#include <sys/buf.h>
@@ -46,7 +48,9 @@ __KERNEL_RCSID(0, "$NetBSD: genfbvar.h,v
#include <dev/rasops/rasops.h>
#include <dev/wscons/wsdisplay_vconsvar.h>
+#ifdef _KERNEL_OPT
#include "opt_genfb.h"
+#endif
#ifdef SPLASHSCREEN
#define GENFB_DISABLE_TEXT
