X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fapple2.cpp;fp=src%2Fapple2.cpp;h=be5a16d1e805f74c0f9828c7eed6f68ee44a2085;hb=695e6c22a404fc7e4141a5c8e5ceda10d48c7fd3;hp=e97363afdf68a4ea4555c383645fdc4b81e20f70;hpb=e4b94bfc1e03e2c2848ab34e5f0cd8790e10f4b3;p=apple2 diff --git a/src/apple2.cpp b/src/apple2.cpp index e97363a..be5a16d 100644 --- a/src/apple2.cpp +++ b/src/apple2.cpp @@ -278,7 +278,6 @@ WriteLog("CPU: SDL_mutexV(cpuMutex);\n"); } #endif - // // Request a change in the power state of the emulated Apple // @@ -287,7 +286,6 @@ void SetPowerState(void) powerStateChangeRequested = true; } - // // Load a file into RAM/ROM image space // @@ -304,7 +302,6 @@ bool LoadImg(char * filename, uint8_t * ram, int size) return true; } - const uint8_t stateHeader[19] = "APPLE2SAVESTATE1.2"; static void SaveApple2State(const char * filename) { @@ -358,7 +355,6 @@ static void SaveApple2State(const char * filename) fclose(file); } - static bool LoadApple2State(const char * filename) { WriteLog("Main: Loading Apple2 state...\n"); @@ -427,7 +423,6 @@ static bool LoadApple2State(const char * filename) return true; } - static void ResetApple2State(void) { keyDown = false; @@ -453,7 +448,6 @@ static void ResetApple2State(void) mainCPU.cpuFlags |= V65C02_ASSERT_LINE_RESET; } - static double cyclesForSample = 0; static void AppleTimer(uint16_t cycles) { @@ -481,7 +475,6 @@ lastSampleClock = sampleClock; #endif } - #ifdef CPU_CLOCK_CHECKING uint8_t counter = 0; uint32_t totalCPU = 0; @@ -666,8 +659,8 @@ WriteLog("Main: SDL_DestroyCond(cpuCond);\n"); #if 0 #include "dis65c02.h" static char disbuf[80]; -uint16_t pc=0x801; -while (pc < 0x9FF) +uint16_t pc=0xA000; +while (pc < 0xA3FF) { pc += Decode65C02(&mainCPU, disbuf, pc); WriteLog("%s\n", disbuf); @@ -682,7 +675,6 @@ while (pc < 0x9FF) return 0; } - // // Apple //e scancodes. Tables are normal (0), +CTRL (1), +SHIFT (2), // +CTRL+SHIFT (3). Order of keys is: @@ -1147,7 +1139,6 @@ if (counter == 60) #endif } - static void BlinkTimer(void) { // Set up blinking at 1/4 sec intervals @@ -1155,7 +1146,6 @@ static void BlinkTimer(void) SetCallbackTime(BlinkTimer, 250000); } - /* Next problem is this: How to have events occur and synchronize with the rest of the threads? @@ -1181,4 +1171,3 @@ while (!done) time = 20; } */ -