Commit: 88fad28eafefd057a5b797aa00256acd4a594e42 - tme (git)

Commit MetaInfo

• Révision: 88fad28eafefd057a5b797aa00256acd4a594e42 (tree)
• l'heure: 2022-07-10 18:59:56
• Auteur: phabrics <phabrics@phab...>
• Commiter: phabrics

Message de Log

Reorganized the host hierarchy to better suit the different types of hosts.

Change Summary

• modified: configure.ac
• modified: host/Makefile.am
• add: host/display/Makefile.am
• add: host/eth/Makefile.am
• delete: host/posix/Makefile.am
• delete: host/{ => display}/display-keyboard.c
• delete: host/{ => display}/display-mouse.c
• delete: host/{ => display}/display.c
• delete: host/{ => display}/display.h
• delete: host/{ => display}/gtk/Makefile.am
• delete: host/{ => display}/gtk/gtk-display.h
• delete: host/{ => display}/gtk/gtk-keyboard.c
• delete: host/{ => display}/gtk/gtk-mouse.c
• delete: host/{ => display}/gtk/gtk-screen.c
• delete: host/{ => display}/keymap-def.h
• delete: host/{ => display}/keymap-make.pl
• delete: host/{ => display}/rfb/Makefile.am
• delete: host/{ => display}/rfb/rfb-display.c
• delete: host/{ => eth}/bsd/Makefile.am
• delete: host/{ => eth}/bsd/bsd-bpf.c
• delete: host/{ => eth}/eth-if.h
• delete: host/{ => eth}/eth-impl.c
• delete: host/{ => eth}/openvpn/Makefile.am
• delete: host/{ => eth}/openvpn/openvpn-link.c
• delete: host/{ => eth}/openvpn/openvpn-server.c
• delete: host/{ => eth}/openvpn/openvpn-tap.c
• delete: host/{ => eth}/tun/Makefile.am
• delete: host/{ => eth}/tun/tun-tap.c
• delete: host/{posix => }/posix-disk.c
• delete: host/{posix => }/posix-memory.c
• delete: host/{posix => }/posix-serial.c
• delete: host/{posix => }/posix-tape.c
• add: machine/sun4/SUN4-75-gtk-bw2
• add: machine/sun4/SUN4-75-gtk-cg3
• add: machine/sun4/SUN4-75-rfb-bw2
• add: machine/sun4/SUN4-75-rfb-cg3
• add: machine/sun4/SUN4-75-tty
• modified: tme-preopen.txt
• modified: tme/tme-plugins.txt

Modification

--- a/configure.ac
+++ b/configure.ac
@@ -740,9 +740,6 @@ AC_DEFINE(HAVE_AF_PACKET, [], [Define if you have AF_PACKET.])
 AC_MSG_RESULT(no)
 ])
 
-dnl Start the list of host support.
-TME_HOSTS=
-
 AC_ARG_VAR([TAP_CFLAGS], [C compiler flags for tap])
 old_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} ${TAP_CFLAGS}"
@@ -783,7 +780,7 @@ AC_ARG_WITH(tme-host-displays,
 
 AC_SUBST(TME_FB_XLAT_DST)
 
-tme_host_types="tun bsd openvpn posix gtk rfb"
+tme_host_types="gtk rfb tun bsd openvpn"
 
 for tme_host_type in ${tme_host_types}; do
     eval enable_${tme_host_type}=no
@@ -801,28 +798,43 @@ for tme_host_type in ${tme_host_types}; do
     eval enable_${tme_host_type}=yes
 done
 
+dnl Start the list of display host support.
+TME_DISPLAY_HOSTS=
+
 if test "x$have_gtk" = xyes; then
    if test "x${enable_gtk}" = xyes; then
-      TME_HOSTS="gtk ${TME_HOSTS}"
+      TME_DISPLAY_HOSTS="gtk ${TME_DISPLAY_HOSTS}"
    fi
    TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff"
 #   TME_FB_XLAT_DST="d32b32s0p32olml_r0xffff0000_g0xff00ff00_b0xff0000ff d24b32s0p32olml_r0xff0000_g0xff00_b0xff d16b16s0p32olml_r0xf800_g0x07e0_b0x001f d8b8s0p32olml_r0xff_g0xff_b0xff d1b1s0p32olml_r0x1_g0x1_b0x1"
 fi
 
 AS_IF([test "x${enable_rfb}" = xyes], [
-   PKG_CHECK_MODULES([RFB], [libvncserver], [TME_HOSTS="rfb ${TME_HOSTS}"], AC_DEFINE([HAVE_RFB], [0], [No RFB]))
+   PKG_CHECK_MODULES([RFB], [libvncserver], [TME_DISPLAY_HOSTS="rfb ${TME_DISPLAY_HOSTS}"], AC_DEFINE([HAVE_RFB], [0], [No RFB]))
 ])
 
+if test "x${TME_DISPLAY_HOSTS}" != x; then
+   TME_DISPLAY_HOSTS="${TME_DISPLAY_HOSTS}"
+fi
+
+dnl The list of display host support is finished.
+AC_SUBST(TME_DISPLAY_HOSTS)
+
+AC_MSG_RESULT($TME_DISPLAY_HOSTS)
+
+dnl Start the list of ethernet host support.
+TME_ETH_HOSTS=
+
 AM_CONDITIONAL([USE_TAP_WINDOWS], [test "x${enable_openvpn}" = xyes && test "x${have_tap_header}" = x && test "x${WIN32}" != x])
 AM_CONDITIONAL([USING_OPENVPN], [test "x${enable_openvpn}" = xyes && test "x${have_tap_header}" = xyes || test "x${WIN32}" != x])
 if test "x${enable_openvpn}" = xyes && test "x${have_tap_header}" = xyes || test "x${WIN32}" != x; then
-   TME_HOSTS="openvpn ${TME_HOSTS}"
+   TME_ETH_HOSTS="openvpn ${TME_ETH_HOSTS}"
    AC_DEFINE([OPENVPN_VERSION_RESOURCE], [PRODUCT_VERSION_RESOURCE], [Version in windows resource format])
 fi
 
 AC_CHECK_HEADERS([linux/if_tun.h net/if_tap.h net/tap/if_tap.h net/if_tun.h],
 		 [if test "x${enable_tun}" = xyes; then
-		     TME_HOSTS="tun ${TME_HOSTS}"
+		     TME_ETH_HOSTS="tun ${TME_ETH_HOSTS}"
 		  fi])
 
 AC_CHECK_HEADERS([linux/filter.h net/bpf.h])
@@ -842,21 +854,17 @@ found_BPFVERSION
 #endif
 ],
 [if test "x${enable_bsd}" = xyes; then
-    TME_HOSTS="bsd ${TME_HOSTS}"
+    TME_ETH_HOSTS="bsd ${TME_ETH_HOSTS}"
  fi])
 
-if test "x${TME_HOSTS}" != x; then
-   TME_HOSTS="${TME_HOSTS}"
-fi
-
-if test "x${enable_posix}" = xyes; then
-   TME_HOSTS="posix ${TME_HOSTS}"
+if test "x${TME_ETH_HOSTS}" != x; then
+   TME_ETH_HOSTS="${TME_ETH_HOSTS}"
 fi
 
-dnl The list of host support is finished.
-AC_SUBST(TME_HOSTS)
+dnl The list of ethernet host support is finished.
+AC_SUBST(TME_ETH_HOSTS)
 
-AC_MSG_RESULT($TME_HOSTS)
+AC_MSG_RESULT($TME_ETH_HOSTS)
 
 AC_SYS_POSIX_TERMIOS
 
