Module Name: src
Committed By: tsutsui
Date: Thu Feb 10 13:04:32 UTC 2011
Modified Files:
src/sys/arch/hp300/stand: Makefile.buildboot
src/sys/arch/hp300/stand/common: ite.c itevar.h
Added Files:
src/sys/arch/hp300/stand/common: ite_tvrx.c
Log Message:
Pull support for Tigershark monochrome framebuffer from OpenBSD.
Untested (no hardware), but doesn't break existing HP425t topcat.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/hp300/stand/Makefile.buildboot
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/common/ite.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/hp300/stand/common/ite_tvrx.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/itevar.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/arch/hp300/stand/Makefile.buildboot
diff -u src/sys/arch/hp300/stand/Makefile.buildboot:1.30 src/sys/arch/hp300/stand/Makefile.buildboot:1.31
--- src/sys/arch/hp300/stand/Makefile.buildboot:1.30 Sat Jan 22 19:19:17 2011
+++ src/sys/arch/hp300/stand/Makefile.buildboot Thu Feb 10 13:04:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.30 2011/01/22 19:19:17 joerg Exp $
+# $NetBSD: Makefile.buildboot,v 1.31 2011/02/10 13:04:31 tsutsui Exp $
# RELOC=FFF00000 allows for boot prog up to FF000 (1044480) bytes long
RELOC= FFF00000
@@ -56,9 +56,9 @@
COMMONSOURCE= srt0.S autoconf.c clock.c conf.c cons.c devopen.c \
exec.c machdep.c prf.c rawfs.c netio.c
DRIVERSOURCE= apci.c ct.c dca.c dcm.c dnkbd.c fhpib.c hil.c \
- hpib.c if_le.c ite.c ite_dv.c ite_gb.c ite_rb.c \
- ite_subr.c ite_tc.c ite_hy.c kbd.c kbdconf.c \
- nhpib.c rd.c scsi.c sd.c
+ hpib.c if_le.c ite.c ite_dv.c ite_gb.c ite_hy.c \
+ ite_rb.c ite_subr.c ite_tc.c ite_tvrx.c \
+ kbd.c kbdconf.c nhpib.c rd.c scsi.c sd.c
.include <bsd.own.mk>
.include <bsd.klinks.mk>
Index: src/sys/arch/hp300/stand/common/ite.c
diff -u src/sys/arch/hp300/stand/common/ite.c:1.14 src/sys/arch/hp300/stand/common/ite.c:1.15
--- src/sys/arch/hp300/stand/common/ite.c:1.14 Thu Feb 10 12:46:22 2011
+++ src/sys/arch/hp300/stand/common/ite.c Thu Feb 10 13:04:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.14 2011/02/10 12:46:22 tsutsui Exp $ */
+/* $NetBSD: ite.c,v 1.15 2011/02/10 13:04:32 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -92,6 +92,10 @@
{ GID_HYPERION,
hyper_init, ite_dio_clear, ite_dio_putc1bpp,
ite_dio_cursor, ite_dio_scroll },
+
+ { GID_TIGER,
+ tvrx_init, ite_dio_clear, ite_dio_putc1bpp,
+ ite_dio_cursor, ite_dio_scroll },
};
int nitesw = sizeof(itesw) / sizeof(itesw[0]);
Index: src/sys/arch/hp300/stand/common/itevar.h
diff -u src/sys/arch/hp300/stand/common/itevar.h:1.13 src/sys/arch/hp300/stand/common/itevar.h:1.14
--- src/sys/arch/hp300/stand/common/itevar.h:1.13 Thu Feb 10 12:46:22 2011
+++ src/sys/arch/hp300/stand/common/itevar.h Thu Feb 10 13:04:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: itevar.h,v 1.13 2011/02/10 12:46:22 tsutsui Exp $ */
+/* $NetBSD: itevar.h,v 1.14 2011/02/10 13:04:32 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -132,3 +132,4 @@
void rbox_init(struct ite_data *);
void dvbox_init(struct ite_data *);
void hyper_init(struct ite_data *);
+void tvrx_init(struct ite_data *);
Added files:
Index: src/sys/arch/hp300/stand/common/ite_tvrx.c
diff -u /dev/null src/sys/arch/hp300/stand/common/ite_tvrx.c:1.1
--- /dev/null Thu Feb 10 13:04:32 2011
+++ src/sys/arch/hp300/stand/common/ite_tvrx.c Thu Feb 10 13:04:32 2011
@@ -0,0 +1,76 @@
+/* $NetBSD: ite_tvrx.c,v 1.1 2011/02/10 13:04:32 tsutsui Exp $ */
+/* $OpenBSD: ite_tvrx.c,v 1.2 2006/08/17 06:31:10 miod Exp $ */
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1990, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department and Mark Davies of the Department of Computer
+ * Science, Victoria University of Wellington, New Zealand.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * from: Utah $Hdr: ite_hy.c 1.1 92/01/22$
+ *
+ * @(#)ite_hy.c 8.1 (Berkeley) 6/10/93
+ */
+
+#ifdef ITECONSOLE
+
+#include <sys/param.h>
+
+#include <hp300/stand/common/samachdep.h>
+#include <hp300/stand/common/itevar.h>
+
+void
+tvrx_init(struct ite_data *ip)
+{
+ int width;
+
+ ip->bmv = ite_dio_windowmove1bpp;
+ ite_fontinfo(ip);
+ width = ((ip->ftwidth + 7) / 8) * 8;
+ ip->cpl = (ip->fbwidth - ip->dwidth) / width;
+ ip->cblanky = ip->fonty + ((128 / ip->cpl) +1) * ip->ftheight;
+
+ /*
+ * Clear the framebuffer on all planes.
+ */
+ ite_dio_windowmove1bpp(ip, 0, 0, 0, 0, ip->fbheight, ip->fbwidth,
+ RR_CLEAR);
+
+ ite_fontinit1bpp(ip);
+
+ /*
+ * Stash the inverted cursor.
+ */
+ ite_dio_windowmove1bpp(ip, charY(ip, ' '), charX1bpp(ip, ' '),
+ ip->cblanky, ip->cblankx, ip->ftheight, ip->ftwidth,
+ RR_COPYINVERTED);
+}
+#endif
