Rename went a bit too far. Fixing.

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

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/GMC/Cartridge.h b/GMC/Cartridge.h
@@ -59,7 +59,7 @@ class Cartridge
   friend void ModuleConfig(unsigned char menuId);
   friend void SetIniPath(const char* iniFilePath);
   friend void ModuleReset(void);
-  friend void MC6821_SetCart(SETCART pointer);
+  friend void SetCart(SETCART pointer);
   friend unsigned char PakMemRead8(unsigned short address);
   friend void PackPortWrite(unsigned char port, unsigned char data);
   friend unsigned char PackPortRead(unsigned char port);

diff --git a/GMC/CartridgeTrampolines.cpp b/GMC/CartridgeTrampolines.cpp
@@ -24,7 +24,7 @@ GMC_EXPORT void ModuleReset()
   Cartridge::m_Singleton->OnReset();
 }
 
-GMC_EXPORT void MC6821_SetCart(SETCART callback)
+GMC_EXPORT void SetCart(SETCART callback)
 {
   Cartridge::m_Singleton->SetCartLineAssertCallback(callback);
 }

diff --git a/GMC/CartridgeTrampolines.h b/GMC/CartridgeTrampolines.h
@@ -6,7 +6,7 @@ GMC_EXPORT void ModuleStatus(char* statusBuffer);
 GMC_EXPORT void ModuleConfig(unsigned char /*menuId*/);
 GMC_EXPORT void SetIniPath(const char* iniFilePath);
 GMC_EXPORT void ModuleReset();
-GMC_EXPORT void MC6821_SetCart(SETCART pointer);
+GMC_EXPORT void SetCart(SETCART pointer);
 GMC_EXPORT unsigned char PakMemRead8(unsigned short address);
 GMC_EXPORT void PackPortWrite(unsigned char port, unsigned char data);
 GMC_EXPORT unsigned char PackPortRead(unsigned char port);

diff --git a/library/MC6821.c b/library/MC6821.c
@@ -253,7 +253,7 @@ extern "C" {
 }
 
 extern "C" {
-  __declspec(dllexport) void __cdecl MC6821_SetCart(unsigned char cart)
+  __declspec(dllexport) void __cdecl SetCart(unsigned char cart)
   {
     instance->CartInserted = cart;
   }

diff --git a/library/MC6821.h b/library/MC6821.h
@@ -29,6 +29,8 @@ typedef struct {
 
 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) unsigned char __cdecl MC6821_DACState();
@@ -45,7 +47,6 @@ extern "C" __declspec(dllexport) void __cdecl MC6821_AssertCart();
 extern "C" __declspec(dllexport) void __cdecl MC6821_CaptureBit(unsigned char);
 extern "C" __declspec(dllexport) void __cdecl MC6821_ClosePrintFile();
 extern "C" __declspec(dllexport) void __cdecl MC6821_PiaReset();
-extern "C" __declspec(dllexport) void __cdecl MC6821_SetCart(unsigned char);
 extern "C" __declspec(dllexport) void __cdecl MC6821_SetCassetteSample(unsigned char);
 extern "C" __declspec(dllexport) void __cdecl MC6821_SetMonState(BOOL);
 extern "C" __declspec(dllexport) void __cdecl MC6821_SetSerialParams(unsigned char);

diff --git a/library/PAKInterface.c b/library/PAKInterface.c
@@ -420,7 +420,7 @@ extern "C" {
 
     instance->RomPackLoaded = false;
 
-    MC6821_SetCart(0);
+    SetCart(0);
 
     if (instance->ExternalRomBuffer != nullptr) {
       free(instance->ExternalRomBuffer);
@@ -483,7 +483,7 @@ extern "C" {
 
       systemState->ResetPending = 2;
 
-      MC6821_SetCart(1);
+      SetCart(1);
 
       return(NOMODULE);
 
@@ -496,7 +496,7 @@ extern "C" {
         return(NOMODULE);
       }
 
-      MC6821_SetCart(0);
+      SetCart(0);
 
       instance->GetModuleName = (GETNAME)GetProcAddress(instance->hInstLib, "ModuleName");
       instance->ConfigModule = (CONFIGIT)GetProcAddress(instance->hInstLib, "ModuleConfig");
@@ -632,7 +632,7 @@ extern "C" {
 
         strcat(text, "Can Assert CART\n");
 
-        instance->PakSetCart(MC6821_SetCart);
+        instance->PakSetCart(SetCart);
       }
 
       strcpy(instance->DllPath, modulePath);

diff --git a/mpi/mpi.cpp b/mpi/mpi.cpp
@@ -403,7 +403,7 @@ void CPUAssertInterrupt(unsigned char interrupt, unsigned char latencey)
 
 extern "C"
 {
-  __declspec(dllexport) void MC6821_SetCart(SETCART pointer)
+  __declspec(dllexport) void SetCart(SETCART pointer)
   {
     PakSetCart = pointer;
   }

diff --git a/orch90/orch90.cpp b/orch90/orch90.cpp
@@ -107,9 +107,8 @@ extern "C"
 
 extern "C"
 {
-  __declspec(dllexport) unsigned char MC6821_SetCart(SETCART pointer)
+  __declspec(dllexport) unsigned char SetCart(SETCART pointer)
   {
-
     PakSetCart = pointer;
     return(NULL);
   }