Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/alpha/tc - Remove unused bt459reg.h.
details: https://anonhg.NetBSD.org/src/rev/81b5760b6f7c
branches: trunk
changeset: 484127:81b5760b6f7c
user: nisimura <nisimura%NetBSD.org@localhost>
date: Sun Mar 26 10:32:51 2000 +0000
description:
- Remove unused bt459reg.h.
- sfbvar.h has gone, placing patch on holes for now. Every TC framebuffer
has a single explosure of xxfb_cnattach() which could be bridged by MI
land.
diffstat:
sys/arch/alpha/tc/bt459reg.h | 149 ----------------------------------------
sys/arch/alpha/tc/cfb.c | 7 +-
sys/arch/alpha/tc/tc_3000_300.c | 6 +-
sys/arch/alpha/tc/tc_3000_500.c | 6 +-
sys/arch/alpha/tc/tcasic.c | 8 +-
5 files changed, 12 insertions(+), 164 deletions(-)
diffs (265 lines):
diff -r cc9fd72eb090 -r 81b5760b6f7c sys/arch/alpha/tc/bt459reg.h
--- a/sys/arch/alpha/tc/bt459reg.h Sun Mar 26 10:31:19 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/* $NetBSD: bt459reg.h,v 1.3 1999/04/12 20:38:18 pk Exp $ */
-
-/*-
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
- *
- * 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. 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.
- *
- * @(#)cfbreg.h 8.1 (Berkeley) 6/10/93
- */
-
-/*
- * Mach Operating System
- * Copyright (c) 1991,1990,1989 Carnegie Mellon University
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
- * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- * Software Distribution Coordinator or Software.Distribution%CS.CMU.EDU@localhost
- * School of Computer Science
- * Carnegie Mellon University
- * Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-/*
- * HISTORY
- * Log: bt459.h,v
- * Revision 2.4 91/02/05 17:39:43 mrt
- * Added author notices
- * [91/02/04 11:11:57 mrt]
- *
- * Changed to use new Mach copyright
- * [91/02/02 12:09:39 mrt]
- *
- * Revision 2.3 90/12/05 23:30:26 af
- * Cursor color register are supported, contrary to specs.
- * [90/12/03 23:07:22 af]
- *
- * Revision 2.1.1.1 90/11/01 03:36:40 af
- * Created, from Brooktree specs:
- * "Product Databook 1989"
- * "Bt459 135 MHz Monolithic CMOS 256x64 Color Palette RAMDAC"
- * Brooktree Corp. San Diego, CA
- * LA59001 Rev. J
- * [90/09/03 af]
- */
-
-/*
- * File: bt459.h
- * Author: Alessandro Forin, Carnegie Mellon University
- * Date: 9/90
- *
- * Defines for the bt459 Cursor/RAMDAC chip
- */
-
-typedef struct {
- unsigned char addr_lo;
- char pad0[3];
- unsigned char addr_hi;
- char pad1[3];
- unsigned char addr_reg;
- char pad2[3];
- unsigned char addr_cmap;
- char pad3[3];
-} bt459_regmap_t;
-
-/*
- * Additional registers addressed indirectly
- */
-
- /* 0000-00ff Color Map entries */
- /* 0100-010f Overlay color regs, unsupp */
-#define BT459_REG_CCOLOR_1 0x0181 /* Cursor color regs */
-#define BT459_REG_CCOLOR_2 0x0182
-#define BT459_REG_CCOLOR_3 0x0183
-#define BT459_REG_ID 0x0200 /* read-only, gives "4a" */
-#define BT459_REG_CMD0 0x0201
-#define BT459_REG_CMD1 0x0202
-#define BT459_REG_CMD2 0x0203
-#define BT459_REG_PRM 0x0204
- /* 0205 reserved */
-#define BT459_REG_PBM 0x0206
- /* 0207 reserved */
-#define BT459_REG_ORM 0x0208
-#define BT459_REG_OBM 0x0209
-#define BT459_REG_ILV 0x020a
-#define BT459_REG_TEST 0x020b
-#define BT459_REG_RSIG 0x020c
-#define BT459_REG_GSIG 0x020d
-#define BT459_REG_BSIG 0x020e
- /* 020f-02ff reserved */
-#define BT459_REG_CCR 0x0300
-#define BT459_REG_CXLO 0x0301
-#define BT459_REG_CXHI 0x0302
-#define BT459_REG_CYLO 0x0303
-#define BT459_REG_CYHI 0x0304
-#define BT459_REG_WXLO 0x0305
-#define BT459_REG_WXHI 0x0306
-#define BT459_REG_WYLO 0x0307
-#define BT459_REG_WYHI 0x0308
-#define BT459_REG_WWLO 0x0309
-#define BT459_REG_WWHI 0x030a
-#define BT459_REG_WHLO 0x030b
-#define BT459_REG_WHHI 0x030c
- /* 030d-03ff reserved */
-#define BT459_REG_CRAM_BASE 0x0400
-#define BT459_REG_CRAM_END 0x07ff
diff -r cc9fd72eb090 -r 81b5760b6f7c sys/arch/alpha/tc/cfb.c
--- a/sys/arch/alpha/tc/cfb.c Sun Mar 26 10:31:19 2000 +0000
+++ b/sys/arch/alpha/tc/cfb.c Sun Mar 26 10:32:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cfb.c,v 1.23 1999/12/06 19:25:56 drochner Exp $ */
+/* $NetBSD: cfb.c,v 1.24 2000/03/26 10:32:52 nisimura Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.23 1999/12/06 19:25:56 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cfb.c,v 1.24 2000/03/26 10:32:52 nisimura Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -46,9 +46,6 @@
#include <dev/tc/tcvar.h>
#include <machine/cfbreg.h>
#include <alpha/tc/cfbvar.h>
-#if 0
-#include <alpha/tc/bt459reg.h>
-#endif
#include <dev/rcons/raster.h>
#include <dev/wscons/wscons_raster.h>
diff -r cc9fd72eb090 -r 81b5760b6f7c sys/arch/alpha/tc/tc_3000_300.c
--- a/sys/arch/alpha/tc/tc_3000_300.c Sun Mar 26 10:31:19 2000 +0000
+++ b/sys/arch/alpha/tc/tc_3000_300.c Sun Mar 26 10:32:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_300.c,v 1.22 2000/03/14 05:53:33 nisimura Exp $ */
+/* $NetBSD: tc_3000_300.c,v 1.23 2000/03/26 10:32:52 nisimura Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.22 2000/03/14 05:53:33 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_300.c,v 1.23 2000/03/26 10:32:52 nisimura Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
#include "sfb.h"
#if NSFB > 0
-#include <alpha/tc/sfbvar.h>
+extern int sfb_cnattach __P((tc_addr_t));
#endif
int tc_3000_300_intrnull __P((void *));
diff -r cc9fd72eb090 -r 81b5760b6f7c sys/arch/alpha/tc/tc_3000_500.c
--- a/sys/arch/alpha/tc/tc_3000_500.c Sun Mar 26 10:31:19 2000 +0000
+++ b/sys/arch/alpha/tc/tc_3000_500.c Sun Mar 26 10:32:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tc_3000_500.c,v 1.20 1999/08/07 12:58:29 drochner Exp $ */
+/* $NetBSD: tc_3000_500.c,v 1.21 2000/03/26 10:32:52 nisimura Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.20 1999/08/07 12:58:29 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc_3000_500.c,v 1.21 2000/03/26 10:32:52 nisimura Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -50,7 +50,7 @@
#include "sfb.h"
#if NSFB > 0
-#include <alpha/tc/sfbvar.h>
+extern int sfb_cnattach __P((tc_addr_t));
#endif
void tc_3000_500_intr_setup __P((void));
diff -r cc9fd72eb090 -r 81b5760b6f7c sys/arch/alpha/tc/tcasic.c
--- a/sys/arch/alpha/tc/tcasic.c Sun Mar 26 10:31:19 2000 +0000
+++ b/sys/arch/alpha/tc/tcasic.c Sun Mar 26 10:32:51 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tcasic.c,v 1.27 1999/08/07 12:58:29 drochner Exp $ */
+/* $NetBSD: tcasic.c,v 1.28 2000/03/26 10:32:52 nisimura Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.27 1999/08/07 12:58:29 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.28 2000/03/26 10:32:52 nisimura Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,9 +172,9 @@
#include "cfb.h"
#include "sfb.h"
-#include <alpha/tc/sfbvar.h>
-#include <alpha/tc/cfbvar.h>
+extern int sfb_cnattach __P((tc_addr_t));
+extern int cfb_cnattach __P((tc_addr_t));
extern int tc_checkslot __P((tc_addr_t, char *));
/*
Home |
Main Index |
Thread Index |
Old Index