c64
/
pi1541
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed a couple of incorrcet ifdefs.. 

Wrappped the experimental code correctly in main and fixed a comment typo in the inputmappings.
This commit is contained in:
Alexander Martinelle 2019-09-01 13:46:29 +02:00
parent d39c734151
commit 1880a2c710
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/InputMappings.h
View File

@ -121,17 +121,17 @@ public:
#else #else
inline bool Exit() inline bool Exit()
{ {
return KeyboardFlag(ESC_FLAG) /*| UartFlag(ESC_FLAG) |*/ ButtonFlag(ESC_FLAG); return KeyboardFlag(ESC_FLAG) | /*UartFlag(ESC_FLAG) |*/ ButtonFlag(ESC_FLAG);
} }
inline bool NextDisk() inline bool NextDisk()
{ {
return KeyboardFlag(NEXT_FLAG) /*| UartFlag(NEXT_FLAG) |*/ ButtonFlag(NEXT_FLAG); return KeyboardFlag(NEXT_FLAG) | /*UartFlag(NEXT_FLAG) |*/ ButtonFlag(NEXT_FLAG);
} }
inline bool PrevDisk() inline bool PrevDisk()
{ {
return KeyboardFlag(PREV_FLAG) /*| UartFlag(PREV_FLAG) |*/ ButtonFlag(PREV_FLAG); return KeyboardFlag(PREV_FLAG) | /*UartFlag(PREV_FLAG) |*/ ButtonFlag(PREV_FLAG);
} }
#endif #endif
inline bool AutoLoad() { return KeyboardFlag(AUTOLOAD_FLAG); } inline bool AutoLoad() { return KeyboardFlag(AUTOLOAD_FLAG); }

3
src/main.cpp
View File

@ -692,6 +692,7 @@ void CheckAutoMountImage(EXIT_TYPE reset_reason , FileBrowser* fileBrowser)
} }
} }
#if defined(EXPERIMENTALZERO)
EXIT_TYPE Emulate1541(FileBrowser* fileBrowser) EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
{ {
bool oldLED = false; bool oldLED = false;
@ -842,7 +843,7 @@ EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
return EXIT_UNKNOWN; return EXIT_UNKNOWN;
} }
#if not defined(EXPERIMENTALZERO) #else
EXIT_TYPE Emulate1541(FileBrowser* fileBrowser) EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
{ {
EXIT_TYPE exitReason = EXIT_UNKNOWN; EXIT_TYPE exitReason = EXIT_UNKNOWN;