Module Name: src
Committed By: tsutsui
Date: Mon Jul 5 13:41:08 UTC 2021
Modified Files:
src/sys/arch/hp300/stand/common: autoconf.c ite.c ite_tc.c
Removed Files:
src/sys/arch/hp300/stand/common: grfreg.h
Log Message:
Get rid of obsolete grfreg.h. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/autoconf.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/hp300/stand/common/grfreg.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp300/stand/common/ite.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/stand/common/ite_tc.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/arch/hp300/stand/common/autoconf.c
diff -u src/sys/arch/hp300/stand/common/autoconf.c:1.13 src/sys/arch/hp300/stand/common/autoconf.c:1.14
--- src/sys/arch/hp300/stand/common/autoconf.c:1.13 Tue Feb 8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/autoconf.c Mon Jul 5 13:41:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.13 2011/02/08 20:20:14 rmind Exp $ */
+/* $NetBSD: autoconf.c,v 1.14 2021/07/05 13:41:08 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -49,7 +49,6 @@
#include <hp300/stand/common/scsivar.h>
#include <hp300/dev/dioreg.h>
-#include <hp300/stand/common/grfreg.h>
#include <hp300/dev/intioreg.h>
/*
Index: src/sys/arch/hp300/stand/common/ite.c
diff -u src/sys/arch/hp300/stand/common/ite.c:1.18 src/sys/arch/hp300/stand/common/ite.c:1.19
--- src/sys/arch/hp300/stand/common/ite.c:1.18 Fri Feb 26 18:11:11 2016
+++ src/sys/arch/hp300/stand/common/ite.c Mon Jul 5 13:41:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.18 2016/02/26 18:11:11 christos Exp $ */
+/* $NetBSD: ite.c,v 1.19 2021/07/05 13:41:08 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -47,7 +47,7 @@
#include <sys/param.h>
#include <dev/cons.h>
-#include <hp300/stand/common/grfreg.h>
+#include <hp300/dev/diofbreg.h>
#include <hp300/dev/intioreg.h>
#include <hp300/dev/sgcreg.h>
#include <dev/ic/stireg.h>
@@ -129,19 +129,19 @@ iteconfig(void)
int dtype, fboff, slotno, i;
uint8_t *va;
struct hp_hw *hw;
- struct grfreg *gr;
+ struct diofbreg *fb;
struct ite_data *ip;
i = 0;
for (hw = sc_table; hw < &sc_table[MAXCTLRS]; hw++) {
if (!HW_ISDEV(hw, D_BITMAP))
continue;
- gr = (struct grfreg *) hw->hw_kva;
+ fb = (struct diofbreg *)hw->hw_kva;
/* XXX: redundent but safe */
- if (badaddr((void *)gr) || gr->gr_id != GRFHWID)
+ if (badaddr((void *)fb) || fb->id != GRFHWID)
continue;
for (dtype = 0; dtype < nitesw; dtype++)
- if (itesw[dtype].ite_hwid == gr->gr_id2)
+ if (itesw[dtype].ite_hwid == fb->fbid)
break;
if (dtype == nitesw)
continue;
@@ -150,16 +150,16 @@ iteconfig(void)
ite_scode[i] = hw->hw_sc;
ip = &ite_data[i];
ip->isw = &itesw[dtype];
- ip->regbase = (void *) gr;
- fboff = (gr->gr_fbomsb << 8) | gr->gr_fbolsb;
+ ip->regbase = (void *)fb;
+ fboff = (fb->fbomsb << 8) | fb->fbolsb;
ip->fbbase = (void *)(*((u_char *)ip->regbase + fboff) << 16);
/* DIO II: FB offset is relative to select code space */
if (ip->regbase >= (void *)DIOIIBASE)
ip->fbbase = (char*)ip->fbbase + (int)ip->regbase;
- ip->fbwidth = gr->gr_fbwidth_h << 8 | gr->gr_fbwidth_l;
- ip->fbheight = gr->gr_fbheight_h << 8 | gr->gr_fbheight_l;
- ip->dwidth = gr->gr_dwidth_h << 8 | gr->gr_dwidth_l;
- ip->dheight = gr->gr_dheight_h << 8 | gr->gr_dheight_l;
+ ip->fbwidth = fb->fbwmsb << 8 | fb->fbwlsb;
+ ip->fbheight = fb->fbhmsb << 8 | fb->fbhlsb;
+ ip->dwidth = fb->dwmsb << 8 | fb->dwlsb;
+ ip->dheight = fb->dhmsb << 8 | fb->dhlsb;
/*
* XXX some displays (e.g. the davinci) appear
* to return a display height greater than the
Index: src/sys/arch/hp300/stand/common/ite_tc.c
diff -u src/sys/arch/hp300/stand/common/ite_tc.c:1.10 src/sys/arch/hp300/stand/common/ite_tc.c:1.11
--- src/sys/arch/hp300/stand/common/ite_tc.c:1.10 Thu Feb 10 12:46:22 2011
+++ src/sys/arch/hp300/stand/common/ite_tc.c Mon Jul 5 13:41:08 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_tc.c,v 1.10 2011/02/10 12:46:22 tsutsui Exp $ */
+/* $NetBSD: ite_tc.c,v 1.11 2021/07/05 13:41:08 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -42,8 +42,8 @@
#include <sys/param.h>
+#include <hp300/dev/diofbreg.h>
#include <hp300/stand/common/itereg.h>
-#include <hp300/stand/common/grfreg.h>
#include <hp300/stand/common/grf_tcreg.h>
#include <hp300/stand/common/samachdep.h>
