Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hp300/stand/common Get rid of obsolete grfreg.h. F...
details: https://anonhg.NetBSD.org/src/rev/9cd52bee532e
branches: trunk
changeset: 984369:9cd52bee532e
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Mon Jul 05 13:41:08 2021 +0000
description:
Get rid of obsolete grfreg.h. From OpenBSD.
diffstat:
sys/arch/hp300/stand/common/autoconf.c | 3 +-
sys/arch/hp300/stand/common/grfreg.h | 87 ----------------------------------
sys/arch/hp300/stand/common/ite.c | 24 ++++----
sys/arch/hp300/stand/common/ite_tc.c | 4 +-
4 files changed, 15 insertions(+), 103 deletions(-)
diffs (192 lines):
diff -r 1d436fa813f9 -r 9cd52bee532e sys/arch/hp300/stand/common/autoconf.c
--- a/sys/arch/hp300/stand/common/autoconf.c Mon Jul 05 11:16:56 2021 +0000
+++ b/sys/arch/hp300/stand/common/autoconf.c Mon Jul 05 13:41:08 2021 +0000
@@ -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>
/*
diff -r 1d436fa813f9 -r 9cd52bee532e sys/arch/hp300/stand/common/grfreg.h
--- a/sys/arch/hp300/stand/common/grfreg.h Mon Jul 05 11:16:56 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/* $NetBSD: grfreg.h,v 1.3 2011/02/12 05:08:40 tsutsui Exp $ */
-
-/*
- * Copyright (c) 1991 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.
- *
- * 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: grfreg.h 1.6 92/01/31$
- *
- * @(#)grfreg.h 8.1 (Berkeley) 6/10/93
- */
-
-/* 300 bitmapped display hardware primary id */
-#define GRFHWID 0x39
-
-/* 300 hardware secondary ids */
-#define GID_GATORBOX 1
-#define GID_TOPCAT 2
-#define GID_RENAISSANCE 4
-#define GID_LRCATSEYE 5
-#define GID_HRCCATSEYE 6
-#define GID_HRMCATSEYE 7
-#define GID_DAVINCI 8
-#define GID_XXXCATSEYE 9
-#define GID_XGENESIS 11
-#define GID_TIGER 12
-#define GID_YGENESIS 13
-#define GID_HYPERION 14
-#define GID_A1474MID 16
-#define GID_A147xVGA 17
-
-typedef unsigned char grftype;
-
-struct grfreg {
- grftype gr_pad0,
- gr_id, /* +0x01 */
- gr_pad1[0x3],
- gr_fbwidth_h, /* +0x05 */
- gr_pad2,
- gr_fbwidth_l, /* +0x07 */
- gr_pad3,
- gr_fbheight_h, /* +0x09 */
- gr_pad4,
- gr_fbheight_l, /* +0x0B */
- gr_pad5,
- gr_dwidth_h, /* +0x0D */
- gr_pad6,
- gr_dwidth_l, /* +0x0F */
- gr_pad7,
- gr_dheight_h, /* +0x11 */
- gr_pad8,
- gr_dheight_l, /* +0x13 */
- gr_pad9,
- gr_id2, /* +0x15 */
- gr_pad10[0x47],
- gr_fbomsb, /* +0x5d */
- gr_pad11,
- gr_fbolsb; /* +0x5f */
-};
diff -r 1d436fa813f9 -r 9cd52bee532e sys/arch/hp300/stand/common/ite.c
--- a/sys/arch/hp300/stand/common/ite.c Mon Jul 05 11:16:56 2021 +0000
+++ b/sys/arch/hp300/stand/common/ite.c Mon Jul 05 13:41:08 2021 +0000
@@ -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 @@
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 @@
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
diff -r 1d436fa813f9 -r 9cd52bee532e sys/arch/hp300/stand/common/ite_tc.c
--- a/sys/arch/hp300/stand/common/ite_tc.c Mon Jul 05 11:16:56 2021 +0000
+++ b/sys/arch/hp300/stand/common/ite_tc.c Mon Jul 05 13:41:08 2021 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index