Replace/clean up old platform read/write check macros

[pistorm] / default.cfg

diff --git a/default.cfg b/default.cfg
index bec305a265203459b119ca04d30ceddd02dc1912..b8f46a263dbc164dcb4433f455e8d7fe3a61f7dd 100644 (file)
--- a/default.cfg
+++ b/default.cfg
@@ -1,9 +1,9 @@
 # Sets CPU type. Valid types are (probably) 68000, 68010, 68020, 68EC020, 68030, 68EC030, 68040, 68EC040, 68LC040 and some STTTT thing.
 cpu 68020
 # Map 512KB kickstart ROM to default offset.
-map type=rom address=0xF80000 size=0x80000 file=kick.rom ovl=0
+map type=rom address=0xF80000 size=0x80000 file=kick.rom ovl=0 id=kickstart
 # Want to map an extended ROM, such as CDTV or CD32?
-#map type=rom address=0xF00000 size=0x80000 file=cdtv.rom
+#map type=rom address=0xF00000 size=0x80000 file=cdtv.rom id=extended
 
 # Map 128MB of Fast RAM at 0x8000000, also known as 32-bit Fast RAM or CPU local Fast RAM.
 # Only supported properly on select Kickstarts, such as 3.1+ for Amiga 1200, 3000 and 4000.
@@ -23,7 +23,7 @@ map type=ram address=0x10000000 size=128M id=z3_autoconf_fast
 # NOTE: Gayle emulation is currently non-functional. Do not enable this.
 #map type=register address=0xD80000 size=0x40000
 # Map RTC as a register range.
-map type=register address=0xDC0000 size=0x30000
+map type=register address=0xDC0000 size=0x10000
 # Number of instructions to run every main loop.
 loopcycles 300
 # Set the platform to Amiga to enable all the registers and stuff.
@@ -32,6 +32,7 @@ platform amiga
 #setvar enable_rtc_emulation 0
 # Uncomment to enable RTG
 #setvar rtg
+
 # Uncomment to enable CDTV mode (not working, requires Kickstart 1.3+CDTV extended ROM)
 #setvar cdtv
 # Uncomment this line to enable the PiSCSI interface
@@ -39,17 +40,28 @@ platform amiga
 # Use setvar piscsi0 through piscsi6 to add up to seven mapped drives to the interface.
 #setvar piscsi0 PI0.hdf
 #setvar piscsi1 PI1.hdf
+# A special disk that includes PiStorm drivers and utilities, comment out if not needed
+setvar piscsi6 platforms/amiga/pistorm.hdf
 # Uncomment this line to enable the (currently non-working) Pi-Net interface.
 #setvar pi-net
 
-# Forward mouse events to host system, defaults to off unless toggle key is pressed on the Pi.
-# Syntax is mouse [device] [toggle key]
-#mouse /dev/input/mouse0 m
+# Uncomment and edit to set a custom config filename for the A314 emulation
+#setvar a314_conf /etc/opt/a314/a314d.conf
+# Uncomment to enable A314 emulation
+#setvar a314
+
 # Forward keyboard events to host system, defaults to off unless toggle key is pressed, toggled off using F12.
-# Add the keyword "grab" to steal the keyboard from the Pi, so Amiga input does not appear on the console or in X11.
-# (also helps prevent sending any ctrl-alt-del to the Amiga from resetting the Pi)
-keyboard k grab
+# Syntax: keyboard [grab key] [grab|nograb] [autoconnect|noautoconnect]
+#   "grab" steals the keyboard from the Pi so Amiga/etc. input is not sent to the Pi
+#   (also helps prevent sending any ctrl-alt-del to the Amiga from resetting the Pi)
+#
+#   "autoconnect" connects the keyboard to the Amiga/etc. on startup
+keyboard k nograb noautoconnect
 # Select a specific filename for the keyboard event source.
 # This is typically /dev/input/event1 or event0, but it may be event3 with for instance a wireless keyboard.
 # Use ls /dev/input/event* to check which event files are available and try until you find the one that works.
 #kbfile /dev/input/event1
+# Forward mouse events to host system, defaults to off unless toggle key is pressed on the Pi.
+# Syntax is mouse [device] [toggle key] [autoconnect|noautoconnect]
+# (see "keyboard" above for autoconnect description)
+mouse /dev/input/mice m noautoconnect