summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorelric <elric@NetBSD.org>2001-12-12 07:47:46 +0000
committerelric <elric@NetBSD.org>2001-12-12 07:47:46 +0000
commit94448f7e52ff6ced60045e1cd2d4760dfb267365 (patch)
tree04482b4ea246b9e9ef251230af959c46344b11e6 /sys/dev
parent8ffabd82eb4087d1aaec7cb0552a478f12c18d2f (diff)
Update the ramdac interface to be allow the setting of dotclocks. This is
required to support the driver in ibm561.c.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/bt463.c7
-rw-r--r--sys/dev/ic/bt485.c5
-rw-r--r--sys/dev/ic/ramdac.h6
3 files changed, 12 insertions, 6 deletions
diff --git a/sys/dev/ic/bt463.c b/sys/dev/ic/bt463.c
index 93137f5fd4c..f07013b607d 100644
--- a/sys/dev/ic/bt463.c
+++ b/sys/dev/ic/bt463.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt463.c,v 1.6 2001/11/13 13:14:35 lukem Exp $ */
+/* $NetBSD: bt463.c,v 1.7 2001/12/12 07:47:46 elric Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.6 2001/11/13 13:14:35 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt463.c,v 1.7 2001/12/12 07:47:46 elric Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -134,6 +134,7 @@ struct ramdac_funcs bt463_funcsstruct = {
bt463_check_curcmap,
bt463_set_curcmap,
bt463_get_curcmap,
+ NULL,
};
/*
@@ -272,7 +273,7 @@ bt463_init(rc)
BTWREG(data, BT463_IREG_COMMAND_0, 0x40);
BTWREG(data, BT463_IREG_COMMAND_1, 0x48);
- BTWREG(data, BT463_IREG_COMMAND_2, 0xC0);
+ BTWREG(data, BT463_IREG_COMMAND_2, 0x40);
/*
* Initialize the read mask.
diff --git a/sys/dev/ic/bt485.c b/sys/dev/ic/bt485.c
index 14fed48db74..934b6dbe023 100644
--- a/sys/dev/ic/bt485.c
+++ b/sys/dev/ic/bt485.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bt485.c,v 1.7 2001/11/13 13:14:35 lukem Exp $ */
+/* $NetBSD: bt485.c,v 1.8 2001/12/12 07:47:46 elric Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.7 2001/11/13 13:14:35 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bt485.c,v 1.8 2001/12/12 07:47:46 elric Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -84,6 +84,7 @@ struct ramdac_funcs bt485_funcsstruct = {
NULL, /* check_curcmap; not needed */
NULL, /* set_curcmap; not needed */
NULL, /* get_curcmap; not needed */
+ NULL, /* no dot clock to set */
};
/*
diff --git a/sys/dev/ic/ramdac.h b/sys/dev/ic/ramdac.h
index 42b91384246..0c65826f98f 100644
--- a/sys/dev/ic/ramdac.h
+++ b/sys/dev/ic/ramdac.h
@@ -1,4 +1,4 @@
-/* $NetBSD: ramdac.h,v 1.2 2000/04/02 18:54:33 nathanw Exp $ */
+/* $NetBSD: ramdac.h,v 1.3 2001/12/12 07:47:46 elric Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -75,6 +75,10 @@ struct ramdac_funcs {
struct wsdisplay_cursor *));
int (*ramdac_get_curcmap) __P((struct ramdac_cookie *,
struct wsdisplay_cursor *));
+
+ /* XXXrcd: new test code for setting the DOTCLOCK */
+ int (*ramdac_set_dotclock) __P((struct ramdac_cookie *,
+ unsigned));
};
#endif