From fa7194f1f500c47238d00a6697384d20e9f31300 Mon Sep 17 00:00:00 2001 From: meepingsnesroms Date: Mon, 7 Jan 2019 20:03:11 -0800 Subject: [PATCH] Commit finished, custom IO is working --- tools/palm/hwTestSuite/make.sh | 6 ++---- tools/palm/muExpansionDriver/make.sh | 6 ++---- tools/palm/muExpansionDriver/muExpDriver.c | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/palm/hwTestSuite/make.sh b/tools/palm/hwTestSuite/make.sh index bd564d7..9b56591 100755 --- a/tools/palm/hwTestSuite/make.sh +++ b/tools/palm/hwTestSuite/make.sh @@ -12,12 +12,10 @@ if [ "$1" = "clean" ]; then fi declare -a FILES=("testSuite" "viewer" "tools" "tests" "cpu" "emuFunctions" "ugui" "undocumentedApis" "debug") -DEFINES="" -CFLAGS="-palmos4 -O3 $DEFINES" +CFLAGS="-palmos4 -O3" if [ "$1" = "debug" ]; then - DEFINES="$DEFINES -DDEBUG" - CFLAGS="$CFLAGS -g" + CFLAGS="$CFLAGS -DDEBUG -g" fi m68k-palmos-multigen $APPNAME.def diff --git a/tools/palm/muExpansionDriver/make.sh b/tools/palm/muExpansionDriver/make.sh index 99a8885..b678a15 100755 --- a/tools/palm/muExpansionDriver/make.sh +++ b/tools/palm/muExpansionDriver/make.sh @@ -12,12 +12,10 @@ if [ "$1" = "clean" ]; then fi declare -a FILES=("muExpDriver" "armv5" "soundDriver" "traps" "debug") -DEFINES="" -CFLAGS="-palmos4 -O3 $DEFINES" +CFLAGS="-palmos4 -O3" if [ "$1" = "debug" ]; then - DEFINES="$DEFINES -DDEBUG" - CFLAGS="$CFLAGS -g" + CFLAGS="$CFLAGS -DDEBUG -g" fi for I in "${FILES[@]}"; do diff --git a/tools/palm/muExpansionDriver/muExpDriver.c b/tools/palm/muExpansionDriver/muExpDriver.c index a57458b..a8d2300 100644 --- a/tools/palm/muExpansionDriver/muExpDriver.c +++ b/tools/palm/muExpansionDriver/muExpDriver.c @@ -44,7 +44,7 @@ static void showGui(uint32_t* configFile){ } } -static void initBoot(void){ +static void initBoot(uint32_t* configFile){ uint32_t enabledFeatures = readArbitraryMemory32(EMU_REG_ADDR(EMU_INFO)); debugLog("OS booting!\n");