X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapple2.cpp;fp=src%2Fapple2.cpp;h=6d893fa63f5d4be9517f06a5be87f5d594a6cb90;hb=719cbb7a236ec751bed90e24265aad72b5ee29dd;hp=ce38ed1721890d9de75bddf65e75adf3d95a550b;hpb=e3c7ee5d936cdddcc3afe4bf3f059ef0f3e28af2;p=apple2 diff --git a/src/apple2.cpp b/src/apple2.cpp index ce38ed1..6d893fa 100644 --- a/src/apple2.cpp +++ b/src/apple2.cpp @@ -45,7 +45,9 @@ #include #include #include -#include "firmware.h" +#include "firmware/apple2-fw.h" +#include "firmware/apple2e-enh.h" +#include "firmware/firmware.h" #include "floppydrive.h" #include "harddrive.h" #include "log.h" @@ -556,11 +558,15 @@ int main(int /*argc*/, char * /*argv*/[]) mainCPU.Timer = AppleTimer; mainCPU.cpuFlags |= V65C02_ASSERT_LINE_RESET; +#if 0 if (!LoadImg(settings.BIOSPath, rom + 0xC000, 0x4000)) { WriteLog("Could not open file '%s'!\n", settings.BIOSPath); return -1; } +#else + memcpy(rom + 0xC000, apple2eEnhROM, 0x4000); +#endif WriteLog("About to initialize video...\n");