From aa714f6f4135b1be835d66c1d8e0472806f4b3ef Mon Sep 17 00:00:00 2001 From: beeanyew Date: Thu, 29 Jul 2021 17:33:12 +0200 Subject: [PATCH] Add shutdown command to PiSimple --- amiga.cfg | 4 ++++ .../pistorm-dev/pistorm_dev_amiga/CopyMems | Bin 10444 -> 10464 bytes .../pistorm-dev/pistorm_dev_amiga/PiSimple | Bin 20008 -> 20248 bytes .../pistorm_dev_amiga/simple_interact.c | 8 ++++++++ 4 files changed, 12 insertions(+) diff --git a/amiga.cfg b/amiga.cfg index fcf5c9c..be0ac01 100644 --- a/amiga.cfg +++ b/amiga.cfg @@ -5,6 +5,10 @@ map type=rom address=0xF80000 size=0x80000 file=kick.rom ovl=0 id=kickstart # Comment out the line above and uncomment the line below to automatically copy the ROM contents to Pi RAM if the file isn't found #map type=rom address=0xF80000 size=0x80000 file=kick.rom ovl=0 id=kickstart autodump_mem +# "Blackhole" the detected slow RAM on the Amiga 600. This enables maprom to work without using specifically kick v40.63 +# DO NOT ENABLE THIS UNLESS YOU ARE USING THE PISTORM ON AN AMIGA 600. +#map type=register address=0xC00000 size=0x80000 id=blackhole_slow_a600 + # Want to map an extended ROM, such as CDTV or CD32? #map type=rom address=0xF00000 size=0x80000 file=cdtv.rom id=extended diff --git a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/CopyMems b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/CopyMems index c1b2dc925efc797c2d20072ca96bc485dc52a4c1..225b22c3eefbed6624efef8bec42621ac10e1162 100755 GIT binary patch delta 51 zcmX>T_#kkD8#kNZPX-2VmCZif);x?FlRLzn85K645Etg+Wr{CI&dD!MWnf?s&e(iI H@e3OOo+=NZ delta 35 rcmaD5cqVXz8#i0Re+C8ymd!rg);x^rlRLznH=h?5;M)9N@go}m+KUVn diff --git a/platforms/amiga/pistorm-dev/pistorm_dev_amiga/PiSimple b/platforms/amiga/pistorm-dev/pistorm_dev_amiga/PiSimple index fb2eb523e307b0f7ae20267886231d1b8dde3047..645776696bf23c2321bae8cbcafd8bfdb8feb801 100755 GIT binary patch delta 5826 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 sLrSt+gv_zx29J0|CeVQ8yFwv?0U8GNwyd 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 8), (pi_get_hw_rev() & 0xFF)); @@ -197,6 +202,9 @@ int __stdargs main (int argc, char *argv[]) { } int get_command(char *cmd) { + if (strcmp(cmd, "--shutdown") == 0 || strcmp(cmd, "--safe-shutdown") == 0 || strcmp(cmd, "--:)") == 0) { + return PI_CMD_SHUTDOWN; + } if (strcmp(cmd, "--restart") == 0 || strcmp(cmd, "--reboot") == 0 || strcmp(cmd, "--reset") == 0) { return PI_CMD_RESET; }