X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=default.cfg;h=552f4a839885f762372df60b4e1f8d53acd8d05e;hb=4da4c3c51f144ae718d669abb94006e411ebc7f3;hp=5160d846606d1efe50966be0f57b9c96930fa392;hpb=1439d00b570066c05d4b8dcac4511bdef04f27a8;p=pistorm

diff --git a/default.cfg b/default.cfg
index 5160d84..552f4a8 100644
--- a/default.cfg
+++ b/default.cfg
@@ -1,15 +1,16 @@
 # 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.
-map type=ram address=0x08000000 size=128M id=cpu_slot_ram
+# 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.
+#map type=ram address=0x08000000 size=128M id=cpu_slot_ram
 # Map 128MB of Z3 Fast. Note that the address here is not actually used, as it gets auto-assigned by Kickstart itself.
-# Enabling Z3 fast requires a Kickstart that actually supports Zorro III, for instance from an A3000 or A4000.
-#map type=ram address=0x10000000 size=128M id=z3_autoconf_fast
+# Enabling Z3 fast requires at least Kickstart 2.0.
+map type=ram address=0x10000000 size=128M id=z3_autoconf_fast
 # Max 8MB of Z2 Fast can be mapped due to addressing space limitations, but for instance 2+4MB can be chained to leave 2MB for something else.
 #map type=ram address=0x200000 size=8M id=z2_autoconf_fast
 #map type=ram address=0x200000 size=2M id=z2_autoconf_fast
@@ -19,21 +20,21 @@ map type=ram address=0x08000000 size=128M id=cpu_slot_ram
 #map type=ram address=0x0 size=2M
 
 # Map Gayle as a register range.
-map type=register address=0xD80000 size=0x70000
+# 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
 # Number of instructions to run every main loop.
 loopcycles 300
 # Set the platform to Amiga to enable all the registers and stuff.
 platform amiga
 # Uncomment to let reads/writes through from/to the RTC memory range
 #setvar enable_rtc_emulation 0
-# Uncomment to set a custom HD image file for ide0 drive 0/1
-#setvar hdd0 snakes.img
-#setvar hdd1 snakes2.img
 # 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 enabled the PiSCSI interface
+# Uncomment this line to enable the PiSCSI interface
 #setvar piscsi
 # Use setvar piscsi0 through piscsi6 to add up to seven mapped drives to the interface.
 #setvar piscsi0 PI0.hdf
@@ -41,8 +42,18 @@ platform amiga
 # 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
 # Forward keyboard events to host system, defaults to off unless toggle key is pressed, toggled off using F12.
-#keyboard k
+# 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