give serial port 1 it's own log

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3154 8ced0084-cf51-0410-be5f-012b33b47a6e

3 files changed, 121 insertions, 109 deletions

diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h
index e607c464c5..dd7ce841c3 100644
--- a/Source/Core/Common/Src/Log.h
+++ b/Source/Core/Common/Src/Log.h
@@ -52,6 +52,7 @@ enum LOG_TYPE {
 	PERIPHERALINTERFACE,
 	PIXELENGINE,
 	SERIALINTERFACE,
+	SP1,
 	STREAMINGINTERFACE,
 	VIDEO,
 	VIDEOINTERFACE,
diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp
index 71bafb9529..d57f51600c 100644
--- a/Source/Core/Common/Src/LogManager.cpp
+++ b/Source/Core/Common/Src/LogManager.cpp
@@ -34,6 +34,7 @@ LogManager::LogManager()\
 	m_Log[LogTypes::SERIALINTERFACE]	= new LogContainer("SI",			"SerialInt");
 	m_Log[LogTypes::PERIPHERALINTERFACE]= new LogContainer("PI",			"PeripheralInt");
 	m_Log[LogTypes::MEMMAP]				= new LogContainer("MI",			"MI & memmap");
+	m_Log[LogTypes::SP1]				= new LogContainer("SP1",			"Serial Port 1");
 	m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream",		"StreamingInt");
 	m_Log[LogTypes::DSPINTERFACE]		= new LogContainer("DSP",			"DSPInterface");
 	m_Log[LogTypes::DVDINTERFACE]		= new LogContainer("DVD",			"DVDInterface");
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
index 93552bd555..5f552e210c 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
@@ -21,17 +21,45 @@
 
 #include "EXI_Device.h"
 #include "EXI_DeviceEthernet.h"
+
+
+inline u8 makemaskb(int start, int end) {
+	return (u8)_rotl((2 << (end - start)) - 1, 7 - end);
+}
+inline u32 makemaskh(int start, int end) {
+	return (u32)_rotl((2 << (end - start)) - 1, 15 - end);
+}
+inline u32 makemaskw(int start, int end) {
+	return _rotl((2 << (end - start)) - 1, 31 - end);
+}
+inline u8 getbitsb(u8 byte, int start, int end) {
+	return (byte & makemaskb(start, end)) >> u8(7 - end);
+}
+inline u32 getbitsh(u32 hword, int start, int end) {
+	return (hword & makemaskh(start, end)) >> u32(15 - end);
+}
+inline u32 getbitsw(u32 dword, int start, int end) {
+	return (dword & makemaskw(start, end)) >> (31 - end);
+}
+
 enum {
 	EXPECT_NONE = 0,
 	EXPECT_ID,
-} ;
+};
+
+#define MAKE(type, arg) (*(type *)&(arg))
+
+#define RISE(flags) ((SwappedData & (flags)) && !(mBbaMem[0x00] & (flags)))
+
 #define BBA_INTERRUPT_RECV 0x02
 #define BBA_INTERRUPT_SENT 0x04
 #define BBA_INTERRUPT_RECV_ERROR 0x08
 #define BBA_INTERRUPT_SEND_ERROR 0x10
+
 int mPacketsSent = 0;
 u8 mac_address[6] = {0x4D, 0xFF, 0x11, 0x88, 0xF1, 0x76};
 unsigned int Expecting;
+
 CEXIETHERNET::CEXIETHERNET() :
 	m_uPosition(0),
 	m_uCommand(0),
