Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/shark Garbage-collect the old Shark-specific "pccon...
details: https://anonhg.NetBSD.org/src/rev/d7bd157ed299
branches: trunk
changeset: 962029:d7bd157ed299
user: thorpej <thorpej%NetBSD.org@localhost>
date: Tue Apr 27 23:37:01 2021 +0000
description:
Garbage-collect the old Shark-specific "pccons" stuff. Shark has
been wscons for some time now.
diffstat:
sys/arch/shark/conf/GENERIC | 15 +-
sys/arch/shark/conf/INSTALL | 9 +-
sys/arch/shark/conf/files.shark | 15 +-
sys/arch/shark/ofw/ofisapc.c | 126 ----
sys/arch/shark/shark/kbdreg.h | 32 -
sys/arch/shark/shark/opms.c | 1011 ---------------------------------------
6 files changed, 4 insertions(+), 1204 deletions(-)
diffs (truncated from 1276 to 300 lines):
diff -r 0b88198860a0 -r d7bd157ed299 sys/arch/shark/conf/GENERIC
--- a/sys/arch/shark/conf/GENERIC Tue Apr 27 21:39:39 2021 +0000
+++ b/sys/arch/shark/conf/GENERIC Tue Apr 27 23:37:01 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.137 2021/04/27 21:39:39 thorpej Exp $
+# $NetBSD: GENERIC,v 1.138 2021/04/27 23:37:01 thorpej Exp $
#
# Generic Shark configuration.
#
@@ -7,7 +7,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.137 $"
+#ident "GENERIC-$Revision: 1.138 $"
# estimated number of users
maxusers 32
@@ -216,17 +216,6 @@
cd* at atapibus? drive?
sd* at atapibus? drive?
-# PCCONS@OFW
-#ofisapc* at ofbus?
-#pc* at ofisapc?
-#options FRENCH_KBD
-#options FINNISH_KBD
-#options GERMAN_KBD
-#options NORWEGIAN_KBD
-
-# PS/2 Mouse
-#opms0 at spckbd? irq 12
-
# wscons
pckbc* at ofisa?
pckbd* at pckbc?
diff -r 0b88198860a0 -r d7bd157ed299 sys/arch/shark/conf/INSTALL
--- a/sys/arch/shark/conf/INSTALL Tue Apr 27 21:39:39 2021 +0000
+++ b/sys/arch/shark/conf/INSTALL Tue Apr 27 23:37:01 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.66 2021/04/27 21:39:40 thorpej Exp $
+# $NetBSD: INSTALL,v 1.67 2021/04/27 23:37:01 thorpej Exp $
#
# Shark installation kernel
#
@@ -185,13 +185,6 @@
cd* at atapibus? drive?
sd* at atapibus? drive?
-# PCCONS@OFW
-#ofisapc* at ofbus?
-#pc* at ofisapc?
-
-# PS/2 Mouse
-#opms0 at spckbd? irq 12
-
# wscons
pckbc* at ofisa?
pckbd* at pckbc?
diff -r 0b88198860a0 -r d7bd157ed299 sys/arch/shark/conf/files.shark
--- a/sys/arch/shark/conf/files.shark Tue Apr 27 21:39:39 2021 +0000
+++ b/sys/arch/shark/conf/files.shark Tue Apr 27 23:37:01 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.shark,v 1.21 2017/12/18 15:53:39 skrll Exp $
+# $NetBSD: files.shark,v 1.22 2021/04/27 23:37:01 thorpej Exp $
#
# First try for arm-specific configuration info
#
@@ -57,9 +57,6 @@
file arch/shark/ofw/wdc_ofisa_machdep.c wdc_ofisa
# Glue for OFW ISA device attachment
-device ofisapc {}
-attach ofisapc at ofbus
-file arch/shark/ofw/ofisapc.c ofisapc
device ofisascr {}
attach ofisascr at ofisa
file arch/shark/ofw/ofisascr.c scr
@@ -71,16 +68,6 @@
# Memory disk driver
file dev/md_root.c md & memory_disk_hooks
-# attribute used to represent the "keyboard controller" on the shark
-# XXX should be a real device
-define spckbd { [irq = -1], [port = -1] }
-
-# PS/2 mouse device
-device opms: tty
-file arch/shark/shark/opms.c opms needs-flag
-
-attach opms at spckbd with opms
-
device todclock
attach todclock at todservice
file arch/shark/dev/todclock.c todclock needs-count
diff -r 0b88198860a0 -r d7bd157ed299 sys/arch/shark/ofw/ofisapc.c
--- a/sys/arch/shark/ofw/ofisapc.c Tue Apr 27 21:39:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/* $NetBSD: ofisapc.c,v 1.12 2021/04/24 23:36:48 thorpej Exp $ */
-
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- *
- * This software is furnished under license and may be used and
- * copied only in accordance with the following terms and conditions.
- * Subject to these conditions, you may download, copy, install,
- * use, modify and distribute this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce
- * and retain this copyright notice and list of conditions as
- * they appear in the source file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of
- * Digital Equipment Corporation. Neither the "Digital Equipment
- * Corporation" name nor any trademark or logo of Digital Equipment
- * Corporation may be used to endorse or promote products derived
- * from this software without the prior written permission of
- * Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied
- * warranties, including but not limited to, any implied warranties
- * of merchantability, fitness for a particular purpose, or
- * non-infringement are disclaimed. In no event shall DIGITAL be
- * liable for any damages whatsoever, and in particular, DIGITAL
- * shall not be liable for special, indirect, consequential, or
- * incidental damages or damages for lost profits, loss of
- * revenue or loss of use, whether such damages arise in contract,
- * negligence, tort, under statute, in equity, at law or otherwise,
- * even if advised of the possibility of such damage.
- */
-
-/*
- * OFW Glue for PCCONS Driver
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofisapc.c,v 1.12 2021/04/24 23:36:48 thorpej Exp $");
-
-#include <sys/param.h>
-#include <sys/device.h>
-#include <sys/systm.h>
-
-#include <machine/intr.h>
-#include <machine/irqhandler.h>
-
-#include <dev/ofw/openfirm.h>
-#include <dev/isa/isavar.h>
-#include <shark/shark/i8042reg.h>
-#include <shark/shark/ns87307reg.h>
-
-
-int ofisapcprobe(device_t, cfdata_t, void *);
-void ofisapcattach(device_t, device_t, void *);
-
-
-CFATTACH_DECL_NEW(ofisapc, 0,
- ofisapcprobe, ofisapcattach, NULL, NULL);
-
-extern struct cfdriver ofisapc_cd;
-
-
-int
-ofisapcprobe(device_t parent, cfdata_t cf, void *aux)
-{
- struct ofbus_attach_args *oba = aux;
- char type[64];
- char name[64];
-
- /* At a minimum, must match type and name properties. */
- if ( OF_getprop(oba->oba_phandle, "device_type", type,
- sizeof(type)) < 0 || strcmp(type, "keyboard") != 0 ||
- OF_getprop(oba->oba_phandle, "name", name, sizeof(name)) < 0 ||
- strcmp(name, "keyboard") != 0)
- return 0;
-
- /* Better than a generic match. */
- return 2;
-}
-
-
-void
-ofisapcattach(device_t parent, device_t dev, void *aux)
-{
- struct ofbus_attach_args *oba = aux;
- static struct isa_attach_args ia;
- struct isa_io ia_io[1];
- struct isa_irq ia_irq[1];
-
- printf("\n");
-
-#define BASE_KEYBOARD 0x60
-
- /*
- * Start with the Keyboard and mouse device configuration in the
- * SuperIO H/W
- */
- (void)i87307KbdConfig(&isa_io_bs_tag, BASE_KEYBOARD, IRQ_KEYBOARD);
- (void)i87307MouseConfig (&isa_io_bs_tag, IRQ_MOUSE);
-
- /* XXX - Hard-wire the ISA attach args for now. -JJK */
- ia.ia_iot = &isa_io_bs_tag;
- ia.ia_memt = &isa_mem_bs_tag;
- ia.ia_ic = NULL; /* not used */
-
- ia.ia_nio = 1;
- ia.ia_io = ia_io;
- ia.ia_io[0].ir_addr = BASE_KEYBOARD;
- ia.ia_io[0].ir_size = I8042_NPORTS;
-
- ia.ia_nirq = 1;
- ia.ia_irq = ia_irq;
- ia.ia_irq[0].ir_irq = IRQ_KEYBOARD;
-
- ia.ia_niomem = 0;
- ia.ia_ndrq = 0;
-
- ia.ia_aux = (void *)oba->oba_phandle;
-
- config_found(dev, &ia, NULL,
- CFARG_DEVHANDLE, devhandle_from_of(oba->oba_phandle),
- CFARG_EOL);
-}
diff -r 0b88198860a0 -r d7bd157ed299 sys/arch/shark/shark/kbdreg.h
--- a/sys/arch/shark/shark/kbdreg.h Tue Apr 27 21:39:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/* $NetBSD: kbdreg.h,v 1.1 2002/02/10 01:58:06 thorpej Exp $ */
-
-#ifndef _KBDREG_H
-#define _KBDREG_H
-
-/* Commands sent by the controller to the physical keyboard
-*/
-#define KBC_RESET 0xFF /* reset the keyboard */
-#define KBC_RESEND 0xFE /* request the keyboard resend the last byte */
-#define KBC_SETDEFAULT 0xF6 /* resets keyboard to its power-on defaults */
-#define KBC_DISABLE 0xF5 /* as per KBC_SETDEFAULT, but also disable key scanning */
-#define KBC_ENABLE 0xF4 /* enable key scanning */
-#define KBC_TYPEMATIC 0xF3 /* set typematic rate and delay */
-#define KBC_SETTABLE 0xF0 /* set scancode translation table */
-#define KBC_MODEIND 0xED /* set mode indicators (i.e. LEDs) */
-#define KBC_ECHO 0xEE /* request an echo from the keyboard */
-
-/* Physical keyboard responses
-*/
-#define KBR_EXTENDED 0xE0 /* extended key sequence */
-#define KBR_RESEND 0xFE /* needs resend of command */
-#define KBR_ACK 0xFA /* received a valid command */
-#define KBR_OVERRUN 0x00 /* flooded */
-#define KBR_FAILURE 0xFD /* diagnosic failure */
-#define KBR_BREAK 0xF0 /* break code prefix - sent on key release */
-#define KBR_RSTDONE 0xAA /* reset complete */
-#define KBR_ECHO 0xEE /* echo response */
-
-#endif
-
-
-
diff -r 0b88198860a0 -r d7bd157ed299 sys/arch/shark/shark/opms.c
--- a/sys/arch/shark/shark/opms.c Tue Apr 27 21:39:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1011 +0,0 @@
-/* $NetBSD: opms.c,v 1.31 2021/01/03 17:28:33 thorpej Exp $ */
-
-/*
- * Copyright 1997
- * Digital Equipment Corporation. All rights reserved.
- *
- * This software is furnished under license and may be used and
- * copied only in accordance with the following terms and conditions.
- * Subject to these conditions, you may download, copy, install,
- * use, modify and distribute this software in source and/or binary
- * form. No title or ownership is transferred hereby.
- *
- * 1) Any source code used, modified or distributed must reproduce
- * and retain this copyright notice and list of conditions as
- * they appear in the source file.
- *
- * 2) No right is granted to use any trade name, trademark, or logo of
- * Digital Equipment Corporation. Neither the "Digital Equipment
- * Corporation" name nor any trademark or logo of Digital Equipment
- * Corporation may be used to endorse or promote products derived
- * from this software without the prior written permission of
- * Digital Equipment Corporation.
- *
- * 3) This software is provided "AS-IS" and any express or implied
- * warranties, including but not limited to, any implied warranties
- * of merchantability, fitness for a particular purpose, or
- * non-infringement are disclaimed. In no event shall DIGITAL be
- * liable for any damages whatsoever, and in particular, DIGITAL
- * shall not be liable for special, indirect, consequential, or
- * incidental damages or damages for lost profits, loss of
- * revenue or loss of use, whether such damages arise in contract,
- * negligence, tort, under statute, in equity, at law or otherwise,
- * even if advised of the possibility of such damage.
- */
-
Home |
Main Index |
Thread Index |
Old Index