More house cleaning

eric-914 · Feb 24, 2021 · f981c9c · f981c9c
1 parent 6190910
commit f981c9c
Show file tree

Hide file tree

Showing 20 changed files with 488 additions and 520 deletions.
diff --git a/library/Clipboard.c b/library/Clipboard.c
@@ -2,7 +2,7 @@
 #include "Config.h"
 #include "Keyboard.h"
 #include "Graphics.h"
-#include "MMU.h"
+#include "TC1014MMU.h"
 
 ClipboardState* InitializeInstance(ClipboardState*);
 

diff --git a/library/CoCo.c b/library/CoCo.c
@@ -19,7 +19,7 @@
 #include "cpudef.h"
 
 #include "PAKInterface.h"
-#include "Registers.h"
+#include "TC1014Registers.h"
 
 CoCoState* InitializeInstance(CoCoState*);
 

diff --git a/library/Config.c b/library/Config.c
@@ -440,7 +440,7 @@ extern "C" {
     ofn.lpstrTitle = "Open print capture file";		// title bar string
 
     if (GetOpenFileName(&ofn)) {
-      if (!(OpenPrintFile(tempFileName))) {
+      if (!(MC6821_OpenPrintFile(tempFileName))) {
         MessageBox(0, "Can't Open File", "Can't open the file specified.", 0);
       }
 

diff --git a/library/HD6309.c b/library/HD6309.c
@@ -1,6 +1,6 @@
 #include "HD6309.h"
 #include "HD6309OpCodes.h"
-#include "MMU.h"
+#include "TC1014MMU.h"
 
 #include "HD6309Macros.h"
 

diff --git a/library/HD6309OpCodes.c b/library/HD6309OpCodes.c
@@ -1,5 +1,5 @@
 #include "HD6309.h"
-#include "MMU.h"
+#include "TC1014MMU.h"
 
 #include "HD6309Macros.h"
 

diff --git a/library/IOBus.c b/library/IOBus.c
@@ -1,4 +1,4 @@
-#include "Registers.h"
+#include "TC1014Registers.h"
 #include "PAKInterface.h"
 #include "MC6821.h"
 

diff --git a/library/Keyboard.c b/library/Keyboard.c
@@ -7,7 +7,7 @@
 #include "Joystick.h"
 #include "MC6821.h"
 
-#include "Registers.h"
+#include "TC1014Registers.h"
 #include "xDebug.h"
 
 KeyboardState* InitializeInstance(KeyboardState*);

diff --git a/library/MC6809.c b/library/MC6809.c
@@ -1,6 +1,6 @@
 #include "MC6809.h"
 #include "MC6809OpCodes.h"
-#include "MMU.h"
+#include "TC1014MMU.h"
 
 #include "MC6809Macros.h"
 

diff --git a/library/MC6809OpCodes.c b/library/MC6809OpCodes.c
@@ -1,5 +1,5 @@
 #include "MC6809.h"
-#include "MMU.h"
+#include "TC1014MMU.h"
 
 #include "MC6809Macros.h"
 

diff --git a/library/MC6821.c b/library/MC6821.c
@@ -226,7 +226,7 @@ extern "C" {
 }
 
 extern "C" {
-  __declspec(dllexport) int __cdecl OpenPrintFile(char* filename)
+  __declspec(dllexport) int __cdecl MC6821_OpenPrintFile(char* filename)
   {
     instance->hPrintFile = CreateFile(filename, GENERIC_READ | GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
 

diff --git a/library/MC6821.h b/library/MC6821.h
@@ -31,7 +31,7 @@ extern "C" __declspec(dllexport) MC6821State * __cdecl GetMC6821State();
 
 extern "C" __declspec(dllexport) void __cdecl SetCart(unsigned char);
 
-extern "C" __declspec(dllexport) int __cdecl OpenPrintFile(char*);
+extern "C" __declspec(dllexport) int __cdecl MC6821_OpenPrintFile(char*);
 
 extern "C" __declspec(dllexport) unsigned char __cdecl MC6821_DACState();
 extern "C" __declspec(dllexport) unsigned char __cdecl MC6821_GetCasSample();