Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sandpoint Keyboard, mouse, ws*
details: https://anonhg.NetBSD.org/src/rev/b6ab67567859
branches: trunk
changeset: 503566:b6ab67567859
user: briggs <briggs%NetBSD.org@localhost>
date: Thu Feb 08 20:27:24 2001 +0000
description:
Keyboard, mouse, ws*
diffstat:
sys/arch/sandpoint/conf/GENERIC | 32 +++++++++++++++++++++++---------
sys/arch/sandpoint/conf/files.sandpoint | 4 +++-
sys/arch/sandpoint/isa/isa_machdep.c | 20 ++++++++++++++------
sys/arch/sandpoint/sandpoint/conf.c | 15 +++++++--------
4 files changed, 47 insertions(+), 24 deletions(-)
diffs (178 lines):
diff -r 7d9a4a88bc13 -r b6ab67567859 sys/arch/sandpoint/conf/GENERIC
--- a/sys/arch/sandpoint/conf/GENERIC Thu Feb 08 19:02:14 2001 +0000
+++ b/sys/arch/sandpoint/conf/GENERIC Thu Feb 08 20:27:24 2001 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.3 2001/02/08 18:33:03 briggs Exp $
+# $NetBSD: GENERIC,v 1.4 2001/02/08 20:27:24 briggs Exp $
#
# GENERIC for Motorola Sandpoint
#
include "arch/sandpoint/conf/std.sandpoint"
-#ident "GENERIC-$Revision: 1.3 $"
+#ident "GENERIC-$Revision: 1.4 $"
maxusers 32
@@ -54,21 +54,27 @@
config netbsd root on ? type ?
-pseudo-device vnd 4
-pseudo-device loop
+# network psuedo-devices
pseudo-device bpfilter 8 # packet filter
-pseudo-device pty 64 # pseudo-terminals
+#pseudo-device ipfilter
+pseudo-device loop
-# random number generator pseudo-device
+# mouse & keyboard multiplexor pseudo-devices
+pseudo-device wsmux 2
+
+# miscellaneous pseudo-devices
pseudo-device rnd # /dev/random and in-kernel generator
+pseudo-device vnd 4
+pseudo-device pty
#
# device
#
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
-options PCIVERBOSE # verbose PCI device messages
+#options PCIVERBOSE # verbose PCI device messages
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
+options PCI_NETBSD_CONFIGURE # Have NetBSD configure PCI I/O & Mem
mainbus0 at root
@@ -84,8 +90,7 @@
#pciide* at pci? dev ? function ? # Winbond/Symphony IDE interface
-vga* at pci?
-wsdisplay* at vga? console ?
+vga* at pci? dev ? function ?
ep* at pci? dev ? function ? # 3Com 3c59x
ex* at pci? dev ? function ? # 3Com 90x[B]
@@ -93,6 +98,15 @@
ukphy* at mii? phy ? # generic unknown PHYs
exphy* at mii? phy ? # 3Com internal PHYs
+pckbc0 at isa? # PS/2 keyboard controller
+pckbd* at pckbc? # PC keyboard
+pms* at pckbc? # PS/2 mouse for wsmouse
+pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
+wsdisplay* at vga? console ?
+wskbd* at pckbd? console ?
+wsmouse* at pms? mux 0
+wsmouse* at pmsi? mux 0
+
com0 at isa? port 0x3f8 irq 4 # standard PC serial ports
com1 at isa? port 0x2f8 irq 3
diff -r 7d9a4a88bc13 -r b6ab67567859 sys/arch/sandpoint/conf/files.sandpoint
--- a/sys/arch/sandpoint/conf/files.sandpoint Thu Feb 08 19:02:14 2001 +0000
+++ b/sys/arch/sandpoint/conf/files.sandpoint Thu Feb 08 20:27:24 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.sandpoint,v 1.2 2001/02/08 18:33:03 briggs Exp $
+# $NetBSD: files.sandpoint,v 1.3 2001/02/08 20:27:24 briggs Exp $
#
# Motorola's "SandPoint" evaluation board's specific configuration info
#
@@ -89,6 +89,8 @@
include "dev/wscons/files.wscons"
+include "dev/pckbc/files.pckbc"
+
# Floppy disk controller
device fdc {drive = -1}: isadma
file dev/isa/fd.c fdc needs-flag
diff -r 7d9a4a88bc13 -r b6ab67567859 sys/arch/sandpoint/isa/isa_machdep.c
--- a/sys/arch/sandpoint/isa/isa_machdep.c Thu Feb 08 19:02:14 2001 +0000
+++ b/sys/arch/sandpoint/isa/isa_machdep.c Thu Feb 08 20:27:24 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.2 2001/02/08 18:29:05 briggs Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.3 2001/02/08 20:27:25 briggs Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -304,16 +304,24 @@
splx(cpl);
}
-#define SUPERIO_CONF_IDX 0x15C
-#define SUPERIO_CONF_DATA 0x15D
-#define SUPERIO_CONF_LDN 0x07
-#define SUPERIO_CONF_ACTIVATE 0x30
+#define SUPERIO_CONF_IDX 0x15C
+#define SUPERIO_CONF_DATA 0x15D
+#define SUPERIO_CONF_LDN 0x07
+#define SUPERIO_CONF_ACTIVATE 0x30
+#define SUPERIO_CONF_CFG1_ATDRIVE 0x04
void
isa_attach_hook(parent, self, iba)
struct device *parent, *self;
struct isabus_attach_args *iba;
{
- int ldn;
+ u_int8_t cfg;
+ int ldn;
+
+ /* Set PS/2 drive mode */
+ isa_outb(SUPERIO_CONF_IDX, 0x21);
+ cfg = isa_inb(SUPERIO_CONF_DATA);
+ cfg &= ~SUPERIO_CONF_CFG1_ATDRIVE;
+ isa_outb(SUPERIO_CONF_DATA, cfg);
/* Enable the 9 Super I/O devices. */
for (ldn=0; ldn <= 8; ldn++) {
diff -r 7d9a4a88bc13 -r b6ab67567859 sys/arch/sandpoint/sandpoint/conf.c
--- a/sys/arch/sandpoint/sandpoint/conf.c Thu Feb 08 19:02:14 2001 +0000
+++ b/sys/arch/sandpoint/sandpoint/conf.c Thu Feb 08 20:27:24 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.2 2001/02/08 18:33:07 briggs Exp $ */
+/* $NetBSD: conf.c,v 1.3 2001/02/08 20:27:25 briggs Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -232,7 +232,6 @@
#include "rnd.h"
-#if 0
#include "wsdisplay.h"
cdev_decl(wsdisplay);
#include "wskbd.h"
@@ -241,7 +240,6 @@
cdev_decl(wsmouse);
#include "wsmux.h"
cdev_decl(wsmux);
-#endif
#include "scsibus.h"
cdev_decl(scsibus);
@@ -300,13 +298,14 @@
cdev_satlink_init(NSATLINK,satlink), /* 45: planetconnect satlink */
cdev_rnd_init(NRND,rnd), /* 46: random source pseudo-device */
- cdev_notdef(), /* 47 */
- cdev_notdef(), /* 48 */
- cdev_notdef(), /* 49 */
-
+ cdev_wsdisplay_init(NWSDISPLAY,
+ wsdisplay), /* 47: frame buffers, etc. */
+ cdev_mouse_init(NWSKBD, wskbd), /* 48: ws keyboards */
+ cdev_mouse_init(NWSMOUSE,
+ wsmouse), /* 49: ws mice */
cdev_scsibus_init(NSCSIBUS,scsibus), /* 50: SCSI bus */
cdev_disk_init(NRAID,raid), /* 51: RAIDframe disk driver */
- cdev_notdef(), /* 52 */
+ cdev_mouse_init(NWSMUX, wsmux), /* 52: ws multiplexor */
cdev_i4b_init(NI4B, i4b), /* 53: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 54: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 55: i4b raw b-channel access */
Home |
Main Index |
Thread Index |
Old Index