From cf7f74f1b1837f38c887fa5faad7777024c7a908 Mon Sep 17 00:00:00 2001
From: luigiblood <luigiblood@gmail.com>
Date: Mon, 27 Jul 2015 15:34:36 +0200
Subject: [PATCH] Use actual CIC IDs (8303 for 64DD, 5167 for 64DD conversions)

---
 Source/Project64/N64 System/Mips/Dma.cpp              | 2 +-
 Source/Project64/N64 System/N64 Class.cpp             | 4 ++--
 Source/Project64/N64 System/N64 Rom Class.cpp         | 4 ++--
 Source/Project64/N64 System/N64 Types.h               | 4 ++--
 Source/Project64/N64 System/Rom Information Class.cpp | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Source/Project64/N64 System/Mips/Dma.cpp b/Source/Project64/N64 System/Mips/Dma.cpp
index 896903129..cd09cbe47 100644
--- a/Source/Project64/N64 System/Mips/Dma.cpp	
+++ b/Source/Project64/N64 System/Mips/Dma.cpp	
@@ -22,7 +22,7 @@ void CDMA::OnFirstDMA()
 	switch (g_Rom->CicChipID())
 	{
 	case CIC_NUS_6101: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
-	case CIC_NUS_8303: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
+	case CIC_NUS_5167: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
 	case CIC_UNKNOWN:
 	case CIC_NUS_6102: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
 	case CIC_NUS_6103: *(DWORD *)&((g_MMU->Rdram())[0x318]) = g_MMU->RdramSize(); break;
diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp
index f71d65c21..b7f90d87b 100644
--- a/Source/Project64/N64 System/N64 Class.cpp	
+++ b/Source/Project64/N64 System/N64 Class.cpp	
@@ -810,8 +810,8 @@ void CN64System::InitRegisters( bool bPostPif, CMipsMemory & MMU )
 		case CIC_NUS_6101: 
 			m_Reg.m_GPR[22].DW=0x000000000000003F; 
 			break;
-		case CIC_NUS_DDIPL:		//64DD IPL
-		case CIC_NUS_8303:		//64DD CIC
+		case CIC_NUS_8303:		//64DD IPL CIC
+		case CIC_NUS_5167:		//64DD CONVERSION CIC
 			m_Reg.m_GPR[22].DW=0x00000000000000DD;
 			break;
 		case CIC_UNKNOWN:
diff --git a/Source/Project64/N64 System/N64 Rom Class.cpp b/Source/Project64/N64 System/N64 Rom Class.cpp
index c63ba1d09..30b6390fe 100644
--- a/Source/Project64/N64 System/N64 Rom Class.cpp	
+++ b/Source/Project64/N64 System/N64 Rom Class.cpp	
@@ -246,8 +246,8 @@ void CN64Rom::CalculateCicChip()
 	case 0x000000D6497E414B: m_CicChip = CIC_NUS_6103; break;
 	case 0x0000011A49F60E96: m_CicChip = CIC_NUS_6105; break;
 	case 0x000000D6D5BE5580: m_CicChip = CIC_NUS_6106; break;
-	case 0x000001053BC19870: m_CicChip = CIC_NUS_8303; break;	//64DD CONVERSION CIC
-	case 0x000000D2E53EF008: m_CicChip = CIC_NUS_DDIPL; break;	//64DD IPL
+	case 0x000001053BC19870: m_CicChip = CIC_NUS_5167; break;	//64DD CONVERSION CIC
+	case 0x000000D2E53EF008: m_CicChip = CIC_NUS_8303; break;	//64DD IPL
 	default:
 		if (bHaveDebugger())
 			g_Notify->DisplayError(L"Unknown CIC checksum:\n%I64X.", CRC);
diff --git a/Source/Project64/N64 System/N64 Types.h b/Source/Project64/N64 System/N64 Types.h
index 4412b9ebd..9855fc7f9 100644
--- a/Source/Project64/N64 System/N64 Types.h	
+++ b/Source/Project64/N64 System/N64 Types.h	
@@ -51,8 +51,8 @@ enum SYSTEM_TYPE {
 
 enum CICChip { 
 	CIC_UNKNOWN  = -1, CIC_NUS_6101 = 1, CIC_NUS_6102 = 2, CIC_NUS_6103 = 3, 
-	CIC_NUS_6104 = 4,  CIC_NUS_6105 = 5, CIC_NUS_6106 = 6, CIC_NUS_8303 = 7,
-	CIC_NUS_DDIPL = 8
+	CIC_NUS_6104 = 4,  CIC_NUS_6105 = 5, CIC_NUS_6106 = 6, CIC_NUS_5167 = 7,
+	CIC_NUS_8303 = 8
 };
 
 enum Country { 
diff --git a/Source/Project64/N64 System/Rom Information Class.cpp b/Source/Project64/N64 System/Rom Information Class.cpp
index 235617b20..6eca5542a 100644
--- a/Source/Project64/N64 System/Rom Information Class.cpp	
+++ b/Source/Project64/N64 System/Rom Information Class.cpp	
@@ -126,12 +126,12 @@ DWORD CALLBACK RomInfoProc (HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) {
 			if (_this->m_pRomInfo->CicChipID() == CIC_UNKNOWN) { 
 				sprintf(&String[1],"Unknown");
 			}
-			else if (_this->m_pRomInfo->CicChipID() == CIC_NUS_DDIPL) {
-				sprintf(&String[1], "64DD IPL");
-			}
 			else if (_this->m_pRomInfo->CicChipID() == CIC_NUS_8303) {
 				sprintf(&String[1], "CIC-NUS-8303");
 			}
+			else if (_this->m_pRomInfo->CicChipID() == CIC_NUS_5167) {
+				sprintf(&String[1], "CIC-NUS-5167");
+			}
 			else {
 				sprintf(&String[1],"CIC-NUS-610%d",_this->m_pRomInfo->CicChipID());
 			}