Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hpcmips Added vripif.
details: https://anonhg.NetBSD.org/src/rev/b793ae746044
branches: trunk
changeset: 521278:b793ae746044
user: takemura <takemura%NetBSD.org@localhost>
date: Sun Jan 27 14:18:11 2002 +0000
description:
Added vripif.
diffstat:
sys/arch/hpcmips/conf/LROUTER | 18 +-
sys/arch/hpcmips/conf/MPC303 | 20 +-
sys/arch/hpcmips/conf/files.hpcmips | 35 ++-
sys/arch/hpcmips/conf/ioconf.incl.hpcmips | 3 +
sys/arch/hpcmips/conf/std.hpcmips.vr41 | 16 +-
sys/arch/hpcmips/isa/isa_machdep.c | 6 +-
sys/arch/hpcmips/vr/bcu_vrip.c | 3 +-
sys/arch/hpcmips/vr/cmu.c | 15 +-
sys/arch/hpcmips/vr/cmuvar.h | 12 +-
sys/arch/hpcmips/vr/com_vrip.c | 24 +-
sys/arch/hpcmips/vr/ite8181_vrip.c | 8 +-
sys/arch/hpcmips/vr/mq200_vrip.c | 8 +-
sys/arch/hpcmips/vr/rtc.c | 6 +-
sys/arch/hpcmips/vr/vrc4172gpio.c | 3 +-
sys/arch/hpcmips/vr/vrc4172pwm.c | 12 +-
sys/arch/hpcmips/vr/vrdsu.c | 4 +-
sys/arch/hpcmips/vr/vrgiu.c | 14 +-
sys/arch/hpcmips/vr/vrip.c | 263 ++++++++++++++++++++---------
sys/arch/hpcmips/vr/vripif.h | 104 +++++++++++
sys/arch/hpcmips/vr/vripunit.h | 70 +++++++
sys/arch/hpcmips/vr/vripvar.h | 57 +----
sys/arch/hpcmips/vr/vrkiu.c | 6 +-
sys/arch/hpcmips/vr/vrled.c | 6 +-
sys/arch/hpcmips/vr/vrpciu.c | 6 +-
sys/arch/hpcmips/vr/vrpiu.c | 6 +-
sys/arch/hpcmips/vr/vrpiuvar.h | 4 +-
sys/arch/hpcmips/vr/vrpmu.c | 9 +-
27 files changed, 487 insertions(+), 251 deletions(-)
diffs (truncated from 1514 to 300 lines):
diff -r 9fe37b3e17d8 -r b793ae746044 sys/arch/hpcmips/conf/LROUTER
--- a/sys/arch/hpcmips/conf/LROUTER Sun Jan 27 14:17:10 2002 +0000
+++ b/sys/arch/hpcmips/conf/LROUTER Sun Jan 27 14:18:11 2002 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: LROUTER,v 1.3 2002/01/27 13:23:17 jdolecek Exp $
+# $NetBSD: LROUTER,v 1.4 2002/01/27 14:18:11 takemura Exp $
# From: NetBSD: MPC303,v 1.4 2001/11/21 11:28:09 uch Exp
#
# Kernel configuration file for LASER5 L-Router
@@ -95,7 +95,7 @@
options NFS_BOOT_DHCP
# compile options
-makeoptions DEFGP="-G 18"
+makeoptions DEFGP="-G 14"
config netbsd root on ? type ?
config nfsnetbsd root on ? type nfs
@@ -108,15 +108,15 @@
vrip* at mainbus0
vrbcu* at vrip? addr 0x0f000000 size 0x20
vrcmu* at vrip? addr 0x0f000060 size 0x20
-vrrtc* at vrip? addr 0x0f000100 size 0x20 intr 2
+vrrtc* at vrip? addr 0x0f000100 size 0x20 unit VRRTC
options CONSPEED=115200
-com* at vrip? addr 0x0f000800 size 0x20 intr 9 pwctl PWCTL_COM0
-vrgiu* at vrip? addr 0x0f000140 size 0x20 intr 8
-vrpmu* at vrip? addr 0x0f0000c0 size 0x20 intr 1 # power switch
-#vrpiu* at vrip? addr 0x0b000120 size 0x1a0 intr 5
-#vrled* at vrip? addr 0x0f000180 size 0x10 intr 17
-vrpciu* at vrip? addr 0x0f000c00 size 0x200 intr 22
+com* at vrip? addr 0x0f000800 size 0x20 unit VRSIU pwctl PWCTL_COM0
+vrgiu* at vrip? addr 0x0f000140 size 0x20 unit VRGIU
+vrpmu* at vrip? addr 0x0f0000c0 size 0x20 unit VRPMU # power switch
+#vrpiu* at vrip? addr 0x0b000120 size 0x1a0 unit VRPIU
+#vrled* at vrip? addr 0x0f000180 size 0x10 unit VRLED
+vrpciu* at vrip? addr 0x0f000c00 size 0x200 unit VRPCIU
hpcioman0 at vrgiu? platform LASER5_L_BOARD
# bus 0, device 0, function 0 i82559 #0 LAN(eth0)
diff -r 9fe37b3e17d8 -r b793ae746044 sys/arch/hpcmips/conf/MPC303
--- a/sys/arch/hpcmips/conf/MPC303 Sun Jan 27 14:17:10 2002 +0000
+++ b/sys/arch/hpcmips/conf/MPC303 Sun Jan 27 14:18:11 2002 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: MPC303,v 1.10 2002/01/27 13:23:16 jdolecek Exp $
+# $NetBSD: MPC303,v 1.11 2002/01/27 14:18:11 takemura Exp $
# From: NetBSD: GENERIC,v 1.91 2001/05/06 14:25:16 takemura Exp
#
# Kernel configuration file for Victor MP-C303; enami's test machine.
@@ -7,7 +7,7 @@
include "arch/hpcmips/conf/std.hpcmips"
-#ident "GENERIC-$Revision: 1.10 $"
+#ident "GENERIC-$Revision: 1.11 $"
maxusers 16
@@ -125,17 +125,17 @@
vrip* at mainbus0
vrbcu* at vrip? addr 0x0f000000 size 0x20
vrcmu* at vrip? addr 0x0f000060 size 0x20
-vrrtc* at vrip? addr 0x0f000100 size 0x20 intr 2
+vrrtc* at vrip? addr 0x0f000100 size 0x20 unit VRRTC
-#vrkiu* at vrip? addr 0x0b000180 size 0x20 intr 7
+#vrkiu* at vrip? addr 0x0b000180 size 0x20 unit VRKIU
#hpckbd* at vrkiu?
-com* at vrip? addr 0x0f000800 size 0x20 intr 9 pwctl PWCTL_COM0
-vrgiu* at vrip? addr 0x0f000140 size 0x20 intr 8
-vrpmu* at vrip? addr 0x0f0000c0 size 0x20 intr 1 # power switch
+com* at vrip? addr 0x0f000800 size 0x20 unit VRSIU pwctl PWCTL_COM0
+vrgiu* at vrip? addr 0x0f000140 size 0x20 unit VRGIU
+vrpmu* at vrip? addr 0x0f0000c0 size 0x20 unit VRPMU # power switch
#vrdsu* at vrip? addr 0x0b0000e0 size 0x08
-#vrpiu* at vrip? addr 0x0b000120 size 0x1a0 intr 5
-vrled* at vrip? addr 0x0f000180 size 0x10 intr 17
-vrpciu* at vrip? addr 0x0f000c00 size 0x200 intr 22
+#vrpiu* at vrip? addr 0x0b000120 size 0x1a0 unit VRPIU
+vrled* at vrip? addr 0x0f000180 size 0x10 unit VRLED
+vrpciu* at vrip? addr 0x0f000c00 size 0x200 unit VRPCIU
# PCI bus support
options PCIVERBOSE
diff -r 9fe37b3e17d8 -r b793ae746044 sys/arch/hpcmips/conf/files.hpcmips
--- a/sys/arch/hpcmips/conf/files.hpcmips Sun Jan 27 14:17:10 2002 +0000
+++ b/sys/arch/hpcmips/conf/files.hpcmips Sun Jan 27 14:18:11 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcmips,v 1.67 2002/01/26 10:50:43 takemura Exp $
+# $NetBSD: files.hpcmips,v 1.68 2002/01/27 14:18:11 takemura Exp $
# maxpartitions must be first item in files.${ARCH}.
maxpartitions 8
@@ -97,27 +97,28 @@
#
# Vr41xx integrated peripherals
#
-device vrip { [addr=-1], [size=-1], [addr2=-1], [size2=-1], [intr=-1], [pwctl=-1], [platform = -1] }
+device vripif { [addr=-1], [size=-1], [addr2=-1], [size2=-1], [unit=-1], [pwctl=-1], [platform = -1] }
+device vrip: vripif
attach vrip at mainbus
file arch/hpcmips/vr/vrip.c vrip needs-flag
device vrbcu
-attach vrbcu at vrip
+attach vrbcu at vripif
file arch/hpcmips/vr/bcu_vrip.c vrbcu needs-flag
device vrrtc
-attach vrrtc at vrip
+attach vrrtc at vripif
file arch/hpcmips/vr/rtc.c vrrtc needs-flag
device vrcmu
-attach vrcmu at vrip
+attach vrcmu at vripif
file arch/hpcmips/vr/cmu.c vrcmu needs-flag
include "dev/hpc/files.hpcio"
device vrisabif {[platform = -1], [isaportoffset=0], [isamemoffset=0]} # GIU attachment
device vrgiu: vrisabif, hpcioif
-attach vrgiu at vrip
+attach vrgiu at vripif
file arch/hpcmips/vr/vrgiu.c vrgiu
device vrisab: isabus
@@ -125,35 +126,35 @@
file arch/hpcmips/isa/isa_machdep.c vrisab
device vrkiu: hpckbdif
-attach vrkiu at vrip
+attach vrkiu at vripif
file arch/hpcmips/vr/vrkiu.c vrkiu needs-flag
device vrpmu
-attach vrpmu at vrip
+attach vrpmu at vripif
file arch/hpcmips/vr/vrpmu.c vrpmu needs-flag
device vrdsu
-attach vrdsu at vrip
+attach vrdsu at vripif
file arch/hpcmips/vr/vrdsu.c vrdsu needs-flag
device vrled
-attach vrled at vrip
+attach vrled at vripif
file arch/hpcmips/vr/vrled.c vrled needs-flag
device vrpiu: wsmousedev
-attach vrpiu at vrip: tpcalib
+attach vrpiu at vripif: tpcalib
file arch/hpcmips/vr/vrpiu.c vrpiu
-attach ohci at vrip with ohci_vrip
+attach ohci at vripif with ohci_vrip
file arch/hpcmips/dev/ohci_vrip.c ohci_vrip
device vrpciu: pcibus
-attach vrpciu at vrip
+attach vrpciu at vripif
file arch/hpcmips/vr/vrpciu.c vrpciu needs-flag
defflag opt_mq200.h MQ200_DEBUG MQ200_USECRT
device mqvideo: hpcfbif
-attach mqvideo at vrip with mqvideo_vrip
+attach mqvideo at vripif with mqvideo_vrip
file arch/hpcmips/vr/mq200_vrip.c mqvideo_vrip
file arch/hpcmips/dev/mq200.c mqvideo
file arch/hpcmips/dev/mq200subr.c mqvideo
@@ -164,12 +165,12 @@
file arch/hpcmips/pci/mq200_pci.c mqvideo_pci
device ite8181video: hpcfbif
-attach ite8181video at vrip with ite8181video_vrip
+attach ite8181video at vripif with ite8181video_vrip
file arch/hpcmips/vr/ite8181_vrip.c ite8181video_vrip
file arch/hpcmips/dev/ite8181.c ite8181video
device vrc4172pwm
-attach vrc4172pwm at vrip
+attach vrc4172pwm at vripif
file arch/hpcmips/vr/vrc4172pwm.c vrc4172pwm needs-flag
device vrc4172gpio: hpcioif, vrisabif
@@ -389,7 +390,7 @@
include "dev/pcmcia/files.pcmcia"
# Serial Interface Unit
-attach com at vrip with com_vrip
+attach com at vripif with com_vrip
file arch/hpcmips/vr/com_vrip.c com_vrip needs-flag
attach com at hpcioif with com_hpcio
diff -r 9fe37b3e17d8 -r b793ae746044 sys/arch/hpcmips/conf/ioconf.incl.hpcmips
--- a/sys/arch/hpcmips/conf/ioconf.incl.hpcmips Sun Jan 27 14:17:10 2002 +0000
+++ b/sys/arch/hpcmips/conf/ioconf.incl.hpcmips Sun Jan 27 14:18:11 2002 +0000
@@ -9,3 +9,6 @@
#define CONFIG_HOOK_DEFINE_NICKNAME
#include <machine/config_hook.h>
#undef CONFIG_HOOK_DEFINE_NICKNAME
+#define VRIPUNIT_DEFINE_UNIT_NICKNAME
+#include <hpcmips/vr/vripunit.h>
+#undef VRIPUNIT_DEFINE_UNIT_NICKNAME
diff -r 9fe37b3e17d8 -r b793ae746044 sys/arch/hpcmips/conf/std.hpcmips.vr41
--- a/sys/arch/hpcmips/conf/std.hpcmips.vr41 Sun Jan 27 14:17:10 2002 +0000
+++ b/sys/arch/hpcmips/conf/std.hpcmips.vr41 Sun Jan 27 14:18:11 2002 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: std.hpcmips.vr41,v 1.1 2002/01/02 13:13:19 uch Exp $
+# $NetBSD: std.hpcmips.vr41,v 1.2 2002/01/27 14:18:11 takemura Exp $
# VR41XX common configuration.
#
options MIPS3 # R4000/R4400/R4600 CPUs
@@ -10,16 +10,16 @@
vrip* at mainbus0
vrbcu* at vrip? addr 0x0b000000 size 0x20
vrcmu* at vrip? addr 0x0b000060 size 0x20
-vrrtc* at vrip? addr 0x0b0000c0 size 0x20 intr 2
+vrrtc* at vrip? addr 0x0b0000c0 size 0x20 unit VRRTC
-vrkiu* at vrip? addr 0x0b000180 size 0x20 intr 7
+vrkiu* at vrip? addr 0x0b000180 size 0x20 unit VRKIU
hpckbd* at vrkiu?
-com* at vrip? addr 0x0c000000 size 0x20 intr 9 pwctl PWCTL_COM0
-vrgiu* at vrip? addr 0x0b000100 size 0x20 intr 8
-vrpmu* at vrip? addr 0x0b0000a0 size 0x20 intr 1 # power switch
+com* at vrip? addr 0x0c000000 size 0x20 unit VRSIU pwctl PWCTL_COM0
+vrgiu* at vrip? addr 0x0b000100 size 0x20 unit VRGIU
+vrpmu* at vrip? addr 0x0b0000a0 size 0x20 unit VRPMU # power switch
vrdsu* at vrip? addr 0x0b0000e0 size 0x08
-vrpiu* at vrip? addr 0x0b000120 size 0x1a0 intr 5
-vrled* at vrip? addr 0x0b000240 size 0x10 intr 17
+vrpiu* at vrip? addr 0x0b000120 size 0x1a0 unit VRPIU
+vrled* at vrip? addr 0x0b000240 size 0x10 unit VRLED
# VR-specific debug options.
diff -r 9fe37b3e17d8 -r b793ae746044 sys/arch/hpcmips/isa/isa_machdep.c
--- a/sys/arch/hpcmips/isa/isa_machdep.c Sun Jan 27 14:17:10 2002 +0000
+++ b/sys/arch/hpcmips/isa/isa_machdep.c Sun Jan 27 14:18:11 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.21 2002/01/26 10:50:43 takemura Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.22 2002/01/27 14:18:11 takemura Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -54,9 +54,7 @@
#include <dev/hpc/hpciovar.h>
#include <hpcmips/hpcmips/machdep.h>
-#include <hpcmips/vr/vrcpudef.h>
-#include <hpcmips/vr/vripreg.h>
-#include <hpcmips/vr/vripvar.h>
+#include <hpcmips/vr/vripif.h>
#include "locators.h"
diff -r 9fe37b3e17d8 -r b793ae746044 sys/arch/hpcmips/vr/bcu_vrip.c
--- a/sys/arch/hpcmips/vr/bcu_vrip.c Sun Jan 27 14:17:10 2002 +0000
+++ b/sys/arch/hpcmips/vr/bcu_vrip.c Sun Jan 27 14:18:11 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bcu_vrip.c,v 1.13 2002/01/26 10:50:44 takemura Exp $ */
+/* $NetBSD: bcu_vrip.c,v 1.14 2002/01/27 14:18:12 takemura Exp $ */
/*-
* Copyright (c) 1999-2001 SATO Kazumi. All rights reserved.
@@ -47,6 +47,7 @@
#include "opt_vr41xx.h"
#include <hpcmips/vr/vr.h>
#include <hpcmips/vr/vrcpudef.h>
+#include <hpcmips/vr/vripif.h>
#include <hpcmips/vr/vripvar.h>
#include <hpcmips/vr/vripreg.h>
#include <hpcmips/vr/bcureg.h>
diff -r 9fe37b3e17d8 -r b793ae746044 sys/arch/hpcmips/vr/cmu.c
--- a/sys/arch/hpcmips/vr/cmu.c Sun Jan 27 14:17:10 2002 +0000
+++ b/sys/arch/hpcmips/vr/cmu.c Sun Jan 27 14:18:11 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cmu.c,v 1.6 2002/01/26 10:50:44 takemura Exp $ */
+/* $NetBSD: cmu.c,v 1.7 2002/01/27 14:18:12 takemura Exp $ */
/*-
* Copyright (c) 1999 SASAKI Takesi
@@ -47,8 +47,8 @@
#include "opt_vr41xx.h"
#include <hpcmips/vr/vr.h>
#include <hpcmips/vr/vrcpudef.h>
+#include <hpcmips/vr/vripif.h>
#include <hpcmips/vr/vripreg.h>
-#include <hpcmips/vr/vripvar.h>
#include <hpcmips/vr/cmureg.h>
@@ -60,6 +60,7 @@
bus_space_handle_t sc_ioh;
Home |
Main Index |
Thread Index |
Old Index