Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/hp300/conf Switch NetBSD/hp300 to wscons with rasop...



details:   https://anonhg.NetBSD.org/src/rev/4473b3f9e0ba
branches:  trunk
changeset: 761741:4473b3f9e0ba
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Feb 06 18:40:55 2011 +0000

description:
Switch NetBSD/hp300 to wscons with rasops. Simply ported from OpenBSD/hp300.

- Only A1416 Kathmandu (topcat) framebuffer on 425t is tested, but
  all other variants (TigerShark, Hyperion, DaVinci, GatorBox, Renaissance)
  should also work if they are working on OpenBSD/hp300.
- sti(4) and SGC bus support are not pulled because I don't have 425e
  and I can't confirm that 362 and 382 actually have SGC bus.
  (I'll commit a DIO based dumb driver for 362 and 382 framebuffers later)
- Xorg server with wsfb driver will also be integrated soon
  once after keycode with NoSymbol problem is addressed.
  (We have to re-think what code should be used on WSDISPLAY_COMPAT_RAWKBD)
- MI HIL keyboard and mouse drivers are working fine though
  cngetc via hilkbd has some problem (still we can input commands).
- No old HP-UX like HIL ioctl compatibility (we removed COMPAT_HPUX anyway).
  grfinfo(8) and hilinfo(8) will be removed shortly.

Demonstrated on NetBSD booth at Open Source Conference 2011 Kagawa.

diffstat:

 sys/arch/hp300/conf/GENERIC |  45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

diffs (103 lines):

diff -r a1adb73057fd -r 4473b3f9e0ba sys/arch/hp300/conf/GENERIC
--- a/sys/arch/hp300/conf/GENERIC       Sun Feb 06 18:38:01 2011 +0000
+++ b/sys/arch/hp300/conf/GENERIC       Sun Feb 06 18:40:55 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.160 2011/02/06 06:47:15 tsutsui Exp $
+# $NetBSD: GENERIC,v 1.161 2011/02/06 18:40:55 tsutsui Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.160 $"
+#ident                 "GENERIC-$Revision: 1.161 $"
 
 maxusers       32              # estimated number of users
 
@@ -175,6 +175,15 @@
 #options       SCSIVERBOSE     # Verbose SCSI errors
 options        DIOVERBOSE      # recognize "unknown" DIO devices
 
+# workstation console options
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+options        WSDISPLAY_COMPAT_RAWKBD
+options        WS_KERNEL_FG=WSCOL_GREEN
+#options       WS_KERNEL_BG=WSCOL_BLACK
+
+options        FONT_GALLANT12x22
+#options       FONT_VT220ISO8x16
+
 config         netbsd root on ? type ?
 
 #
@@ -186,40 +195,46 @@
 intio0         at mainbus0             # internal i/o space
 dio0           at mainbus0             # DIO/DIO-II bus
 
+# Human Interface Loop devices
+hil0           at intio?               # HIL controller
+hilkbd*        at hil?                 # keyboards
+wskbd*         at hilkbd? mux 1
+hilms*         at hil?                 # mice, buttons and tablets
+wsmouse*       at hilms? mux 0
+hilid*         at hil?                 # ID module
+
 rtc*           at intio?               # real-time clock (not optional)
 dma*           at intio?               # DMA controller
-hil*           at intio?               # Human Interface Loop
-options        UK_KEYBOARD             # include United Kingdom HIL keymap
-options        SE_KEYBOARD             # include Swedish HIL keymap
 frodo*         at intio?               # Frodo utility chip found on 382, 4xx
 nhpib*         at intio?               # slow internal HP-IB
 
 # 8250-like serial ports found on Frodo ASIC
 #dnkbd0                at frodo? offset 0x0    # Domain keyboard flavor
+#wskbd*                at dnkbd? mux 1
+#wsmouse*      at dnkbd? mux 0
 com*           at frodo? offset ?      # tty flavor
 
 dvbox*         at intio?               # Davinci framebuffer
 dvbox*         at dio? scode ?
+wsdisplay*     at dvbox?
 
 gbox*          at intio?               # Gatorbox framebuffer
 gbox*          at dio? scode ?
+wsdisplay*     at gbox?
 
 hyper*         at dio? scode ?         # Hyperion framebuffer
+wsdisplay*     at hyper?
 
 rbox*          at intio?               # Renaissance framebuffer
 rbox*          at dio? scode ?
+wsdisplay*     at rbox?
 
 topcat*                at intio?               # Topcat/catseye framebuffers
 topcat*                at dio? scode ?
+wsdisplay*     at topcat?
 
-# Framebuffer abstraction
-grf*           at dvbox?
-grf*           at gbox?
-grf*           at hyper?
-grf*           at rbox?
-grf*           at topcat?
-
-ite*           at grf?                 # Internal Terminal Emulator
+tvrx*          at dio? scode ?         # TurboVRX framebuffer
+wsdisplay*     at tvrx?
 
 com0           at dio0 scode 9         # DCA serial interfaces
 com*           at dio? scode ?
@@ -308,6 +323,10 @@
 #pseudo-device pflog                   # PF log if
 pseudo-device  putter                  # for puffs and pud
 
+# wscons pseudo-devices
+pseudo-device  wsmux                   # mouse & keyboard multiplexor
+pseudo-device  wsfont
+
 # Veriexec
 #
 # a pseudo device needed for veriexec



Home | Main Index | Thread Index | Old Index