Module Name: src
Committed By: drochner
Date: Tue Feb 2 16:54:40 UTC 2010
Modified Files:
src/sys/dev/wscons: wsdisplay.c wsdisplayvar.h
Log Message:
give up some silly macros which were only used ~once, and reduce
dependency on "locators.h"
makes the code more LKM frienly
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/dev/wscons/wsdisplay.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/wscons/wsdisplayvar.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.c
diff -u src/sys/dev/wscons/wsdisplay.c:1.129 src/sys/dev/wscons/wsdisplay.c:1.130
--- src/sys/dev/wscons/wsdisplay.c:1.129 Tue Feb 2 16:18:29 2010
+++ src/sys/dev/wscons/wsdisplay.c Tue Feb 2 16:54:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.129 2010/02/02 16:18:29 drochner Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.130 2010/02/02 16:54:40 drochner Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.129 2010/02/02 16:18:29 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.130 2010/02/02 16:54:40 drochner Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.h"
@@ -66,6 +66,8 @@
#include <dev/wscons/wscons_callbacks.h>
#include <dev/cons.h>
+#include "locators.h"
+
struct wsscreen_internal {
const struct wsdisplay_emulops *emulops;
void *emulcookie;
@@ -524,13 +526,13 @@
{
struct wsemuldisplaydev_attach_args *ap = aux;
- if (match->wsemuldisplaydevcf_console !=
- WSEMULDISPLAYDEVCF_CONSOLE_UNK) {
+ if (match->cf_loc[WSEMULDISPLAYDEVCF_CONSOLE] !=
+ WSEMULDISPLAYDEVCF_CONSOLE_DEFAULT) {
/*
* If console-ness of device specified, either match
* exactly (at high priority), or fail.
*/
- if (match->wsemuldisplaydevcf_console != 0 &&
+ if (match->cf_loc[WSEMULDISPLAYDEVCF_CONSOLE] != 0 &&
ap->console != 0)
return (10);
else
@@ -554,8 +556,8 @@
ap->console = 0;
wsdisplay_common_attach(sc, ap->console,
- device_cfdata(self)->wsemuldisplaydevcf_kbdmux, ap->scrdata,
- ap->accessops, ap->accesscookie);
+ device_cfdata(self)->cf_loc[WSEMULDISPLAYDEVCF_KBDMUX],
+ ap->scrdata, ap->accessops, ap->accesscookie);
if (ap->console) {
int maj;
@@ -605,7 +607,7 @@
sc->sc_dev = self;
wsdisplay_common_attach(sc, 0,
- device_cfdata(self)->wsemuldisplaydevcf_kbdmux, NULL,
+ device_cfdata(self)->cf_loc[WSDISPLAYDEVCF_KBDMUX], NULL,
ap->accessops, ap->accesscookie);
}
Index: src/sys/dev/wscons/wsdisplayvar.h
diff -u src/sys/dev/wscons/wsdisplayvar.h:1.47 src/sys/dev/wscons/wsdisplayvar.h:1.48
--- src/sys/dev/wscons/wsdisplayvar.h:1.47 Tue Mar 25 00:49:20 2008
+++ src/sys/dev/wscons/wsdisplayvar.h Tue Feb 2 16:54:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplayvar.h,v 1.47 2008/03/25 00:49:20 cube Exp $ */
+/* $NetBSD: wsdisplayvar.h,v 1.48 2010/02/02 16:54:40 drochner Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -149,13 +149,6 @@
void *accesscookie; /* access cookie */
};
-#include "locators.h"
-
-#define wsemuldisplaydevcf_console cf_loc[WSEMULDISPLAYDEVCF_CONSOLE] /* spec'd as console? */
-#define WSEMULDISPLAYDEVCF_CONSOLE_UNK (WSEMULDISPLAYDEVCF_CONSOLE_DEFAULT)
-#define wsemuldisplaydevcf_kbdmux cf_loc[WSEMULDISPLAYDEVCF_KBDMUX]
-#define wsdisplaydevcf_kbdmux cf_loc[WSDISPLAYDEVCF_KBDMUX]
-
struct wscons_syncops {
int (*detach)(void *, int, void (*)(void *, int, int), void *);
int (*attach)(void *, int, void (*)(void *, int, int), void *);
