Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hpcmips p7416buf and tc5165buf are merged.
details: https://anonhg.NetBSD.org/src/rev/e3184977170a
branches: trunk
changeset: 480250:e3184977170a
user: uch <uch%NetBSD.org@localhost>
date: Fri Jan 07 15:19:12 2000 +0000
description:
p7416buf and tc5165buf are merged.
diffstat:
sys/arch/hpcmips/conf/TX3912 | 42 +++-
sys/arch/hpcmips/conf/files.hpcmips | 25 ++-
sys/arch/hpcmips/dev/p7416buf.c | 281 ------------------------------------
sys/arch/hpcmips/dev/p7416bufvar.h | 29 ---
sys/arch/hpcmips/dev/skbdkeymap.h | 29 +++-
sys/arch/hpcmips/dev/tc5165buf.c | 83 +++-------
sys/arch/hpcmips/tx/tx39.c | 32 ++-
7 files changed, 112 insertions(+), 409 deletions(-)
diffs (truncated from 774 to 300 lines):
diff -r 7af11d50f30a -r e3184977170a sys/arch/hpcmips/conf/TX3912
--- a/sys/arch/hpcmips/conf/TX3912 Fri Jan 07 15:10:50 2000 +0000
+++ b/sys/arch/hpcmips/conf/TX3912 Fri Jan 07 15:19:12 2000 +0000
@@ -2,7 +2,7 @@
# Distribution kernel (TX3912 based model) kernel config file
#
-# $NetBSD: TX3912,v 1.3 1999/12/12 17:07:13 uch Exp $
+# $NetBSD: TX3912,v 1.4 2000/01/07 15:19:14 uch Exp $
#
include "arch/hpcmips/conf/std.hpcmips"
@@ -15,17 +15,16 @@
options TX39XX # Toshiba TX39 series
options TX391X # Product TMPR3912
+options KSEG2IOBUFSIZE=0x08000000 # MCS0/MCS1 are mapped to kseg2
options TX39_DEBUG
-#options TX39_WATCHDOGTIMER
-#options WINCE_DEFAULT_SETTING # Debugging use
+options TX39_WATCHDOGTIMER
#options TX39ICUDEBUG
#options TX39CLKDEBUG
#options TX39BIUDEBUG
#options TX39IODEBUG
#options TX39POWERDEBUG
#options TX39UARTDEBUG
-#options IT8368DEBUG
options __NO_SOFT_SERIAL_INTERRUPT
options SERIALCONSSLOT=0 # UARTA 0, UARTB 1
@@ -62,7 +61,9 @@
tx39clock* at txsim?
tx39power* at txsim?
tx3912video* at txsim?
+#options COMPAQ_LOCAL_INTR
tx39io* at txsim?
+tx39sib* at txsim?
tx39uart* at txsim?
txcom0 at tx39uart? slot 0
txcom1 at tx39uart? slot 1
@@ -70,34 +71,37 @@
#
# TX39 external modules. (Platform dependent)
#
-options USE_POLL # p7416buf requires this
+options USE_POLL # keyboard device requires this
-#options COMPAQ_LOCAL_INTR
txcsbus3 at tx39biu? platform COMPAQ_C
txcsbus4 at tx39biu? platform PHILIPS_NINO
+txcsbus5 at tx39biu? platform SHARP_MOBILON
+txcsbus* at tx39biu? # misc unknown.
# PHILIPS 74ALVC*1624? connected keyboard
#
-p7416buf* at txcsbus3 iocs 3 iocsbase 0 iocssize 0x100 iocswidth 16
-skbd* at p7416buf?
+tc5165buf* at txcsbus3 iocs 3 iocsbase 0 iocssize 0x100 iocswidth 16
+tc5165buf* at txcsbus5 iocs 4 iocsbase 0 iocssize 0x100 iocswidth 16
+skbd* at tc5165buf?
# ITE IT8368E PCMCIA buffer chip
# card ... 3:2 (98)
# insert/remove ... 5:1/8 (161/168)
+options IT8368E_LEGACY_MODE # Mobilon HC-4100 requires this
it8368e* at txcsbus? regcs 2 regcsbase 0 regcssize 0x20 regcswidth 16 iocs 8 iocsbase 0 iocssize 0x4000000 iocswidth 16 irq1 161 irq2 168 irq3 98
-#
-# misc unknown.
-#
-txcsbus* at tx39biu?
+# PHILIPS UCB1200 modem/audio analog front-end
+#ucb* at tx39sib? slot 0
# WS console uses SUN or VT100 terminal emulation
fb* at tx3912video?
wsdisplay* at fb?
wskbd* at skbd? mux 1
+#wsmouse* at ucb? mux 0
options WSEMUL_VT100
options WSDISPLAY_DEFAULTSCREENS=4
+options WS_KERNEL_FG=WSCOL_GREEN
#options FONT_VT220L8x8
options FONT_VT220L8x10
@@ -115,7 +119,9 @@
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
mbe* at pcmcia? function ? # MB8696x based Ethernet
ne* at pcmcia? function ? # NE2000-compatible Ethernet
-sm* at pcmcia? function ? # Megahertz Ethernet
+mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
+com* at mhzc?
+sm* at mhzc?
com* at pcmcia? function ? # Modems and serial cards
@@ -124,8 +130,14 @@
scsibus* at aic?
sd* at scsibus? target ? lun ? # SCSI disk drives
+# disk/mass storage pseudo-devices
+pseudo-device vnd 4 # disk-like interface to files
+pseudo-device md 1 # memory disk
+
+pseudo-device bpfilter 8 # Berkeley packet filter
pseudo-device loop 1 # network loopback
+pseudo-device ppp 2 # Point-to-Point Protocol
pseudo-device pty 64 # pseudo ptys
-#pseudo-device md 1 # memory disk
-pseudo-device biconsdev 1 # build-in console device
+# mouse & keyboard multiplexor pseudo-devices
+pseudo-device wsmux 2
diff -r 7af11d50f30a -r e3184977170a sys/arch/hpcmips/conf/files.hpcmips
--- a/sys/arch/hpcmips/conf/files.hpcmips Fri Jan 07 15:10:50 2000 +0000
+++ b/sys/arch/hpcmips/conf/files.hpcmips Fri Jan 07 15:19:12 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcmips,v 1.13 1999/12/28 03:15:17 takemura Exp $
+# $NetBSD: files.hpcmips,v 1.14 2000/01/07 15:19:14 uch Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@@ -146,10 +146,12 @@
attach vrdsu at vrip
file arch/hpcmips/vr/vrdsu.c vrdsu needs-flag
+define mra
+file arch/hpcmips/vr/mra.c mra
+
device vrpiu: wsmousedev
-attach vrpiu at vrip
+attach vrpiu at vrip: mra
file arch/hpcmips/vr/vrpiu.c vrpiu
-file arch/hpcmips/vr/mra.c vrpiu
#
# TOSHIBA TX3912/3922
@@ -162,12 +164,12 @@
defopt TX39IODEBUG
defopt TX39POWERDEBUG
defopt TX39UARTDEBUG
-defopt IT8368DEBUG
defopt USE_POLL
device txsim { }
device txcsbusif {[platform = -1]}
device txcomif {[slot = -1]}
+device txsibif {[slot = -1]}
attach txsim at mainbus
file arch/hpcmips/tx/txsim.c txsim
@@ -200,6 +202,16 @@
attach tx39io at txsim
file arch/hpcmips/tx/tx39io.c tx39io
+device tx39sib: txsibif
+attach tx39sib at txsim
+file arch/hpcmips/tx/tx39sib.c tx39sib
+
+# PHILIPS UCB1200 modem/audio analog front-end
+device ucb: wsmousedev
+attach ucb at txsibif: mra
+file arch/hpcmips/dev/ucb1200.c ucb
+
+
device tx39uart: txcomif
attach tx39uart at txsim
file arch/hpcmips/tx/tx39uart.c tx39uart needs-flag
@@ -214,10 +226,6 @@
file arch/hpcmips/dev/it8368.c it8368e
device skbdif {}
-# PHILIPS 74ALVC16241 buffer driver (keyboard)
-device p7416buf: skbdif
-attach p7416buf at txcsbus
-file arch/hpcmips/dev/p7416buf.c p7416buf needs-flag
# MITUBISHI M38813 keryboard controller
device m38813c: skbdif
@@ -225,6 +233,7 @@
file arch/hpcmips/dev/m38813c.c m38813c needs-flag
# TOSHIBA TC5165BTFS buffer driver (keyboard)
+# PHILIPS 74ALVC16241 buffer driver (keyboard)
device tc5165buf: skbdif
attach tc5165buf at txcsbus
file arch/hpcmips/dev/tc5165buf.c tc5165buf needs-flag
diff -r 7af11d50f30a -r e3184977170a sys/arch/hpcmips/dev/p7416buf.c
--- a/sys/arch/hpcmips/dev/p7416buf.c Fri Jan 07 15:10:50 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,281 +0,0 @@
-/* $NetBSD: p7416buf.c,v 1.3 2000/01/03 18:24:03 uch Exp $ */
-
-/*
- * Copyright (c) 1999, by UCHIYAMA Yasushi
- * All rights reserved.
- *
- * 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. The name of the developer may NOT be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- */
-
-/*
- * Device driver for PHILIPS 74ALVC16241/245 buffer chip
- */
-
-#include "opt_tx39_debug.h"
-#include "opt_use_poll.h"
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <hpcmips/tx/tx39var.h>
-#include <hpcmips/tx/txcsbusvar.h>
-
-#include <hpcmips/dev/p7416bufvar.h>
-#include <hpcmips/dev/skbdvar.h>
-
-#define P7416_SERACH_MAX 256
-#define P7416_ROW_MAX 16
-#define P7416_COLUMN_MAX 8 /* XXX 16? */
-
-struct p7416buf_chip {
- bus_space_tag_t scc_cst;
- bus_space_handle_t scc_csh;
- u_int16_t scc_buf[P7416_ROW_MAX];
- int scc_enabled;
-
- struct skbd_controller scc_controller;
-};
-
-struct p7416buf_softc {
- struct device sc_dev;
- struct p7416buf_chip *sc_chip;
- tx_chipset_tag_t sc_tc;
- void *sc_ih;
-};
-
-int p7416buf_match __P((struct device*, struct cfdata*, void*));
-void p7416buf_attach __P((struct device*, struct device*, void*));
-int p7416buf_intr __P((void*));
-int p7416buf_poll __P((void*));
-void p7416buf_ifsetup __P((struct p7416buf_chip*));
-
-int p7416buf_input_establish __P((void*, int (*) __P((void*, int, int)),
- void (*) __P((void*)), void*));
-
-struct p7416buf_chip p7416buf_chip;
-
-struct cfattach p7416buf_ca = {
- sizeof(struct p7416buf_softc), p7416buf_match, p7416buf_attach
-};
-
-int
-p7416buf_match(parent, cf, aux)
- struct device *parent;
- struct cfdata *cf;
- void *aux;
-{
- return 1;
-}
-
-void
-p7416buf_attach(parent, self, aux)
- struct device *parent;
- struct device *self;
- void *aux;
-{
- struct cs_attach_args *ca = aux;
- struct p7416buf_softc *sc = (void*)self;
- struct skbd_attach_args saa;
-
- sc->sc_tc = ca->ca_tc;
- sc->sc_chip = &p7416buf_chip;
-
- sc->sc_chip->scc_cst = ca->ca_csio.cstag;
Home |
Main Index |
Thread Index |
Old Index