Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/hpcmips VR41XX/TX3922 common kernel.



details:   https://anonhg.NetBSD.org/src/rev/375654bfff97
branches:  trunk
changeset: 520084:375654bfff97
user:      uch <uch%NetBSD.org@localhost>
date:      Wed Jan 02 13:13:18 2002 +0000

description:
VR41XX/TX3922 common kernel.

diffstat:

 sys/arch/hpcmips/conf/GENERIC          |  193 +++++++++++++---
 sys/arch/hpcmips/conf/MPC303           |    6 +-
 sys/arch/hpcmips/conf/NULLCONF         |   23 +-
 sys/arch/hpcmips/conf/TX3912           |   26 +-
 sys/arch/hpcmips/conf/TX3922           |   26 +--
 sys/arch/hpcmips/conf/VR41XX           |  384 +++++++++++++++++++++++++++++++++
 sys/arch/hpcmips/conf/std.hpcmips      |    5 +-
 sys/arch/hpcmips/conf/std.hpcmips.tx39 |   25 ++
 sys/arch/hpcmips/conf/std.hpcmips.vr41 |   27 ++
 sys/arch/hpcmips/hpcmips/interrupt.c   |    3 +-
 sys/arch/hpcmips/hpcmips/machdep.c     |   35 +-
 sys/arch/hpcmips/tx/tx39icu.c          |    3 +-
 sys/arch/hpcmips/tx/txsim.c            |   11 +-
 sys/arch/hpcmips/vr/vrip.c             |    6 +-
 14 files changed, 644 insertions(+), 129 deletions(-)

diffs (truncated from 1097 to 300 lines):

diff -r 1d3191492ee2 -r 375654bfff97 sys/arch/hpcmips/conf/GENERIC
--- a/sys/arch/hpcmips/conf/GENERIC     Wed Jan 02 13:11:02 2002 +0000
+++ b/sys/arch/hpcmips/conf/GENERIC     Wed Jan 02 13:13:18 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.101 2001/12/28 12:21:56 martin Exp $
+# $NetBSD: GENERIC,v 1.102 2002/01/02 13:13:18 uch Exp $
 #
 # GENERIC machine description file
 # 
@@ -19,22 +19,17 @@
 # device.
 
 include                "arch/hpcmips/conf/std.hpcmips"
+include                "arch/hpcmips/conf/std.hpcmips.vr41"
+include                "arch/hpcmips/conf/std.hpcmips.tx39"
 
-#ident                 "GENERIC-$Revision: 1.101 $"
+#ident                 "GENERIC-$Revision: 1.102 $"
 
 maxusers       16
 
-options        MIPS3                   # R4000/R4400/R4600 CPUs
-
-# Support for specific models of H/PC MIPS
-options        MIPS3_4100              # VR4100 core
-options        VR41XX                  # NEC VR41xx series
 options        VR4102                  # NEC VR4102
 options        VR4111                  # NEC VR4111
 options        VR4121                  # NEC VR4121
-options        NOFPU                   # No FPU
-options        SOFTFLOAT               # emulate FPU insn
-options        MIPS3_L2CACHE_ABSENT
+options        TX392X                  # Toshiba TX3922
 
 # Standard system options
 options        DDB                     # in-kernel debugger
@@ -62,8 +57,6 @@
 #options       UCONSOLE                # users can redirect console (unsafe)
 
 #options       WINCE_DEFAULT_SETTING   # Debugging use
-#options       DUMP_GIU_LEVEL2_INTR    # Debugging use
-#options       DEBUG_FIND_PCIC         # Debugging use XXX harmful don't define until read source.
 
 #options       SYSCALL_DEBUG           # for debug
 #options       HPCMIPS_L1CACHE_DISABLE # disable L1 cache for debug
@@ -130,21 +123,6 @@
 hpcapm0        at mainbus0                     # power management
 apmdev0        at hpcapm0                      # APM
 
-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
-
-vrkiu* at vrip? addr 0x0b000180 size 0x20 intr 7
-hpckbd*        at vrkiu?
-options        __NO_SOFT_SERIAL_INTERRUPT
-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
-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
-
 options        MQ200_DEBUG
 #options       MQ200_USECRT
 mqvideo0 at vrip? addr 0x0a000000 size 0x800000        # MQ200 video controller
@@ -162,15 +140,6 @@
 vrc4172pwm*    at vrip? addr 0x15003880 size 0x6 platform NEC_MCR_530A
 vrc4172pwm*    at vrip? addr 0x15003880 size 0x6 platform NEC_MCR_700
 
-# Workstation Console attachments
-bivideo0       at      mainbus0
-hpcfb*         at      bivideo0
-wsdisplay*     at      hpcfb?
-wskbd*         at      hpckbd? mux 1
-wsmouse*       at      vrpiu? mux 0
-btnmgr0                at      mainbus0
-wskbd*         at      btnmgr0 mux 1
-
 #
 # hpcmips isa? bus irq locator means:
 #