@@ -53,7 +81,7 @@ void CEXIETHERNET::SetCS(int cs)
 {
 	if (cs)
 	{
-		if(mExpectVariableLengthImmWrite)
+		if (mExpectVariableLengthImmWrite)
 		{
 			mExpectVariableLengthImmWrite = false;
 			mReadyToSend = true;
@@ -83,25 +111,6 @@ bool CEXIETHERNET::isActivated()
 	// Todo: Return actual check
 	return Activated;
 }
-inline u8 makemaskb(int start, int end) {
-	return (u8)_rotl((2 << (end - start)) - 1, 7 - end);
-}
-inline u32 makemaskh(int start, int end) {
-	return (u32)_rotl((2 << (end - start)) - 1, 15 - end);
-}
-inline u32 makemaskw(int start, int end) {
-	return _rotl((2 << (end - start)) - 1, 31 - end);
-}
-inline u8 getbitsb(u8 byte, int start, int end) {
-	return (byte & makemaskb(start, end)) >> u8(7 - end);
-}
-inline u32 getbitsh(u32 hword, int start, int end) {
-	return (hword & makemaskh(start, end)) >> u32(15 - end);
-}
-inline u32 getbitsw(u32 dword, int start, int end) {
-	return (dword & makemaskw(start, end)) >> (31 - end);
-}
-#define MAKE(type, arg) (*(type *)&(arg))
 
 void CEXIETHERNET::recordSendComplete() 
 {
@@ -109,7 +118,7 @@ void CEXIETHERNET::recordSendComplete()
 	if(mBbaMem[0x08] & BBA_INTERRUPT_SENT) 
 	{
 		mBbaMem[0x09] |= BBA_INTERRUPT_SENT;
-		printf("BBA Send interrupt raised\n");
+		INFO_LOG(SP1, "BBA Send interrupt raised\n");
 		exit(0);
 		//interrupt.raiseEXI("BBA Send");
 	}
@@ -118,12 +127,12 @@ void CEXIETHERNET::recordSendComplete()
 
 bool CEXIETHERNET::sendPacket(u8 *etherpckt, size_t size) 
 {
-		printf("Packet: 0x");
-		for(int a = 0; a < size; ++a)
-		{
-			printf("%02X", etherpckt[a]);
-		}
-		printf(" : Size: %d\n", size);
+	INFO_LOG(SP1, "Packet: 0x");
+	for(int a = 0; a < size; ++a)
+	{
+		INFO_LOG(SP1, "%02X", etherpckt[a]);
+	}
+	INFO_LOG(SP1, " : Size: %d\n", size);
 	/*DWORD numBytesWrit;
 	OVERLAPPED overlap;
 	ZERO_OBJECT(overlap);
@@ -141,25 +150,25 @@ bool CEXIETHERNET::sendPacket(u8 *etherpckt, size_t size)
 
 void CEXIETHERNET::ImmWrite(u32 _uData,  u32 _uSize)
 {
-	printf("IMM Write, size 0x%x, data 0x%x mWriteP 0x%x\n", _uSize, _uData, mWriteP);
-	if(mExpectVariableLengthImmWrite) 
+	INFO_LOG(SP1, "IMM Write, size 0x%x, data 0x%x mWriteP 0x%x\n", _uSize, _uData, mWriteP);
+	if (mExpectVariableLengthImmWrite) 
 	{
-		printf("Not doing expecting variable length imm write!\n");
+		INFO_LOG(SP1, "Not doing expecting variable length imm write!\n");
 		exit(0);
 	}
-	else if(mWriteP != INVALID_P) 
+	else if (mWriteP != INVALID_P) 
 	{
-		if(mWriteP + _uSize > BBAMEM_SIZE) 
+		if (mWriteP + _uSize > BBAMEM_SIZE) 
 		{
-			printf("Write error: mWriteP + size = 0x%04X + %i\n", mWriteP, _uSize);
+			INFO_LOG(SP1, "Write error: mWriteP + size = 0x%04X + %i\n", mWriteP, _uSize);
 			exit(0);
 		}
 		//BBADEGUB("Write to BBA address 0x%0*X, %i byte%s: 0x%0*X\n",mWriteP >= CB_OFFSET ? 4 : 2, mWriteP, size, (size==1?"":"s"), size*2, data);
 
-		switch(mWriteP) 
+		switch (mWriteP) 
 		{
 			case 0x09:
-				printf("mWriteP is %x\n", mWriteP);
+				INFO_LOG(SP1, "mWriteP is %x\n", mWriteP);
 				//BBADEGUB("BBA Interrupt reset 0x%02X & ~(0x%02X) => 0x%02X\n", mBbaMem[0x09], MAKE(BYTE, data), mBbaMem[0x09] & ~MAKE(BYTE, data));
 				//assert(_uSize == 1);
 				// TODO: Should we swap our data?
@@ -170,26 +179,25 @@ void CEXIETHERNET::ImmWrite(u32 _uData,  u32 _uSize)
 			{
 				u32 SwappedData = Common::swap32(_uData);
 				// TODO: Should we swap our data?
-				#define RISE(flags) ((SwappedData & (flags)) && !(mBbaMem[0x00] & (flags)))
-				if(RISE(BBA_NCRA_RESET)) 
+				if (RISE(BBA_NCRA_RESET)) 
 				{
 					// Normal
 					// Whinecube did nothing else as well
-					printf("BBA Reset\n");
+					INFO_LOG(SP1, "BBA Reset\n");
 				}
-				if(RISE(BBA_NCRA_SR) && isActivated())
+				if (RISE(BBA_NCRA_SR) && isActivated())
 				{
-					printf("BBA Start Recieve\n");
+					INFO_LOG(SP1, "BBA Start Recieve\n");
 					exit(0);
 					// TODO: Need to make our virtual network device start receiving
 					//HWGLE(startRecv());
 				}
-				if(RISE(BBA_NCRA_ST1)) 
+				if (RISE(BBA_NCRA_ST1)) 
 				{
-					printf("BBA Start Transmit\n");
-					if(!mReadyToSend)
+					INFO_LOG(SP1, "BBA Start Transmit\n");
+					if (!mReadyToSend)
 					{
-						printf("Not ready to send!\n");
+						INFO_LOG(SP1, "Not ready to send!\n");
 						exit(0);
 						//throw hardware_fatal_exception("BBA Transmit without a packet!");
 					}
@@ -202,7 +210,7 @@ void CEXIETHERNET::ImmWrite(u32 _uData,  u32 _uSize)
 			}
 				break;
 			case BBA_NWAYC:
-				printf("mWriteP is %x\n", mWriteP);
+				INFO_LOG(SP1, "mWriteP is %x\n", mWriteP);
 				exit(0);
 				/*if(data & (BBA_NWAYC_ANE | BBA_NWAYC_ANS_RA)) 
 				{
@@ -214,7 +222,7 @@ void CEXIETHERNET::ImmWrite(u32 _uData,  u32 _uSize)
 				}*/
 				break;
 			case 0x18:	//RRP - Receive Buffer Read Page Pointer
-				printf("mWriteP is %x\n", mWriteP);
+				INFO_LOG(SP1, "mWriteP is %x\n", mWriteP);
 				exit(0);
 				/*MYASSERT(size == 2 || size == 1);
 				mRBRPP = (BYTE)data << 8;	//I hope this works with both write sizes.
@@ -222,19 +230,20 @@ void CEXIETHERNET::ImmWrite(u32 _uData,  u32 _uSize)
 				HWGLE(checkRecvBuffer());*/
 				break;
 			case 0x16:	//RWP
-				printf("mWriteP is %x\n", mWriteP);
+				INFO_LOG(SP1, "mWriteP is %x\n", mWriteP);
 				exit(0);
 				/*MYASSERT(size == 2 || size == 1);
 				MYASSERT(data == DWORD((WORD)mCbw.p_write() + CB_OFFSET) >> 8);*/
 				break;
 			default:
-				printf("Default one!Size 0x%x _uData: 0x%08x Swapped 0x%08x to 0x%x\n", _uSize, _uData, Common::swap32(_uData),mWriteP);
+				INFO_LOG(SP1, "Default one!Size 0x%x _uData: 0x%08x Swapped 0x%08x to 0x%x\n", _uSize, _uData, Common::swap32(_uData),mWriteP);
 				u32 SwappedData = Common::swap32(_uData);
 				memcpy(mBbaMem + mWriteP, &SwappedData, _uSize);
 				mWriteP = mWriteP + _uSize;
 		}
 		return;
-	}else if(_uSize == 2 && _uData == 0) 
+	}
+	else if (_uSize == 2 && _uData == 0) 
 	{
 		// Device ID Request
 		// 100% this returns correctly
@@ -242,43 +251,43 @@ void CEXIETHERNET::ImmWrite(u32 _uData,  u32 _uSize)
 		mExpectSpecialImmRead = true;
 		return;
 	}
-	else if((_uSize == 4 && (_uData & 0xC0000000) == 0xC0000000) || (_uSize == 2 && (_uData & 0x4000) == 0x4000))
-	{ // Write to BBA Register
-		printf("Write to BBA register!\n");
+	else if ((_uSize == 4 && (_uData & 0xC0000000) == 0xC0000000) || (_uSize == 2 && (_uData & 0x4000) == 0x4000))
+	{
+		// Write to BBA Register
+		INFO_LOG(SP1, "Write to BBA register!\n");
 		u32 SwappedData = Common::swap32(_uData);
 		//u32 SwappedData = _uData;
-		if(_uSize == 4)
+		if (_uSize == 4)
 			mWriteP = (u8)getbitsw(SwappedData, 16, 23);
 		else  //size == 2
 			mWriteP = (u8)getbitsw(SwappedData & ~0x4000, 16, 23);  //Whinecube : Dunno about this...
 		// With Size of 4 and data of 0xc0006000 unswapped
 		// mWriteP will be 0x0060 unswapped and 0x0000 swapped. Which is correct?
-		if(mWriteP == 0x48) 
+		if (mWriteP == 0x48) 
 		{
 			mWriteBuffer.clear();
 			mExpectVariableLengthImmWrite = true;
-			printf("Prepared for variable length write to address 0x48\n");
+			INFO_LOG(SP1, "Prepared for variable length write to address 0x48\n");
 		} 
 		else 
 		{
-			
-			printf("BBA Write pointer set to 0x%0*X\n", _uSize, mWriteP);
+			INFO_LOG(SP1, "BBA Write pointer set to 0x%0*X\n", _uSize, mWriteP);
 			//exit(0);
 		}
 		return;
 	}
-	else if((_uSize == 4 && (_uData & 0xC0000000) == 0x80000000) || (_uSize == 2 && (_uData & 0x4000) == 0x0000))
+	else if ((_uSize == 4 && (_uData & 0xC0000000) == 0x80000000) || (_uSize == 2 && (_uData & 0x4000) == 0x0000))
 	{	
-		printf("Read from BBA register!\n");
+		INFO_LOG(SP1, "Read from BBA register!\n");
 		//u32 SwappedData = Common::swap32(_uData);
 		u32 SwappedData = _uData;
 		// Read from BBA Register!
 		if(_uSize == 4) 
 		{
 			mReadP = (u32)getbitsw(SwappedData, 8, 23);
-			if(mReadP >= BBAMEM_SIZE)
+			if (mReadP >= BBAMEM_SIZE)
 			{
-				printf("Illegal BBA address: 0x%04X\n", mReadP);
+				INFO_LOG(SP1, "Illegal BBA address: 0x%04X\n", mReadP);
 				//if(g::bouehr)
 				exit(0);
 				//return EXI_UNHANDLED;
@@ -288,64 +297,65 @@ void CEXIETHERNET::ImmWrite(u32 _uData,  u32 _uSize)
 		{  //size == 2
 			mReadP = (u8)getbitsw(SwappedData, 16, 23);
 		}
-		switch(mReadP) 
+		switch (mReadP) 
 		{
-			case 0x20:	//MAC address
-				printf("Mac Address!\n");
-				memcpy(mBbaMem + mReadP, mac_address, 6);
-				break;
-			case 0x01:	//Revision ID
-				break;
-			case 0x16:	//RWP - Receive Buffer Write Page Pointer
-				printf("RWP!\n");
-				exit(0);
-				//MAKE(WORD, mBbaMem[mReadP]) = ((WORD)mCbw.p_write() + CB_OFFSET) >> 8;
-				break;
-			case 0x18:	//RRP - Receive Buffer Read Page Pointer
-				printf("RRP!\n");
-				exit(0);
-				//MAKE(WORD, mBbaMem[mReadP]) = (mRBRPP) >> 8;
-				break;
-			case 0x3A:	//bit 1 set if no data available
-				printf("Bit 1 set!\n");
-				exit(0);
-				//mBbaMem[mReadP] = !mRBEmpty;
-				break;
-			case 0x00:
-				// These Two lines were commented out in Whinecube
-				//mBbaMem[mReadP] = 0x00;
-				//if(!sendInProgress())
-				mBbaMem[mReadP] &= ~(0x06);
-				printf("mBbaMem[0x%x] &= ~(0x06);! Now %x\n", mReadP, mBbaMem[mReadP]);
-				//exit(0);
-				break;
-			case 0x03:
-				mBbaMem[mReadP] = 0x80;
-				printf("mBbaMem[0x%x] = 0x80;! Now %x\n", mReadP, mBbaMem[mReadP]);
-				exit(0);
-				break;
+		case 0x20:	//MAC address
+			INFO_LOG(SP1, "Mac Address!\n");
+			memcpy(mBbaMem + mReadP, mac_address, 6);
+			break;
+		case 0x01:	//Revision ID
+			break;
+		case 0x16:	//RWP - Receive Buffer Write Page Pointer
+			INFO_LOG(SP1, "RWP!\n");
+			exit(0);
+			//MAKE(WORD, mBbaMem[mReadP]) = ((WORD)mCbw.p_write() + CB_OFFSET) >> 8;
+			break;
+		case 0x18:	//RRP - Receive Buffer Read Page Pointer
+			INFO_LOG(SP1, "RRP!\n");
+			exit(0);
+			//MAKE(WORD, mBbaMem[mReadP]) = (mRBRPP) >> 8;
+			break;
+		case 0x3A:	//bit 1 set if no data available
+			INFO_LOG(SP1, "Bit 1 set!\n");
+			exit(0);
+			//mBbaMem[mReadP] = !mRBEmpty;
+			break;
+		case 0x00:
+			// These Two lines were commented out in Whinecube
+			//mBbaMem[mReadP] = 0x00;
+			//if(!sendInProgress())
+			mBbaMem[mReadP] &= ~(0x06);
+			INFO_LOG(SP1, "mBbaMem[0x%x] &= ~(0x06);! Now %x\n", mReadP, mBbaMem[mReadP]);
+			//exit(0);
+			break;
+		case 0x03:
+			mBbaMem[mReadP] = 0x80;
+			INFO_LOG(SP1, "mBbaMem[0x%x] = 0x80;! Now %x\n", mReadP, mBbaMem[mReadP]);
+			exit(0);
+			break;
 		}
 		//BBADEGUB("BBA Read pointer set to 0x%0*X\n", size, mReadP);
 		return;
 	}
-	printf("Not expecting ImmWrite of size %d\n", _uSize);
+	INFO_LOG(SP1, "Not expecting ImmWrite of size %d\n", _uSize);
 	exit(0);
 }
+
 u32 CEXIETHERNET::ImmRead(u32 _uSize)
 {
-	printf("IMM Read, size 0x%x\n", _uSize);
-	if(mExpectSpecialImmRead) 
+	INFO_LOG(SP1, "IMM Read, size 0x%x\n", _uSize);
+	if (mExpectSpecialImmRead) 
 	{
 		// 100% that this returns correctly
-		printf("special IMMRead\n");
+		INFO_LOG(SP1, "special IMMRead\n");
 		mExpectSpecialImmRead = false;
 		return mSpecialImmData;
 	}
-	if(mReadP != INVALID_P) 
+	if (mReadP != INVALID_P) 
 	{
-		if(mReadP + _uSize > BBAMEM_SIZE) 
+		if (mReadP + _uSize > BBAMEM_SIZE) 
 		{
-			printf("Read error: mReadP + size = 0x%04X + %i\n", mReadP, _uSize);
+			INFO_LOG(SP1, "Read error: mReadP + size = 0x%04X + %i\n", mReadP, _uSize);
 			exit(0);
 		}
 		u32 uResult = 0;
@@ -353,26 +363,26 @@ u32 CEXIETHERNET::ImmRead(u32 _uSize)
 		// TODO: We do as well?
 		
 		//uResult = Common::swap32(uResult); //Whinecube : we have a byteswap problem...
-		printf("Read from BBA address 0x%0*X, %i byte%s: 0x%0*X\n",mReadP >= CB_OFFSET ? 4 : 2, mReadP, _uSize, (_uSize==1?"":"s"),_uSize*2, getbitsw(uResult, 0, _uSize * 8 - 1));
+		INFO_LOG(SP1, "Read from BBA address 0x%0*X, %i byte%s: 0x%0*X\n",mReadP >= CB_OFFSET ? 4 : 2, mReadP, _uSize, (_uSize==1?"":"s"),_uSize*2, getbitsw(uResult, 0, _uSize * 8 - 1));
 		mReadP = mReadP + _uSize;
 		return uResult;
 	}
 	else
 	{
-		printf("Unhandled IMM read of %d bytes\n", _uSize);
+		INFO_LOG(SP1, "Unhandled IMM read of %d bytes\n", _uSize);
 	}
-	printf("Not Expecting IMMRead of size %d!\n", _uSize);
+	INFO_LOG(SP1, "Not Expecting IMMRead of size %d!\n", _uSize);
 	exit(0);
 }
 
 void CEXIETHERNET::DMAWrite(u32 _uAddr, u32 _uSize)
 {
-	printf("DMAW\n");
+	INFO_LOG(SP1, "DMAW\n");
 	exit(0);
 }
 
 void CEXIETHERNET::DMARead(u32 _uAddr, u32 _uSize) 
 {
-	printf("DMAR\n");
+	INFO_LOG(SP1, "DMAR\n");
 	exit(0);
 };