@@ -1586,12 +1594,13 @@ AC_CONFIG_FILES([Makefile
 	  machine/sun4/Makefile
 	  machine/sun4u/Makefile
           host/Makefile
-          host/openvpn/Makefile
-          host/posix/Makefile
-          host/rfb/Makefile
-          host/bsd/Makefile
-          host/tun/Makefile
-          host/gtk/Makefile
+          host/display/Makefile
+          host/display/gtk/Makefile
+          host/display/rfb/Makefile
+          host/eth/Makefile
+          host/eth/openvpn/Makefile
+          host/eth/bsd/Makefile
+          host/eth/tun/Makefile
           bus/Makefile
           bus/multibus/Makefile
           bus/sbus/Makefile

--- a/host/Makefile.am
+++ b/host/Makefile.am
@@ -1,27 +1,19 @@
 ## Process this file with automake to produce Makefile.in
-# Makefile.am for The Machine Emulator host/:
+# Makefile.am for The Machine Emulator host/posix:
 
 AUTOMAKE_OPTIONS = 1.4 gnu
-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL $(GTK_CFLAGS)
 
-lib_LTLIBRARIES = libtme-host.la
-libtme_host_la_SOURCES = eth-impl.c eth-if.h display-mouse.c display-keyboard.c display.c display.h
-libtme_host_la_LDFLAGS = -version-info 0:0:0
-libtme_host_la_LIBADD = $(top_builddir)/generic/libtme-generic.la $(GTK_LIBS)
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL
 
-EXTRA_DIST = keymap-make.pl keymap-def.h
+pkglib_LTLIBRARIES = tme_host_posix.la
+tme_host_posix_la_SOURCES = posix-memory.c \
+	posix-disk.c \
+	posix-tape.c \
+	posix-serial.c
 
-BUILT_SOURCES = keymap.h
-CLEANFILES = keymap.h
-if USING_X
-keymap.h: keymap-make.pl keymap-def.h
-	  $(PERL) $< > $@ || cp $(srcdir)/keymap-def.h $@
-else
-keymap.h: keymap-def.h
-	  cp $< $@
-endif
+tme_host_posix_la_LDFLAGS = -module -version-info 0:0:0
+tme_host_posix_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
 
 include $(top_srcdir)/modules
 
-SUBDIRS = . @TME_HOSTS@
-DIST_SUBDIRS = posix gtk bsd tun openvpn rfb
+SUBDIRS = display eth

--- /dev/null
+++ b/host/display/Makefile.am
@@ -0,0 +1,27 @@
+## Process this file with automake to produce Makefile.in
+# Makefile.am for The Machine Emulator display/:
+
+AUTOMAKE_OPTIONS = 1.4 gnu
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL $(GTK_CFLAGS)
+
+lib_LTLIBRARIES = libtme-display.la
+libtme_display_la_SOURCES = display-mouse.c display-keyboard.c display.c display.h
+libtme_display_la_LDFLAGS = -version-info 0:0:0
+libtme_display_la_LIBADD = $(top_builddir)/generic/libtme-generic.la $(GTK_LIBS)
+
+EXTRA_DIST = keymap-make.pl keymap-def.h
+
+BUILT_SOURCES = keymap.h
+CLEANFILES = keymap.h
+if USING_X
+keymap.h: keymap-make.pl keymap-def.h
+	  $(PERL) $< > $@ || cp $(srcdir)/keymap-def.h $@
+else
+keymap.h: keymap-def.h
+	  cp $< $@
+endif
+
+include $(top_srcdir)/modules
+
+SUBDIRS = . @TME_DISPLAY_HOSTS@
+DIST_SUBDIRS = gtk rfb

--- a/host/gtk/Makefile.am
+++ b/host/display/gtk/Makefile.am
@@ -8,6 +8,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I.
 pkglib_LTLIBRARIES = tme_host_gtk.la
 tme_host_gtk_la_SOURCES = gtk-mouse.c gtk-keyboard.c gtk-screen.c gtk-display.h
 tme_host_gtk_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_gtk_la_LIBADD = ../libtme-host.la $(GTK_LIBS)
+tme_host_gtk_la_LIBADD = ../libtme-display.la $(GTK_LIBS)
 
 include $(top_srcdir)/modules

--- a/host/rfb/Makefile.am
+++ b/host/display/rfb/Makefile.am
@@ -8,6 +8,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I.
 pkglib_LTLIBRARIES = tme_host_rfb.la
 tme_host_rfb_la_SOURCES = rfb-display.c
 tme_host_rfb_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_rfb_la_LIBADD = ../libtme-host.la $(RFB_LIBS)
+tme_host_rfb_la_LIBADD = ../libtme-display.la $(RFB_LIBS)
 
 include $(top_srcdir)/modules

--- /dev/null
+++ b/host/eth/Makefile.am
@@ -0,0 +1,15 @@
+## Process this file with automake to produce Makefile.in
+# Makefile.am for The Machine Emulator eth/:
+
+AUTOMAKE_OPTIONS = 1.4 gnu
+AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL
+
+lib_LTLIBRARIES = libtme-eth.la
+libtme_eth_la_SOURCES = eth-impl.c eth-if.h
+libtme_eth_la_LDFLAGS = -version-info 0:0:0
+libtme_eth_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
+
+include $(top_srcdir)/modules
+
+SUBDIRS = . @TME_ETH_HOSTS@
+DIST_SUBDIRS = bsd tun openvpn

--- a/host/bsd/Makefile.am
+++ b/host/eth/bsd/Makefile.am
@@ -8,6 +8,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I$(srcdir)/.. -I.
 pkglib_LTLIBRARIES = tme_host_bsd.la
 tme_host_bsd_la_SOURCES = bsd-bpf.c
 tme_host_bsd_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_bsd_la_LIBADD = ../libtme-host.la
+tme_host_bsd_la_LIBADD = ../libtme-eth.la
 
 include $(top_srcdir)/modules

--- a/host/openvpn/Makefile.am
+++ b/host/eth/openvpn/Makefile.am
@@ -9,7 +9,7 @@ pkglib_LTLIBRARIES = tme_host_openvpn.la
 tme_host_openvpn_la_SOURCES = \
 	openvpn-link.c \
 	openvpn-tap.c
-tme_host_openvpn_la_LIBADD = ../libtme-host.la
+tme_host_openvpn_la_LIBADD = ../libtme-eth.la
 tme_host_openvpn_la_LDFLAGS = -module -version-info 0:0:0
 
 include $(top_srcdir)/modules

--- a/host/tun/Makefile.am
+++ b/host/eth/tun/Makefile.am
@@ -8,6 +8,6 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. -I$(top_srcdir)/lib -I.
 pkglib_LTLIBRARIES = tme_host_tun.la
 tme_host_tun_la_SOURCES = tun-tap.c
 tme_host_tun_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_tun_la_LIBADD = ../libtme-host.la $(NATLIBS)
+tme_host_tun_la_LIBADD = ../libtme-eth.la $(NATLIBS)
 
 include $(top_srcdir)/modules

--- a/host/posix/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# Makefile.am for The Machine Emulator host/posix:
-
-AUTOMAKE_OPTIONS = 1.4 gnu
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(srcdir) -I$(top_srcdir)/lib -I. -D_TME_IMPL
-
-pkglib_LTLIBRARIES = tme_host_posix.la
-tme_host_posix_la_SOURCES = posix-memory.c \
-	posix-disk.c \
-	posix-tape.c \
-	posix-serial.c
-
-tme_host_posix_la_LDFLAGS = -module -version-info 0:0:0
-tme_host_posix_la_LIBADD = $(top_builddir)/generic/libtme-generic.la
-
-include $(top_srcdir)/modules

--- /dev/null
+++ b/machine/sun4/SUN4-75-gtk-bw2
@@ -0,0 +1,176 @@
+# $Id: SUN4-75,v 1.3 2010/06/05 19:26:31 fredette Exp $
+
+## SUN4-75 - example tmesh commands to create a Sun 4/75 (SPARCstation 2)
+## machine:
+
+## the basic Sun 4/75 "Calvin" board, CPU, and sbus:
+##
+board0: tme/machine/sun4 name Calvin
+cpu0 at board0: tme/ic/cy7c601 fpu-type tms390-c602A fpu-compliance partial fpu-incomplete trap
+sbus0: tme/generic/bus size 4GB slot-addr 0xf8000000 slot-size 32MB slot 0 slot 1 slot 2 slot 3
+sbus0 controller at board0 sbus
+
+## the sun4c mainbus RAM, ROM, and devices:
+##
+## NOTE THAT THE ram0 SIZE MUST BE A MULTIPLE OF 16MB, which is
+## the maximum bank size of the SS2, AND NO MORE THAN 64MB.
+## Once ram0 has reached 64MB, uncomment the ram1 line for 96MB of
+## total memory, and then the ram2 line for 128MB of total memory:
+##
+alias mainbus0 sbus0
+ram0 at mainbus0 addr 0x0: tme/host/posix/memory ram 16MB
+ram1 at mainbus0 addr 0x08000000: tme/host/posix/memory ram 32MB
+ram2 at mainbus0 addr 0x0a000000: tme/host/posix/memory ram 32MB
+rom0 at mainbus0 addr 0xf6000000: tme/host/posix/memory rom sun4-75-rev-2.9.bin
+zs0 at mainbus0 addr 0xf1000000 ipl 12: tme/machine/sun4/zs
+zs1 at mainbus0 addr 0xf0000000 ipl 12: tme/machine/sun4/zs
+nvram0 at mainbus0 addr 0xf2000000: tme/host/posix/memory persistent my-sun4c-nvram.bin
+clock0 at mainbus0 addr 0xf20007f8: tme/machine/sun4/clock type tme/ic/mk48t02
+board0 timer at mainbus0 addr 0xf3000000
+board0 memerr at mainbus0 addr 0xf4000000
+board0 intreg at mainbus0 addr 0xf5000000
+fdc0 at mainbus0 addr 0xf7200000 ipl 11: tme/machine/sun4/fdc type tme/ic/i82072
+audioamd0 at mainbus0 addr 0xf7201000 ipl 13: tme/ic/am7930
+board0 auxreg at mainbus0 addr 0xf7400003
+
+## the Sun type-4 keyboard and mouse:
+##
+kbd0 at zs1 channel A: tme/serial/keyboard type sun-type-4-us macros my-sun-macros.txt map sun-keyboards.txt rate 20
+ms0 at zs1 channel B: tme/serial/mouse type mousesystems-5
+
+## IF YOU DO NOT ATTACH kbd0 at zs1 channel A, THEN YOU MUST ATTACH
+## sink0 at zs1 channel A, otherwise the PROM's keyboard poll never
+## finishes:
+##
+#sink0 at zs1 channel A: tme/serial/sink
+
+## ttya:
+##
+# comment the first line, and uncomment the following line if you
+# aren't using the graphics-based display console.  this will connect ttya
+# to the master side of a pseudo-tty (in this case, /dev/ttyr0), which
+# you can connect to using tip or some other serial communications
+# program on the slave side (in this case, /dev/ptyr0):
+#
+sink1 at zs0 channel A: tme/serial/sink
+#console0 at zs0 channel A: tme/host/posix/serial device /dev/ttyr0 break-carats
+# OR enable POSIX pseudo-terminal master (if available) using the ptmx clone device:
+# the tmesh console will display the slave device to connect to (e.g., /dev/pts/3)
+#console0 at zs0 channel A: tme/host/posix/serial device /dev/ptmx break-carats
+
+## the SBus esp SCSI:
+##
+esp0 at sbus0 slot 0 offset 0x800000 ipl 3: tme/ic/lsi64854 revision "1+" channel scsi
+esp0 dma at sbus0 slot 0 offset 0x400000
+ncr0 at esp0 master: tme/ic/ncr53c9x variant esp100
+scsibus0 at ncr0: tme/scsi/bus
+
+## the SBus LANCE Ethernet:
+##
+# uncomment the bpf0 line if you have read/write permission on one
+# of your /dev/bpfN devices (on *BSD) OR have cap_net_raw+ep capability (on Linux)
+# and you want actual network access:
+#
+le0 at sbus0 slot 0 offset 0xc00000 ipl 5 dma-offset 0xff000000: tme/ic/am7990
+#bpf0 at le0: tme/host/bsd/bpf
+# OR enable tap ethernet device, an alternative method for network access
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
+#tap0 at le0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap0 at le0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# An example of the link element that can be used to connect network elements across an IP network.
+# Here, we set up a P2P network between two machines on different hosts.  Each machine would have
+# one side of the connection, by uncommenting one of the lines below to complement the other one.
+#link0 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.1 --remote 192.168.0.2
+#link1 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.2 --remote 192.168.0.1
+
+# Uncomment the following lines to get debug output for each respective element (or add your own)
+#log bpf0 1
+#log tap0 1
+#log link0 1
+
+# You can enable "networking" multiple machines using the following lines,
+# removing the " at le0" from the one of the previous 2 lines that is used
+# to set up the tap device.  This might not be needed if the tap devices is
+# already connected to another element.  This creates a master configuration
+# that can be used with different slave configurations.
+#tap1: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap1: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+#tap1 at tap1
+
+# A master configuration can also include remote machines by connecting the tap
+# or bpf device to a link.  If the tap is connected, then you don't need to
+# connect it to itself first, but the tap must be connected to something.
+# Remember that each element can only connect to one other element, so the
+# network configurations must be set up carefully.
+#link2 at tap1: tme/host/openvpn/socket/link --dev tap --local 192.168.0.3 --remote 192.168.0.4
+
+# Slave configurations only need the follwing line to connect to the tap
+# network via bpf.  Note that the master requires this line, too...
+#bpf1 at le0: tme/host/bsd/bpf interface tap0
+
+# A slave configuration can also include remote machines by connecting the bpf
+# device to a link.
+#link3: tme/host/openvpn/socket/link --dev tap --local 192.168.0.5 --remote 192.168.0.6
+#bpf2 at link3: tme/host/bsd/bpf interface tap0
+
+## an SBus cgthree:
+##
+#cgthree0 at sbus0 slot 1 offset 0x0 ipl 7: tme/bus/sbus/cgthree
+#cgthreerom0 at sbus0 slot 1 offset 0x0: tme/host/posix/memory rom "SUNW,501-1415.bin"
+
+## an SBus bwtwo:
+##
+# uncomment these lines if you want a bwtwo either in addition to, or
+# instead of, the cgthree:
+#
+bwtwo0 at sbus0 slot 2 offset 0x0 ipl 7: tme/bus/sbus/bwtwo
+bwtworom0 at sbus0 slot 2 offset 0x0: tme/host/posix/memory rom "SUNW,501-1561.bin"
+
+## the graphics-based display console:
+##
+# comment out these lines, and the bwtwo0 and cgthree0 declarations
+# above, if you don't have GTK or VNC or you don't want a display console:
+# You can have only one graphics-based display at a time:
+# uncomment which display you want
+# uncomment this line for a GTK-based graphics display
+display0: tme/host/gtk/display
+#display0: tme/host/rfb/display
+#display0 at cgthree0
+display0 at bwtwo0
+display0 at kbd0
+display0 at ms0
+
+## a SCSI disk:
+##
+#
+sd0 at scsibus0: tme/scsi/disk id 3 type tme-scsi-1
+disk0 at sd0: tme/host/posix/disk file my-sun4c-disk.img
+
+## a SCSI tape:
+##
+#st0 at scsibus0: tme/scsi/tape id 4 type tme-scsi-1
+#tape0 at st0: tme/host/posix/tape
+
+## a CD-ROM drive:
+##
+cd0 at scsibus0: tme/scsi/cdrom id 6 type tme-scsi-1
+cdrom0 at cd0: tme/host/posix/disk file NetBSD-9.2-sparc.iso read-only
+
+## set the idle type, so tmesh doesn't consume all of the host CPU:
+##
+# use the appropriate type for the guest operating system:
+#
+# NetBSD/sparc 1.6 through 4.99.19: netbsd32-type-0
+# NetBSD/sparc 4.99.20 through this writing: netbsd32-type-1
+# SunOS 4.1.x: sunos32-type-0
+#
+command cpu0 idle-type netbsd32-type-1
+
+## power up the machine:
+##
+# uncomment this line to automatically power up the machine when
+# tmesh starts:
+#
+command board0 power up

--- /dev/null
+++ b/machine/sun4/SUN4-75-gtk-cg3
@@ -0,0 +1,176 @@
+# $Id: SUN4-75,v 1.3 2010/06/05 19:26:31 fredette Exp $
+
+## SUN4-75 - example tmesh commands to create a Sun 4/75 (SPARCstation 2)
+## machine:
+
+## the basic Sun 4/75 "Calvin" board, CPU, and sbus:
+##
+board0: tme/machine/sun4 name Calvin
+cpu0 at board0: tme/ic/cy7c601 fpu-type tms390-c602A fpu-compliance partial fpu-incomplete trap
+sbus0: tme/generic/bus size 4GB slot-addr 0xf8000000 slot-size 32MB slot 0 slot 1 slot 2 slot 3
+sbus0 controller at board0 sbus
+
+## the sun4c mainbus RAM, ROM, and devices:
+##
+## NOTE THAT THE ram0 SIZE MUST BE A MULTIPLE OF 16MB, which is
+## the maximum bank size of the SS2, AND NO MORE THAN 64MB.
+## Once ram0 has reached 64MB, uncomment the ram1 line for 96MB of
+## total memory, and then the ram2 line for 128MB of total memory:
+##
+alias mainbus0 sbus0
+ram0 at mainbus0 addr 0x0: tme/host/posix/memory ram 16MB
+ram1 at mainbus0 addr 0x08000000: tme/host/posix/memory ram 32MB
+ram2 at mainbus0 addr 0x0a000000: tme/host/posix/memory ram 32MB
+rom0 at mainbus0 addr 0xf6000000: tme/host/posix/memory rom sun4-75-rev-2.9.bin
+zs0 at mainbus0 addr 0xf1000000 ipl 12: tme/machine/sun4/zs
+zs1 at mainbus0 addr 0xf0000000 ipl 12: tme/machine/sun4/zs
+nvram0 at mainbus0 addr 0xf2000000: tme/host/posix/memory persistent my-sun4c-nvram.bin
+clock0 at mainbus0 addr 0xf20007f8: tme/machine/sun4/clock type tme/ic/mk48t02
+board0 timer at mainbus0 addr 0xf3000000
+board0 memerr at mainbus0 addr 0xf4000000
+board0 intreg at mainbus0 addr 0xf5000000
+fdc0 at mainbus0 addr 0xf7200000 ipl 11: tme/machine/sun4/fdc type tme/ic/i82072
+audioamd0 at mainbus0 addr 0xf7201000 ipl 13: tme/ic/am7930
+board0 auxreg at mainbus0 addr 0xf7400003
+
+## the Sun type-4 keyboard and mouse:
+##
+kbd0 at zs1 channel A: tme/serial/keyboard type sun-type-4-us macros my-sun-macros.txt map sun-keyboards.txt rate 20
+ms0 at zs1 channel B: tme/serial/mouse type mousesystems-5
+
+## IF YOU DO NOT ATTACH kbd0 at zs1 channel A, THEN YOU MUST ATTACH
+## sink0 at zs1 channel A, otherwise the PROM's keyboard poll never
+## finishes:
+##
+#sink0 at zs1 channel A: tme/serial/sink
+
+## ttya:
+##
+# comment the first line, and uncomment the following line if you
+# aren't using the graphics-based display console.  this will connect ttya
+# to the master side of a pseudo-tty (in this case, /dev/ttyr0), which
+# you can connect to using tip or some other serial communications
+# program on the slave side (in this case, /dev/ptyr0):
+#
+sink1 at zs0 channel A: tme/serial/sink
+#console0 at zs0 channel A: tme/host/posix/serial device /dev/ttyr0 break-carats
+# OR enable POSIX pseudo-terminal master (if available) using the ptmx clone device:
+# the tmesh console will display the slave device to connect to (e.g., /dev/pts/3)
+#console0 at zs0 channel A: tme/host/posix/serial device /dev/ptmx break-carats
+
+## the SBus esp SCSI:
+##
+esp0 at sbus0 slot 0 offset 0x800000 ipl 3: tme/ic/lsi64854 revision "1+" channel scsi
+esp0 dma at sbus0 slot 0 offset 0x400000
+ncr0 at esp0 master: tme/ic/ncr53c9x variant esp100
+scsibus0 at ncr0: tme/scsi/bus
+
+## the SBus LANCE Ethernet:
+##
+# uncomment the bpf0 line if you have read/write permission on one
+# of your /dev/bpfN devices (on *BSD) OR have cap_net_raw+ep capability (on Linux)
+# and you want actual network access:
+#
+le0 at sbus0 slot 0 offset 0xc00000 ipl 5 dma-offset 0xff000000: tme/ic/am7990
+#bpf0 at le0: tme/host/bsd/bpf
+# OR enable tap ethernet device, an alternative method for network access
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
+#tap0 at le0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap0 at le0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# An example of the link element that can be used to connect network elements across an IP network.
+# Here, we set up a P2P network between two machines on different hosts.  Each machine would have
+# one side of the connection, by uncommenting one of the lines below to complement the other one.
+#link0 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.1 --remote 192.168.0.2
+#link1 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.2 --remote 192.168.0.1
+
+# Uncomment the following lines to get debug output for each respective element (or add your own)
+#log bpf0 1
+#log tap0 1
+#log link0 1
+
+# You can enable "networking" multiple machines using the following lines,
+# removing the " at le0" from the one of the previous 2 lines that is used
+# to set up the tap device.  This might not be needed if the tap devices is
+# already connected to another element.  This creates a master configuration
+# that can be used with different slave configurations.
+#tap1: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap1: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+#tap1 at tap1
+
+# A master configuration can also include remote machines by connecting the tap
+# or bpf device to a link.  If the tap is connected, then you don't need to
+# connect it to itself first, but the tap must be connected to something.
+# Remember that each element can only connect to one other element, so the
+# network configurations must be set up carefully.
+#link2 at tap1: tme/host/openvpn/socket/link --dev tap --local 192.168.0.3 --remote 192.168.0.4
+
+# Slave configurations only need the follwing line to connect to the tap
+# network via bpf.  Note that the master requires this line, too...
+#bpf1 at le0: tme/host/bsd/bpf interface tap0
+
+# A slave configuration can also include remote machines by connecting the bpf
+# device to a link.
+#link3: tme/host/openvpn/socket/link --dev tap --local 192.168.0.5 --remote 192.168.0.6
+#bpf2 at link3: tme/host/bsd/bpf interface tap0
+
+## an SBus cgthree:
+##
+cgthree0 at sbus0 slot 1 offset 0x0 ipl 7: tme/bus/sbus/cgthree
+cgthreerom0 at sbus0 slot 1 offset 0x0: tme/host/posix/memory rom "SUNW,501-1415.bin"
+
+## an SBus bwtwo:
+##
+# uncomment these lines if you want a bwtwo either in addition to, or
+# instead of, the cgthree:
+#
+#bwtwo0 at sbus0 slot 2 offset 0x0 ipl 7: tme/bus/sbus/bwtwo
+#bwtworom0 at sbus0 slot 2 offset 0x0: tme/host/posix/memory rom "SUNW,501-1561.bin"
+
+## the graphics-based display console:
+##
+# comment out these lines, and the bwtwo0 and cgthree0 declarations
+# above, if you don't have GTK or VNC or you don't want a display console:
+# You can have only one graphics-based display at a time:
+# uncomment which display you want
+# uncomment this line for a GTK-based graphics display
+display0: tme/host/gtk/display
+#display0: tme/host/rfb/display
+display0 at cgthree0
+#display0 at bwtwo0
+display0 at kbd0
+display0 at ms0
+
+## a SCSI disk:
+##
+#
+sd0 at scsibus0: tme/scsi/disk id 3 type tme-scsi-1
+disk0 at sd0: tme/host/posix/disk file my-sun4c-disk.img
+
+## a SCSI tape:
+##
+#st0 at scsibus0: tme/scsi/tape id 4 type tme-scsi-1
+#tape0 at st0: tme/host/posix/tape
+
+## a CD-ROM drive:
+##
+cd0 at scsibus0: tme/scsi/cdrom id 6 type tme-scsi-1
+cdrom0 at cd0: tme/host/posix/disk file NetBSD-9.2-sparc.iso read-only
+
+## set the idle type, so tmesh doesn't consume all of the host CPU:
+##
+# use the appropriate type for the guest operating system:
+#
+# NetBSD/sparc 1.6 through 4.99.19: netbsd32-type-0
+# NetBSD/sparc 4.99.20 through this writing: netbsd32-type-1
+# SunOS 4.1.x: sunos32-type-0
+#
+command cpu0 idle-type netbsd32-type-1
+
+## power up the machine:
+##
+# uncomment this line to automatically power up the machine when
+# tmesh starts:
+#
+command board0 power up

--- /dev/null
+++ b/machine/sun4/SUN4-75-rfb-bw2
@@ -0,0 +1,176 @@
+# $Id: SUN4-75,v 1.3 2010/06/05 19:26:31 fredette Exp $
+
+## SUN4-75 - example tmesh commands to create a Sun 4/75 (SPARCstation 2)
+## machine:
+
+## the basic Sun 4/75 "Calvin" board, CPU, and sbus:
+##
+board0: tme/machine/sun4 name Calvin
+cpu0 at board0: tme/ic/cy7c601 fpu-type tms390-c602A fpu-compliance partial fpu-incomplete trap
+sbus0: tme/generic/bus size 4GB slot-addr 0xf8000000 slot-size 32MB slot 0 slot 1 slot 2 slot 3
+sbus0 controller at board0 sbus
+
+## the sun4c mainbus RAM, ROM, and devices:
+##
+## NOTE THAT THE ram0 SIZE MUST BE A MULTIPLE OF 16MB, which is
+## the maximum bank size of the SS2, AND NO MORE THAN 64MB.
+## Once ram0 has reached 64MB, uncomment the ram1 line for 96MB of
+## total memory, and then the ram2 line for 128MB of total memory:
+##
+alias mainbus0 sbus0
+ram0 at mainbus0 addr 0x0: tme/host/posix/memory ram 16MB
+ram1 at mainbus0 addr 0x08000000: tme/host/posix/memory ram 32MB
+ram2 at mainbus0 addr 0x0a000000: tme/host/posix/memory ram 32MB
+rom0 at mainbus0 addr 0xf6000000: tme/host/posix/memory rom sun4-75-rev-2.9.bin
+zs0 at mainbus0 addr 0xf1000000 ipl 12: tme/machine/sun4/zs
+zs1 at mainbus0 addr 0xf0000000 ipl 12: tme/machine/sun4/zs
+nvram0 at mainbus0 addr 0xf2000000: tme/host/posix/memory persistent my-sun4c-nvram.bin
+clock0 at mainbus0 addr 0xf20007f8: tme/machine/sun4/clock type tme/ic/mk48t02
+board0 timer at mainbus0 addr 0xf3000000
+board0 memerr at mainbus0 addr 0xf4000000
+board0 intreg at mainbus0 addr 0xf5000000
+fdc0 at mainbus0 addr 0xf7200000 ipl 11: tme/machine/sun4/fdc type tme/ic/i82072
+audioamd0 at mainbus0 addr 0xf7201000 ipl 13: tme/ic/am7930
+board0 auxreg at mainbus0 addr 0xf7400003
+
+## the Sun type-4 keyboard and mouse:
+##
+kbd0 at zs1 channel A: tme/serial/keyboard type sun-type-4-us macros my-sun-macros.txt map sun-keyboards.txt rate 20
+ms0 at zs1 channel B: tme/serial/mouse type mousesystems-5
+
+## IF YOU DO NOT ATTACH kbd0 at zs1 channel A, THEN YOU MUST ATTACH
+## sink0 at zs1 channel A, otherwise the PROM's keyboard poll never
+## finishes:
+##
+#sink0 at zs1 channel A: tme/serial/sink
+
+## ttya:
+##
+# comment the first line, and uncomment the following line if you
+# aren't using the graphics-based display console.  this will connect ttya
+# to the master side of a pseudo-tty (in this case, /dev/ttyr0), which
+# you can connect to using tip or some other serial communications
+# program on the slave side (in this case, /dev/ptyr0):
+#
+sink1 at zs0 channel A: tme/serial/sink
+#console0 at zs0 channel A: tme/host/posix/serial device /dev/ttyr0 break-carats
+# OR enable POSIX pseudo-terminal master (if available) using the ptmx clone device:
+# the tmesh console will display the slave device to connect to (e.g., /dev/pts/3)
+#console0 at zs0 channel A: tme/host/posix/serial device /dev/ptmx break-carats
+
+## the SBus esp SCSI:
+##
+esp0 at sbus0 slot 0 offset 0x800000 ipl 3: tme/ic/lsi64854 revision "1+" channel scsi
+esp0 dma at sbus0 slot 0 offset 0x400000
+ncr0 at esp0 master: tme/ic/ncr53c9x variant esp100
+scsibus0 at ncr0: tme/scsi/bus
+
+## the SBus LANCE Ethernet:
+##
+# uncomment the bpf0 line if you have read/write permission on one
+# of your /dev/bpfN devices (on *BSD) OR have cap_net_raw+ep capability (on Linux)
+# and you want actual network access:
+#
+le0 at sbus0 slot 0 offset 0xc00000 ipl 5 dma-offset 0xff000000: tme/ic/am7990
+#bpf0 at le0: tme/host/bsd/bpf
+# OR enable tap ethernet device, an alternative method for network access
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
+#tap0 at le0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap0 at le0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# An example of the link element that can be used to connect network elements across an IP network.
+# Here, we set up a P2P network between two machines on different hosts.  Each machine would have
+# one side of the connection, by uncommenting one of the lines below to complement the other one.
+#link0 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.1 --remote 192.168.0.2
+#link1 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.2 --remote 192.168.0.1
+
+# Uncomment the following lines to get debug output for each respective element (or add your own)
+#log bpf0 1
+#log tap0 1
+#log link0 1
+
+# You can enable "networking" multiple machines using the following lines,
+# removing the " at le0" from the one of the previous 2 lines that is used
+# to set up the tap device.  This might not be needed if the tap devices is
+# already connected to another element.  This creates a master configuration
+# that can be used with different slave configurations.
+#tap1: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap1: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+#tap1 at tap1
+
+# A master configuration can also include remote machines by connecting the tap
+# or bpf device to a link.  If the tap is connected, then you don't need to
+# connect it to itself first, but the tap must be connected to something.
+# Remember that each element can only connect to one other element, so the
+# network configurations must be set up carefully.
+#link2 at tap1: tme/host/openvpn/socket/link --dev tap --local 192.168.0.3 --remote 192.168.0.4
+
+# Slave configurations only need the follwing line to connect to the tap
+# network via bpf.  Note that the master requires this line, too...
+#bpf1 at le0: tme/host/bsd/bpf interface tap0
+
+# A slave configuration can also include remote machines by connecting the bpf
+# device to a link.
+#link3: tme/host/openvpn/socket/link --dev tap --local 192.168.0.5 --remote 192.168.0.6
+#bpf2 at link3: tme/host/bsd/bpf interface tap0
+
+## an SBus cgthree:
+##
+#cgthree0 at sbus0 slot 1 offset 0x0 ipl 7: tme/bus/sbus/cgthree
+#cgthreerom0 at sbus0 slot 1 offset 0x0: tme/host/posix/memory rom "SUNW,501-1415.bin"
+
+## an SBus bwtwo:
+##
+# uncomment these lines if you want a bwtwo either in addition to, or
+# instead of, the cgthree:
+#
+bwtwo0 at sbus0 slot 2 offset 0x0 ipl 7: tme/bus/sbus/bwtwo
+bwtworom0 at sbus0 slot 2 offset 0x0: tme/host/posix/memory rom "SUNW,501-1561.bin"
+
+## the graphics-based display console:
+##
+# comment out these lines, and the bwtwo0 and cgthree0 declarations
+# above, if you don't have GTK or VNC or you don't want a display console:
+# You can have only one graphics-based display at a time:
+# uncomment which display you want
+# uncomment this line for a GTK-based graphics display
+#display0: tme/host/gtk/display
+display0: tme/host/rfb/display
+#display0 at cgthree0
+display0 at bwtwo0
+display0 at kbd0
+display0 at ms0
+
+## a SCSI disk:
+##
+#
+sd0 at scsibus0: tme/scsi/disk id 3 type tme-scsi-1
+disk0 at sd0: tme/host/posix/disk file my-sun4c-disk.img
+
+## a SCSI tape:
+##
+#st0 at scsibus0: tme/scsi/tape id 4 type tme-scsi-1
+#tape0 at st0: tme/host/posix/tape
+
+## a CD-ROM drive:
+##
+cd0 at scsibus0: tme/scsi/cdrom id 6 type tme-scsi-1
+cdrom0 at cd0: tme/host/posix/disk file NetBSD-9.2-sparc.iso read-only
+
+## set the idle type, so tmesh doesn't consume all of the host CPU:
+##
+# use the appropriate type for the guest operating system:
+#
+# NetBSD/sparc 1.6 through 4.99.19: netbsd32-type-0
+# NetBSD/sparc 4.99.20 through this writing: netbsd32-type-1
+# SunOS 4.1.x: sunos32-type-0
+#
+command cpu0 idle-type netbsd32-type-1
+
+## power up the machine:
+##
+# uncomment this line to automatically power up the machine when
+# tmesh starts:
+#
+command board0 power up

--- /dev/null
+++ b/machine/sun4/SUN4-75-rfb-cg3
@@ -0,0 +1,151 @@
+# $Id: SUN4-75,v 1.3 2010/06/05 19:26:31 fredette Exp $
+
+## SUN4-75 - example tmesh commands to create a Sun 4/75 (SPARCstation 2)
+## machine:
+
+## the basic Sun 4/75 "Calvin" board, CPU, and sbus:
+##
+board0: tme/machine/sun4 name Calvin
+cpu0 at board0: tme/ic/cy7c601 fpu-type tms390-c602A fpu-compliance partial fpu-incomplete trap
+sbus0: tme/generic/bus size 4GB slot-addr 0xf8000000 slot-size 32MB slot 0 slot 1 slot 2 slot 3
+sbus0 controller at board0 sbus
+
+## the sun4c mainbus RAM, ROM, and devices:
+##
+## NOTE THAT THE ram0 SIZE MUST BE A MULTIPLE OF 16MB, which is
+## the maximum bank size of the SS2, AND NO MORE THAN 64MB.
+## Once ram0 has reached 64MB, uncomment the ram1 line for 96MB of
+## total memory, and then the ram2 line for 128MB of total memory:
+##
+alias mainbus0 sbus0
+ram0 at mainbus0 addr 0x0: tme/host/posix/memory ram 16MB
+ram1 at mainbus0 addr 0x08000000: tme/host/posix/memory ram 32MB
+ram2 at mainbus0 addr 0x0a000000: tme/host/posix/memory ram 32MB
+rom0 at mainbus0 addr 0xf6000000: tme/host/posix/memory rom sun4-75-rev-2.9.bin
+zs0 at mainbus0 addr 0xf1000000 ipl 12: tme/machine/sun4/zs
+zs1 at mainbus0 addr 0xf0000000 ipl 12: tme/machine/sun4/zs
+nvram0 at mainbus0 addr 0xf2000000: tme/host/posix/memory persistent my-sun4c-nvram.bin
+clock0 at mainbus0 addr 0xf20007f8: tme/machine/sun4/clock type tme/ic/mk48t02
+board0 timer at mainbus0 addr 0xf3000000
+board0 memerr at mainbus0 addr 0xf4000000
+board0 intreg at mainbus0 addr 0xf5000000
+fdc0 at mainbus0 addr 0xf7200000 ipl 11: tme/machine/sun4/fdc type tme/ic/i82072
+audioamd0 at mainbus0 addr 0xf7201000 ipl 13: tme/ic/am7930
+board0 auxreg at mainbus0 addr 0xf7400003
+
+## the SBus esp SCSI:
+##
+esp0 at sbus0 slot 0 offset 0x800000 ipl 3: tme/ic/lsi64854 revision "1+" channel scsi
+esp0 dma at sbus0 slot 0 offset 0x400000
+ncr0 at esp0 master: tme/ic/ncr53c9x variant esp100
+scsibus0 at ncr0: tme/scsi/bus
+
+## the SBus LANCE Ethernet:
+##
+# uncomment the bpf0 line if you have read/write permission on one
+# of your /dev/bpfN devices (on *BSD) OR have cap_net_raw+ep capability (on Linux)
+# and you want actual network access:
+#
+le0 at sbus0 slot 0 offset 0xc00000 ipl 5 dma-offset 0xff000000: tme/ic/am7990
+#bpf0 at le0: tme/host/bsd/bpf
+# OR enable tap ethernet device, an alternative method for network access
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
+#tap0 at le0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap0 at le0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# An example of the link element that can be used to connect network elements across an IP network.
+# Here, we set up a P2P network between two machines on different hosts.  Each machine would have
+# one side of the connection, by uncommenting one of the lines below to complement the other one.
+#link0 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.1 --remote 192.168.0.2
+#link1 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.2 --remote 192.168.0.1
+
+# Uncomment the following lines to get debug output for each respective element (or add your own)
+#log bpf0 1
+#log tap0 1
+#log link0 1
+
+# You can enable "networking" multiple machines using the following lines,
+# removing the " at le0" from the one of the previous 2 lines that is used
+# to set up the tap device.  This might not be needed if the tap devices is
+# already connected to another element.  This creates a master configuration
+# that can be used with different slave configurations.
+#tap1: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap1: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+#tap1 at tap1
+
+# A master configuration can also include remote machines by connecting the tap
+# or bpf device to a link.  If the tap is connected, then you don't need to
+# connect it to itself first, but the tap must be connected to something.
+# Remember that each element can only connect to one other element, so the
+# network configurations must be set up carefully.
+#link2 at tap1: tme/host/openvpn/socket/link --dev tap --local 192.168.0.3 --remote 192.168.0.4
+
+# Slave configurations only need the follwing line to connect to the tap
+# network via bpf.  Note that the master requires this line, too...
+#bpf1 at le0: tme/host/bsd/bpf interface tap0
+
+# A slave configuration can also include remote machines by connecting the bpf
+# device to a link.
+#link3: tme/host/openvpn/socket/link --dev tap --local 192.168.0.5 --remote 192.168.0.6
+#bpf2 at link3: tme/host/bsd/bpf interface tap0
+
+## an SBus cgthree:
+##
+cgthree0 at sbus0 slot 1 offset 0x0 ipl 7: tme/bus/sbus/cgthree
+cgthreerom0 at sbus0 slot 1 offset 0x0: tme/host/posix/memory rom "SUNW,501-1415.bin"
+
+## an SBus bwtwo:
+##
+# uncomment these lines if you want a bwtwo either in addition to, or
+# instead of, the cgthree:
+#
+#bwtwo0 at sbus0 slot 2 offset 0x0 ipl 7: tme/bus/sbus/bwtwo
+#bwtworom0 at sbus0 slot 2 offset 0x0: tme/host/posix/memory rom "SUNW,501-1561.bin"
+
+## the graphics-based display console:
+##
+# comment out these lines, and the bwtwo0 and cgthree0 declarations
+# above, if you don't have GTK or VNC or you don't want a display console:
+# You can have only one graphics-based display at a time:
+# uncomment which display you want
+# uncomment this line for a GTK-based graphics display
+#display0: tme/host/gtk/display
+display0: tme/host/rfb/display
+display0 at cgthree0
+#display0 at bwtwo0
+display0 at kbd0
+display0 at ms0
+
+## a SCSI disk:
+##
+#
+sd0 at scsibus0: tme/scsi/disk id 3 type tme-scsi-1
+disk0 at sd0: tme/host/posix/disk file my-sun4c-disk.img
+
+## a SCSI tape:
+##
+#st0 at scsibus0: tme/scsi/tape id 4 type tme-scsi-1
+#tape0 at st0: tme/host/posix/tape
+
+## a CD-ROM drive:
+##
+cd0 at scsibus0: tme/scsi/cdrom id 6 type tme-scsi-1
+cdrom0 at cd0: tme/host/posix/disk file NetBSD-9.2-sparc.iso read-only
+
+## set the idle type, so tmesh doesn't consume all of the host CPU:
+##
+# use the appropriate type for the guest operating system:
+#
+# NetBSD/sparc 1.6 through 4.99.19: netbsd32-type-0
+# NetBSD/sparc 4.99.20 through this writing: netbsd32-type-1
+# SunOS 4.1.x: sunos32-type-0
+#
+command cpu0 idle-type netbsd32-type-1
+
+## power up the machine:
+##
+# uncomment this line to automatically power up the machine when
+# tmesh starts:
+#
+command board0 power up

--- /dev/null
+++ b/machine/sun4/SUN4-75-tty
@@ -0,0 +1,153 @@
+# $Id: SUN4-75,v 1.3 2010/06/05 19:26:31 fredette Exp $
+
+## SUN4-75 - example tmesh commands to create a Sun 4/75 (SPARCstation 2)
+## machine:
+
+## the basic Sun 4/75 "Calvin" board, CPU, and sbus:
+##
+board0: tme/machine/sun4 name Calvin
+cpu0 at board0: tme/ic/cy7c601 fpu-type tms390-c602A fpu-compliance partial fpu-incomplete trap
+sbus0: tme/generic/bus size 4GB slot-addr 0xf8000000 slot-size 32MB slot 0 slot 1 slot 2 slot 3
+sbus0 controller at board0 sbus
+
+## the sun4c mainbus RAM, ROM, and devices:
+##
+## NOTE THAT THE ram0 SIZE MUST BE A MULTIPLE OF 16MB, which is
+## the maximum bank size of the SS2, AND NO MORE THAN 64MB.
+## Once ram0 has reached 64MB, uncomment the ram1 line for 96MB of
+## total memory, and then the ram2 line for 128MB of total memory:
+##
+alias mainbus0 sbus0
+ram0 at mainbus0 addr 0x0: tme/host/posix/memory ram 16MB
+ram1 at mainbus0 addr 0x08000000: tme/host/posix/memory ram 32MB
+ram2 at mainbus0 addr 0x0a000000: tme/host/posix/memory ram 32MB
+rom0 at mainbus0 addr 0xf6000000: tme/host/posix/memory rom sun4-75-rev-2.9.bin
+zs0 at mainbus0 addr 0xf1000000 ipl 12: tme/machine/sun4/zs
+zs1 at mainbus0 addr 0xf0000000 ipl 12: tme/machine/sun4/zs
+nvram0 at mainbus0 addr 0xf2000000: tme/host/posix/memory persistent my-sun4c-nvram.bin
+clock0 at mainbus0 addr 0xf20007f8: tme/machine/sun4/clock type tme/ic/mk48t02
+board0 timer at mainbus0 addr 0xf3000000
+board0 memerr at mainbus0 addr 0xf4000000
+board0 intreg at mainbus0 addr 0xf5000000
+fdc0 at mainbus0 addr 0xf7200000 ipl 11: tme/machine/sun4/fdc type tme/ic/i82072
+audioamd0 at mainbus0 addr 0xf7201000 ipl 13: tme/ic/am7930
+board0 auxreg at mainbus0 addr 0xf7400003
+
+source sun4-ptmx
+
+## the SBus esp SCSI:
+##
+esp0 at sbus0 slot 0 offset 0x800000 ipl 3: tme/ic/lsi64854 revision "1+" channel scsi
+esp0 dma at sbus0 slot 0 offset 0x400000
+ncr0 at esp0 master: tme/ic/ncr53c9x variant esp100
+scsibus0 at ncr0: tme/scsi/bus
+
+## the SBus LANCE Ethernet:
+##
+# uncomment the bpf0 line if you have read/write permission on one
+# of your /dev/bpfN devices (on *BSD) OR have cap_net_raw+ep capability (on Linux)
+# and you want actual network access:
+#
+le0 at sbus0 slot 0 offset 0xc00000 ipl 5 dma-offset 0xff000000: tme/ic/am7990
+#bpf0 at le0: tme/host/bsd/bpf
+# OR enable tap ethernet device, an alternative method for network access
+# 2 ways to access a tap device: native or openvpn (respectively below)
+# both require setuid or equivalent permissions, which should be set up at build time
+#tap0 at le0: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap0 at le0: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+
+# An example of the link element that can be used to connect network elements across an IP network.
+# Here, we set up a P2P network between two machines on different hosts.  Each machine would have
+# one side of the connection, by uncommenting one of the lines below to complement the other one.
+#link0 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.1 --remote 192.168.0.2
+#link1 at le0: tme/host/openvpn/socket/link --dev tap --local 192.168.0.2 --remote 192.168.0.1
+
+# Uncomment the following lines to get debug output for each respective element (or add your own)
+#log bpf0 1
+#log tap0 1
+#log link0 1
+
+# You can enable "networking" multiple machines using the following lines,
+# removing the " at le0" from the one of the previous 2 lines that is used
+# to set up the tap device.  This might not be needed if the tap devices is
+# already connected to another element.  This creates a master configuration
+# that can be used with different slave configurations.
+#tap1: tme/host/tun/tap inet 10.0.77.1 netmask 255.255.255.0 bcast 10.0.77.255
+#tap1: tme/host/openvpn/tap --dev tap --ifconfig 10.0.77.1 255.255.255.0 --tun-ipv6 --ifconfig-ipv6 "2001:db8::1/64" "2001:db8::2"
+#tap1 at tap1
+
+# A master configuration can also include remote machines by connecting the tap
+# or bpf device to a link.  If the tap is connected, then you don't need to
+# connect it to itself first, but the tap must be connected to something.
+# Remember that each element can only connect to one other element, so the
+# network configurations must be set up carefully.
+#link2 at tap1: tme/host/openvpn/socket/link --dev tap --local 192.168.0.3 --remote 192.168.0.4
+
+# Slave configurations only need the follwing line to connect to the tap
+# network via bpf.  Note that the master requires this line, too...
+#bpf1 at le0: tme/host/bsd/bpf interface tap0
+
+# A slave configuration can also include remote machines by connecting the bpf
+# device to a link.
+#link3: tme/host/openvpn/socket/link --dev tap --local 192.168.0.5 --remote 192.168.0.6
+#bpf2 at link3: tme/host/bsd/bpf interface tap0
+
+## an SBus cgthree:
+##
+#cgthree0 at sbus0 slot 1 offset 0x0 ipl 7: tme/bus/sbus/cgthree
+#cgthreerom0 at sbus0 slot 1 offset 0x0: tme/host/posix/memory rom "SUNW,501-1415.bin"
+
+## an SBus bwtwo:
+##
+# uncomment these lines if you want a bwtwo either in addition to, or
+# instead of, the cgthree:
+#
+#bwtwo0 at sbus0 slot 2 offset 0x0 ipl 7: tme/bus/sbus/bwtwo
+#bwtworom0 at sbus0 slot 2 offset 0x0: tme/host/posix/memory rom "SUNW,501-1561.bin"
+
+## the graphics-based display console:
+##
+# comment out these lines, and the bwtwo0 and cgthree0 declarations
+# above, if you don't have GTK or VNC or you don't want a display console:
+# You can have only one graphics-based display at a time:
+# uncomment which display you want
+# uncomment this line for a GTK-based graphics display
+#display0: tme/host/gtk/display
+#display0: tme/host/rfb/display
+#display0 at cgthree0
+#display0 at bwtwo0
+#display0 at kbd0
+#display0 at ms0
+
+## a SCSI disk:
+##
+#
+sd0 at scsibus0: tme/scsi/disk id 3 type tme-scsi-1
+disk0 at sd0: tme/host/posix/disk file my-sun4c-disk.img
+
+## a SCSI tape:
+##
+#st0 at scsibus0: tme/scsi/tape id 4 type tme-scsi-1
+#tape0 at st0: tme/host/posix/tape
+
+## a CD-ROM drive:
+##
+cd0 at scsibus0: tme/scsi/cdrom id 6 type tme-scsi-1
+cdrom0 at cd0: tme/host/posix/disk file NetBSD-9.2-sparc.iso read-only
+
+## set the idle type, so tmesh doesn't consume all of the host CPU:
+##
+# use the appropriate type for the guest operating system:
+#
+# NetBSD/sparc 1.6 through 4.99.19: netbsd32-type-0
+# NetBSD/sparc 4.99.20 through this writing: netbsd32-type-1
+# SunOS 4.1.x: sunos32-type-0
+#
+command cpu0 idle-type netbsd32-type-1
+
+## power up the machine:
+##
+# uncomment this line to automatically power up the machine when
+# tmesh starts:
+#
+command board0 power up

--- a/tme-preopen.txt
+++ b/tme-preopen.txt
@@ -21,12 +21,12 @@ LDADD = \
 	-dlopen ../machine/sun2/tme_machine_sun2.la \
 	-dlopen ../machine/sun3/tme_machine_sun3.la \
 	-dlopen ../machine/sun4/tme_machine_sun4.la \
-	-dlopen ../host/posix/tme_host_posix.la \
-	-dlopen ../host/bsd/tme_host_bsd.la \
-	-dlopen ../host/tun/tme_host_tun.la \
-	-dlopen ../host/openvpn/tme_host_openvpn.la \
-	-dlopen ../host/rfb/tme_host_rfb.la \
-	-dlopen ../host/gtk/tme_host_gtk.la \
+	-dlopen ../host/display/rfb/tme_host_rfb.la \
+	-dlopen ../host/display/gtk/tme_host_gtk.la \
+	-dlopen ../host/eth/bsd/tme_host_bsd.la \
+	-dlopen ../host/eth/tun/tme_host_tun.la \
+	-dlopen ../host/eth/openvpn/tme_host_openvpn.la \
+	-dlopen ../host/tme_host_posix.la \
 	-dlopen ../bus/multibus/tme_bus_multibus.la \
 	-dlopen ../bus/sbus/tme_bus_sbus.la \
 	-dlopen ../serial/tme_serial_kb.la \

--- a/tme/tme-plugins.txt
+++ b/tme/tme-plugins.txt
@@ -42,17 +42,17 @@ tme_machine_sun4_fdc tme_machine_sun4 fdc
 tme_machine_sun4_oclock tme_machine_sun4 oclock
 tme_machine_sun4_clock tme_machine_sun4 clock
 tme_machine_sun4_zs tme_machine_sun4 zs
-tme_host_posix_disk tme_host_posix disk
-tme_host_posix_memory tme_host_posix memory
-tme_host_posix_serial tme_host_posix serial
-tme_host_posix_tape tme_host_posix tape
+tme_host_rfb_display tme_host_rfb display
+tme_host_gtk_display tme_host_gtk display
 tme_host_bsd_bpf tme_host_bsd bpf
 tme_host_tun_tap tme_host_tun tap
 tme_host_openvpn_socket_link tme_host_openvpn socket_link
 tme_host_openvpn_socket_server tme_host_openvpn_socket server
 tme_host_openvpn_tun_tap tme_host_openvpn tun_tap
-tme_host_rfb_display tme_host_rfb display
-tme_host_gtk_display tme_host_gtk display
+tme_host_posix_disk tme_host_posix disk
+tme_host_posix_memory tme_host_posix memory
+tme_host_posix_serial tme_host_posix serial
+tme_host_posix_tape tme_host_posix tape
 tme_bus_multibus_3c400 tme_bus_multibus 3c400
 tme_bus_multibus_sun_mie tme_bus_multibus sun_mie
 tme_bus_multibus_sun_sc tme_bus_multibus sun_sc