Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/newsmips Switch to wscons.
details: https://anonhg.NetBSD.org/src/rev/9a5a5c70d5d4
branches: trunk
changeset: 499159:9a5a5c70d5d4
user: tsubai <tsubai%NetBSD.org@localhost>
date: Mon Nov 13 16:48:41 2000 +0000
description:
Switch to wscons.
diffstat:
sys/arch/newsmips/conf/GENERIC | 11 +-
sys/arch/newsmips/conf/WAPIKO | 9 +-
sys/arch/newsmips/conf/files.newsmips | 36 +-
sys/arch/newsmips/dev/bitmapif.c | 726 ----
sys/arch/newsmips/dev/bitmapif.h | 54 -
sys/arch/newsmips/dev/bmcons.c | 947 ------
sys/arch/newsmips/dev/fb.c | 891 ++---
sys/arch/newsmips/dev/fb_conf.c | 208 -
sys/arch/newsmips/dev/fb_mfbs.c | 4926 ---------------------------------
sys/arch/newsmips/dev/fb_probe.c | 255 -
sys/arch/newsmips/dev/fb_start.c | 3520 -----------------------
sys/arch/newsmips/dev/fb_sub.c | 2056 -------------
sys/arch/newsmips/dev/fbbm_253.c | 468 ---
sys/arch/newsmips/dev/fbbm_lcdm.c | 351 --
sys/arch/newsmips/dev/fbdefs.h | 531 ---
sys/arch/newsmips/dev/fbreg.h | 185 -
sys/arch/newsmips/dev/fnt.c | 2105 --------------
sys/arch/newsmips/dev/fnt24.c | 2681 -----------------
sys/arch/newsmips/dev/kb.c | 462 ---
sys/arch/newsmips/dev/kb_ctrl.c | 618 ----
sys/arch/newsmips/dev/kb_encode.c | 384 --
sys/arch/newsmips/dev/kb_hb.c | 240 +
sys/arch/newsmips/dev/kbms_if.c | 306 --
sys/arch/newsmips/dev/kbreg.h | 147 -
sys/arch/newsmips/dev/keyconf.c | 214 -
sys/arch/newsmips/dev/ms.c | 756 -----
sys/arch/newsmips/dev/ms_hb.c | 207 +
sys/arch/newsmips/dev/msreg.h | 120 -
sys/arch/newsmips/dev/newskeymap.c | 156 +
sys/arch/newsmips/dev/scc.h | 64 -
sys/arch/newsmips/dev/sccparam.h | 81 -
sys/arch/newsmips/dev/vt100.c | 779 -----
sys/arch/newsmips/dev/vt100.h | 231 -
sys/arch/newsmips/dev/vt100esc.c | 1671 -----------
sys/arch/newsmips/dev/vt100esc.h | 61 -
sys/arch/newsmips/dev/vt100if.c | 248 -
sys/arch/newsmips/include/conf.h | 10 +-
sys/arch/newsmips/newsmips/conf.c | 29 +-
sys/arch/newsmips/newsmips/cpu_cons.c | 51 +-
39 files changed, 1073 insertions(+), 25722 deletions(-)
diffs (truncated from 27176 to 300 lines):
diff -r ddfdf6ec6e58 -r 9a5a5c70d5d4 sys/arch/newsmips/conf/GENERIC
--- a/sys/arch/newsmips/conf/GENERIC Mon Nov 13 16:40:40 2000 +0000
+++ b/sys/arch/newsmips/conf/GENERIC Mon Nov 13 16:48:41 2000 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.31 2000/10/30 10:16:31 tsubai Exp $
+# $NetBSD: GENERIC,v 1.32 2000/11/13 16:48:41 tsubai Exp $
#
# GENERIC kernel for RISC-NEWS
include "arch/newsmips/conf/std.newsmips"
-#ident "GENERIC-$Revision: 1.31 $"
+#ident "GENERIC-$Revision: 1.32 $"
maxusers 16
@@ -132,6 +132,13 @@
cd* at scsibus? target ? lun ? # SCSI CD-ROMs
ch* at scsibus? target ? lun ? # SCSI changer devices
+options WSEMUL_VT100 # VT100 / VT220 emulation
+options FONT_GALLANT12x22
+
+wsdisplay0 at fb? console ?
+wskbd0 at kb? console ?
+wsmouse0 at ms?
+
pseudo-device loop # loopback interface; required
pseudo-device pty # pseudo-terminals
pseudo-device sl 2 # SLIP interfaces
diff -r ddfdf6ec6e58 -r 9a5a5c70d5d4 sys/arch/newsmips/conf/WAPIKO
--- a/sys/arch/newsmips/conf/WAPIKO Mon Nov 13 16:40:40 2000 +0000
+++ b/sys/arch/newsmips/conf/WAPIKO Mon Nov 13 16:48:41 2000 +0000
@@ -1,7 +1,7 @@
#
# NEWS3400 config file
#
-# $NetBSD: WAPIKO,v 1.11 2000/09/24 15:59:36 jdolecek Exp $
+# $NetBSD: WAPIKO,v 1.12 2000/11/13 16:48:41 tsubai Exp $
#
include "arch/newsmips/conf/std.newsmips"
@@ -77,6 +77,13 @@
#st* at scsibus? target ? lun ? # SCSI tapes
#cd* at scsibus? target ? lun ? # SCSI CD-ROMs
+options WSEMUL_VT100 # VT100 / VT220 emulation
+options FONT_GALLANT12x22
+
+wsdisplay0 at fb? console ?
+wskbd0 at kb? console ?
+wsmouse0 at ms?
+
pseudo-device vnd 4 # disk-like interface to files
#pseudo-device ccd 4 # concatenated and striped disks
pseudo-device loop # loopback interface; required
diff -r ddfdf6ec6e58 -r 9a5a5c70d5d4 sys/arch/newsmips/conf/files.newsmips
--- a/sys/arch/newsmips/conf/files.newsmips Mon Nov 13 16:40:40 2000 +0000
+++ b/sys/arch/newsmips/conf/files.newsmips Mon Nov 13 16:48:41 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.newsmips,v 1.12 2000/11/06 15:00:29 tsubai Exp $
+# $NetBSD: files.newsmips,v 1.13 2000/11/13 16:48:41 tsubai Exp $
# NEWSMIPS-specific configuration info
@@ -53,35 +53,19 @@
attach zstty at zsc
file dev/ic/z8530tty.c zstty needs-count
-device ms
-attach ms at hb
-file arch/newsmips/dev/ms.c ms needs-count
+device kb: wskbddev
+file arch/newsmips/dev/newskeymap.c kb
+
+attach kb at hb with kb_hb
+file arch/newsmips/dev/kb_hb.c kb_hb
-device kb
-attach kb at hb
-file arch/newsmips/dev/kb.c kb needs-count
-file arch/newsmips/dev/kbms_if.c kb | ms
-file arch/newsmips/dev/keyconf.c kb
-file arch/newsmips/dev/kb_ctrl.c kb
-file arch/newsmips/dev/kb_encode.c kb
+device ms: wsmousedev
+attach ms at hb with ms_hb
+file arch/newsmips/dev/ms_hb.c ms_hb
-device fb
+device fb: wsemuldisplaydev, rasops1
attach fb at hb
file arch/newsmips/dev/fb.c fb needs-count
-file arch/newsmips/dev/fb_conf.c fb
-file arch/newsmips/dev/fb_mfbs.c fb
-file arch/newsmips/dev/fb_probe.c fb
-file arch/newsmips/dev/fb_start.c fb
-file arch/newsmips/dev/fb_sub.c fb
-file arch/newsmips/dev/fbbm_253.c fb
-#file arch/newsmips/dev/fbbm_lcdm.c fb
-file arch/newsmips/dev/bmcons.c fb
-file arch/newsmips/dev/bitmapif.c fb
-file arch/newsmips/dev/fnt.c fb
-file arch/newsmips/dev/fnt24.c fb
-file arch/newsmips/dev/vt100.c fb
-file arch/newsmips/dev/vt100esc.c fb
-file arch/newsmips/dev/vt100if.c fb
device fdc {}
attach fdc at hb
diff -r ddfdf6ec6e58 -r 9a5a5c70d5d4 sys/arch/newsmips/dev/bitmapif.c
--- a/sys/arch/newsmips/dev/bitmapif.c Mon Nov 13 16:40:40 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,726 +0,0 @@
-/* $NetBSD: bitmapif.c,v 1.4 2000/08/25 01:04:09 thorpej 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
- * Sony Corp. and Kazumasa Utashiro of Software Research Associates, Inc.
- *
- * 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.
- *
- * from: $Hdr: bitmapif.c,v 4.300 91/06/09 06:14:40 root Rel41 $ SONY
- *
- * @(#)bitmapif.c 8.1 (Berkeley) 6/10/93
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-
-#include <machine/framebuf.h>
-
-#include <newsmips/dev/fbreg.h>
-#include <newsmips/dev/vt100.h>
-#include <newsmips/dev/fbdefs.h>
-#include <newsmips/dev/bitmapif.h>
-
-extern int bm_todo;
-extern int tmode;
-
-#ifdef CPU_SINGLE
-extern char *ext_fnt_addr[];
-extern char *ext_fnt24_addr[];
-#else /* CPU_SINGLE */
-extern char **ext_fnt_addr;
-extern char **ext_fnt24_addr;
-#define lock_bitmap()
-#define unlock_bitmap()
-#endif /* CPU_SINGLE */
-
-extern SCREEN screen;
-
-#ifdef IPC_MRX
-extern int bitmap_use;
-#endif
-
-/*
- * XXX SHOULD USE yield()
- */
-#ifdef CPU_SINGLE
-#include <machine/cpu.h>
-#define PRE_EMPT need_resched(curcpu())
-#else
-#define PRE_EMPT
-#endif
-
-short zero[32 * 2];
-struct csr_buf local_csr_buf;
-
-#ifdef CPU_SINGLE
-struct fb_map rommap;
-#endif
-
-void
-bitmapinit()
-{
- fbbm_rop_reset(consfb);
- if (!consfb->Mono) {
- lock_bitmap();
- fbbm_init_palette(consfb);
- unlock_bitmap();
- }
-}
-
-int
-bm_pallet_read(entry)
- int entry;
-{
- lPalette lp;
- sPalette palette;
-#ifdef CPU_SINGLE
- struct fb_map rommap;
-#endif
-
- lock_bitmap();
-
- lp.count = 1;
-#ifdef CPU_SINGLE
- lp.palette = (sPalette *)&rommap;
- rommap.fm_vaddr = (caddr_t)&palette;
- rommap.fm_offset = 0;
-#else
- lp.palette = &palette;
-#endif
- palette.index = entry;
-
- fbbm_get_palette(consfb, &lp);
-
- unlock_bitmap();
-
- return((palette.rgb.r << 16) | (palette.rgb.g << 8) | palette.rgb.b);
-}
-
-int
-bm_pallet_write(entry, val)
- int entry;
- int val;
-{
- lPalette lp;
- sPalette palette;
-#ifdef CPU_SINGLE
- struct fb_map rommap;
-#endif
-
- lock_bitmap();
-
- lp.count = 1;
-#ifdef CPU_SINGLE
- lp.palette = (sPalette *)&rommap;
- rommap.fm_vaddr = (caddr_t)&palette;
- rommap.fm_offset = 0;
-#else
- lp.palette = &palette;
-#endif
- palette.index = entry;
- palette.rgb.r = ((val >> 16) & 0xff);
- palette.rgb.g = ((val >> 8) & 0xff);
- palette.rgb.b = (val & 0xff);
- fbbm_set_palette(consfb, &lp);
-
- unlock_bitmap();
-
- return(val);
-}
-
-unsigned
-sftjis_to_jis(h, l)
- register unsigned int h, l;
-{
- if ((h >= JVR1S) && (h <= JVR1E))
- h -= JVR1S;
- else if ((h >= JVR2S) && (h <= JVR2E))
- h = h - JVR2S + 0x1f;
- else
- return (0);
-
- h <<= 1;
-
- if ((l >= JHR1S) && (l <= JHR1E))
- l -= JHR1S;
- else if ((l >= JHR2S) && (l <= JHR2E))
- l = l - JHR2S + 0x3f;
- else if ((l >= JHR3S) && (l <= JHR3E)) {
- l -= JHR3S;
- h++;
- } else
- return (0);
-
- return(((h + 0x21) << 8) + l + 0x21);
-}
-
-void
Home |
Main Index |
Thread Index |
Old Index