@@ -344,7 +313,75 @@
 isa5   at vrisab5
 pcic0  at isa5 port 0x3e0 iomem 0x70000 iosiz 0x4000 irq 0x00010003
 
+#
+# Sharp Telios HC-AJ1, HC-VJ1C
+#
+txcsbus1       at tx39biu? platform SHARP_TELIOS
+
+# IO module manager (virtual bridge) DO NOT DELETE
+txioman* at txsim?
+# iochip 0 TX39 internal IO
+#       1 TX39 internal MFIO
+#       2 BETTY IO
+#      (3) ITE IO notyet
+#      (4) Plum2 IO (EXTPW[0:2]) notyet
+hpcioman1 at txioman? platform SHARP_TELIOS_HCAJ1
+hpcin* at hpcioman1 iochip 1 evtype BUTTON  id BTN_APP0   port 7  edge 1 # IE button
+hpcin* at hpcioman1 iochip 1 evtype BUTTON  id BTN_APP1   port 8  edge 1 # Mail button
+hpcin* at hpcioman1 iochip 1 evtype PMEVENT id PME_AC     port 6  edge 1 # AC-power
+hpcin* at hpcioman1 iochip 0 evtype EVENT   id COM0_CTS   port 27 edge 3
+hpcin* at hpcioman1 iochip 0 evtype EVENT   id COM0_DCD   port 29 edge 3
+hpcout*        at hpcioman1 iochip 1 evtype POWER   id PWCTL_LED  port 4  flags 3 #(blink)
+
+hpcioman2 at txioman? platform SHARP_TELIOS_HCVJ1C_JP
+hpcin* at hpcioman2 iochip 1 evtype BUTTON  id BTN_APP0   port 7  edge 1 # IE button
+hpcin* at hpcioman2 iochip 1 evtype BUTTON  id BTN_APP1   port 8  edge 1 # Mail button
+hpcin* at hpcioman2 iochip 1 evtype BUTTON  id BTN_APP2   port 11 edge 1 # Video button
+hpcin* at hpcioman2 iochip 1 evtype BUTTON  id BTN_APP3   port 12 edge 1 # Head phone button
+hpcin* at hpcioman2 iochip 1 evtype PMEVENT id PME_AC     port 6
+hpcin* at hpcioman2 iochip 0 evtype EVENT   id COM0_CTS   port 27 edge 3
+hpcin* at hpcioman2 iochip 1 evtype EVENT   id COM0_DCD   port 13 edge 3
+hpcout*        at hpcioman2 iochip 1 evtype POWER   id PWCTL_COM0 port 15
+hpcout*        at hpcioman2 iochip 1 evtype POWER   id PWCTL_LED  port 4  flags 3 #(blink)
+
+options        USE_POLL
+
+# PHILIPS UCB1200 / TOSHIBA TC35413F modem/audio analog front-end
+ucb*           at tx39sib? slot 0
+ucbtp*         at ucb?
+ucbsnd*                at ucb?
+ucbio*         at ucb?
+
+# PHILIPS 74ALVC*1624? / TOSHIBA TC5165BFTS buffer chip (keyboard)
+# chip select: CS1, IRQ: 3:12/4:12 (irq1 108)
+# interrupt-mode don't work. use polling mode.
+tc5165buf*     at txcsbus1 iocs 1 iocsbase 0 iocssize 0x100 iocswidth 16
+hpckbd*                at tc5165buf?
+#wsmouse*      at ucbtp? mux 0
+
+# TC6358TB(Plum2)
+#  register space: CS3,
+#  I/O space: MCS0 & MCS1,  IRQ: 8:21 (IO[5] positive)
+#
+plum*          at txcsbus? regcs 3 regcswidth 32 iocs 4 iocswidth 32 memcs 5 memcswidth 32 irq1 277
+plumicu*       at plum?
+plumpower*     at plum?
+plumvideo*     at plum?
+hpcfb*         at plumvideo?
+plumpcmcia*    at plum?
+ohci*  at plum?
+
+# Workstation Console attachments
+bivideo0       at      mainbus0
+hpcfb*         at      bivideo0
+wsdisplay*     at      hpcfb?
+wskbd*         at      hpckbd? mux 1
+wsmouse*       at      vrpiu? mux 0
+btnmgr0                at      mainbus0
+wskbd*         at      btnmgr0 mux 1
+
 # PCMCIA bus support
+pcmcia* at plumpcmcia? controller ? socket ?
 pcmcia*        at pcic? controller 0 socket ?
 
 # PCMCIA IDE disk
@@ -379,6 +416,90 @@
 sd*    at scsibus? target ? lun ?      # SCSI disk drives
 cd*    at scsibus? target ? lun ?      # SCSI CD-ROM drives
 
+# USB Hubs
+usb*   at ohci?
+uhub*  at usb?
+uhub*  at uhub? port ? configuration ? interface ?
+
+# USB HID device
+uhidev*        at uhub? port ? configuration ? interface ?
+
+# USB Mice
+ums*   at uhidev? reportid ?
+wsmouse*       at ums? mux 0
+
+# USB Keyboards
+ukbd*  at uhidev? reportid ?
+wskbd* at ukbd? console ? mux 1
+
+# USB Generic HID devices
+uhid*  at uhidev? reportid ?
+
+# USB Printer
+ulpt*  at uhub? port ? configuration ? interface ?
+
+# USB Modem
+umodem*        at uhub? port ? configuration ?
+ucom*  at umodem?
+
+# USB Mass Storage
+umass* at uhub? port ? configuration ? interface ?
+atapibus* at umass? channel ?
+scsibus* at umass? channel ?
+
+# USB audio
+uaudio*        at uhub? port ? configuration ?
+
+# USB MIDI
+umidi* at uhub? port ? configuration ?
+
+# USB IrDA bridges
+#uirda* at uhub? port ? configuration ? interface ?
+#irframe* at uirda?
+
+# USB Ethernet adapters
+aue*   at uhub? port ?         # ADMtek AN986 Pegasus based adapters
+cue*   at uhub? port ?         # CATC USB-EL1201A based adapters
+kue*   at uhub? port ?         # Kawasaki LSI KL5KUSB101B based adapters
+
+# Prolofic PL2301/PL2302 host-to-host adapter
+upl*   at uhub? port ?
+
+# Serial adapters
+# FTDI FT8U100AX serial adapter
+uftdi* at uhub? port ?
+ucom*  at uftdi? portno ?
+
+uplcom*        at uhub? port ?         # I/O DATA USB-RSAQ2 serial adapter
+ucom*  at uplcom? portno ?
+
+umct*  at uhub? port ?         # MCT USB-RS232 serial adapter
+ucom*  at umct? portno ?
+
+# Diamond Multimedia Rio 500
+urio*  at uhub? port ?
+
+# USB Handspring Visor
+uvisor*        at uhub? port ?
+ucom*  at uvisor?
+
+# USB scanners
+uscanner* at uhub? port ?
+
+# USB scanners that use SCSI emulation, e.g., HP5300
+usscanner* at uhub? port ?
+scsibus* at usscanner? channel ?
+
+# Y@P firmware loader
+uyap* at uhub? port ?
+
+# USB Generic driver
+ugen*  at uhub? port ?
+
+audio* at uaudio?
+
+# Pseudo-Devices
+
 pseudo-device  loop            1       # network loopback
 pseudo-device  ppp             2       # serial-line IP ports
 pseudo-device  pppoe                   # PPP over Ethernet (RFC 2516)
diff -r 1d3191492ee2 -r 375654bfff97 sys/arch/hpcmips/conf/MPC303
--- a/sys/arch/hpcmips/conf/MPC303      Wed Jan 02 13:11:02 2002 +0000
+++ b/sys/arch/hpcmips/conf/MPC303      Wed Jan 02 13:13:18 2002 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: MPC303,v 1.4 2001/11/21 11:28:09 uch Exp $
+#      $NetBSD: MPC303,v 1.5 2002/01/02 13:13:19 uch 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.4 $"
+#ident                 "GENERIC-$Revision: 1.5 $"
 
 maxusers       16
 
@@ -17,8 +17,6 @@
 options        MIPS3_4100              # VR4100 core
 options        VR41XX                  # NEC VR41xx series
 options        VR4122                  # NEC VR4122
-options        NOFPU                   # No FPU
-options        SOFTFLOAT               # emulate FPU insn
 options        MIPS3_L2CACHE_ABSENT
 
 # Standard system options
diff -r 1d3191492ee2 -r 375654bfff97 sys/arch/hpcmips/conf/NULLCONF
--- a/sys/arch/hpcmips/conf/NULLCONF    Wed Jan 02 13:11:02 2002 +0000
+++ b/sys/arch/hpcmips/conf/NULLCONF    Wed Jan 02 13:13:18 2002 +0000
@@ -1,17 +1,15 @@
 #
-#      $NetBSD: NULLCONF,v 1.11 2001/12/11 05:43:11 shin Exp $
+#      $NetBSD: NULLCONF,v 1.12 2002/01/02 13:13:19 uch Exp $
 #
 include                "arch/hpcmips/conf/std.hpcmips"
+
 maxusers       8
-options        MIPS3                   # R4000/R4400/R4600 CPUs
-options        MIPS3_4100              # VR4100 core
-options        VR41XX                  # NEC VR41xx series
+
+include                "arch/hpcmips/conf/std.hpcmips.vr41"
 options        VR4102                  # NEC VR4102
 options        VR4111                  # NEC VR4111
 options        VR4121                  # NEC VR4121
-options        NOFPU                   # No FPU
-options        SOFTFLOAT               # emulate FPU insn
-options        MIPS3_L2CACHE_ABSENT



Home | Main Index | Thread Index | Old Index