Some more Work done with Microphone, added a Semi-decent way of checking for Mic Button

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

8 files changed, 119 insertions, 112 deletions

diff --git a/Source/Core/Common/Src/Common.cpp b/Source/Core/Common/Src/Common.cpp
index d94eb0d805..751105cbb5 100644
--- a/Source/Core/Common/Src/Common.cpp
+++ b/Source/Core/Common/Src/Common.cpp
@@ -100,6 +100,7 @@ bool AskYesNo(const char* format, ...)
 	va_end(args);

 	return(retval);

 }

+

 // Standard implementation of logging - simply print to standard output.

 // Programs are welcome to override this.

 /*

diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp
index 27aa692db0..2d8669235a 100644
--- a/Source/Core/Core/Src/HW/EXI_Channel.cpp
+++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp
@@ -83,8 +83,9 @@ bool CEXIChannel::IsCausingInterrupt()
 {

 	if (m_ChannelId != 2) /* Channels 0 and 1: Memcard slot (device 0) produces interrupt */

 	{

-		if (m_pDevices[0]->IsInterruptSet())

-			m_Status.EXIINT = 1;

+		for (int i = 0; i < NUM_DEVICES; i++)

+			if (m_pDevices[i]->IsInterruptSet())

+				m_Status.EXIINT = 1;

 	}

 	else /* Channel 2: In fact, Channel 0, Device 2 (Serial A) produces interrupt */

 	{

diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
index 0a3bfdccea..ac4a460bdc 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.cpp
@@ -24,26 +24,27 @@
 #include "EXI_Device.h"
 #include "EXI_DeviceMic.h"
 
-#define MC_STATUS_BUSY					0x80   
-#define MC_STATUS_UNLOCKED				0x40
-#define MC_STATUS_SLEEP					0x20
-#define MC_STATUS_ERASEERROR			0x10
-#define MC_STATUS_PROGRAMEERROR			0x08
-#define MC_STATUS_READY					0x01
+bool MicButton = false;
 
+void SetMic(bool Value)
+{
+	MicButton = Value;
+}
+bool GetMic()
+{
+	return MicButton;
+}
 
 CEXIMic::CEXIMic(int _Index)
 {
 	Index = _Index;
-	//et_this_card = CoreTiming::RegisterEvent(_rName.c_str(), FlushCallback);
  
-	interruptSwitch = 0;
-	m_bInterruptSet = 0;
 	command = 0;
-	//status = MC_STATUS_BUSY | MC_STATUS_UNLOCKED | MC_STATUS_READY;
+	Sample = 0;
 	m_uPosition = 0;
 	formatDelay = 0;
 	ID = 0x0a000000;
+	m_bInterruptSet = false;
 
 }
 
@@ -54,7 +55,6 @@ CEXIMic::~CEXIMic()
 
 bool CEXIMic::IsPresent() 
 {
-	//return false;
 	return true;
 }
 
@@ -79,9 +79,15 @@ void CEXIMic::Update()
 
 bool CEXIMic::IsInterruptSet()
 {
-	if (interruptSwitch)
-		return m_bInterruptSet;
-	return false;
+	if(m_bInterruptSet)
+	{
+		//m_bInterruptSet = false;
+		return true;
+	}
+	else
+	{
+		return false;
+	}
 }
 
 void CEXIMic::TransferByte(u8 &byte)
@@ -107,112 +113,91 @@ void CEXIMic::TransferByte(u8 &byte)
 			else
 				byte = (u8)(ID >> (24-(((m_uPosition-2) & 3) * 8)));
 		break;
+		// Setting Bits: REMEMBER THIS! D:<
+		// <ector--> var |= (1 << bitnum_from_0)
+		// <ector--> var &= ~(1 << bitnum_from_0) clears
 		case cmdStatus:
 		{
-			byte = (u8)(Status.U16 >> (24-(((m_uPosition - 2) & 3) * 8)));
-		}
-		break;
-		case cmdSetStatus:
-		{
-			Status.U8[m_uPosition - 1] = byte;
-			if(m_uPosition == 2)
-				printf("Status is 0x%04x\n", Status.U16);
-		}
-		break;
-		default:
-			printf("Don't know command %x in Byte transfer\n", command);
-		break;
-		/*
-		case cmdReadArray:
-			switch (m_uPosition)
+			if(GetMic())
 			{
-			case 1: // AD1
-				address = byte << 17;
-				byte = 0xFF;
-				break;
-			case 2: // AD2
-				address |= byte << 9;
-				break;
-			case 3: // AD3
-				address |= (byte & 3) << 7;
-				break;
-			case 4: // BA
-				address |= (byte & 0x7F);
-				break;
+				Status.U16 |= (1 << 8);
 			}
-			if (m_uPosition > 1) // not specified for 1..8, anyway
-			{
-				byte = memory_card_content[address & (memory_card_size-1)];
-				// after 9 bytes, we start incrementing the address,
-				// but only the sector offset - the pointer wraps around
-				if (m_uPosition >= 9)
-					address = (address & ~0x1FF) | ((address+1) & 0x1FF);
-			}
-			break;
-
-		case cmdReadStatus:
-			// (unspecified for byte 1)
-			byte = status;
-			break;
-
-		case cmdReadID:
-			if (m_uPosition == 1) // (unspecified)
-				byte = (u8)(card_id >> 8);
 			else
-				byte = (u8)((m_uPosition & 1) ? (card_id) : (card_id >> 8));
-			break;
-
-		case cmdSectorErase:
-			switch (m_uPosition)
 			{
-			case 1: // AD1
-				address = byte << 17;
-				break;
-			case 2: // AD2
-				address |= byte << 9;
-				break;
+				Status.U16 &= ~(1 << 8);
 			}
-			byte = 0xFF;
-			break;
-
-		case cmdSetInterrupt:
-			if (m_uPosition == 1)
+			if(Sampling)
 			{
-				interruptSwitch = byte;
+				//printf("Sample %d\n",Sample);
+				if(Sample >= SNum)
+				{
+					Sample = 0;
+					m_bInterruptSet = true;
+				}
+				else
+					Sample++;
 			}
-			byte = 0xFF;
-			break;
-
-		case cmdChipErase:
-			byte = 0xFF;
-			break;
-
-		case cmdPageProgram:
-			switch (m_uPosition)
+			byte = (u8)(Status.U16 >> (24-(((m_uPosition-2) & 3) * 8)));
+			
+		}
+		break;
+		case cmdSetStatus:
+		{
+			Status.U8[ (m_uPosition - 1) ? 0 : 1] = byte;
+			if(m_uPosition == 2)
 			{
-			case 1: // AD1
-				address = byte << 17;
-				break;
-			case 2: // AD2
-				address |= byte << 9;
-				break;
-			case 3: // AD3
-				address |= (byte & 3) << 7;
-				break;
-			case 4: // BA
-				address |= (byte & 0x7F);
-				break;
+				printf("Status is 0x%04x ", Status.U16);
+				//Status is 0x7273 1 1 0 0 1 1 1 0\ 0 1 0 0 1 1 1 0
+				//Status is 0x4b00 
+				// 0 0 0 0 0 0 0 0	: Bit 0-7:	Unknown
+				// 1	: Bit 8		: 1 : Button Pressed 
+				// 1	: Bit 9		: 1 ? Overflow? 
+				// 0	: Bit 10	: Unknown related to 0 and 15 values It seems
+				// 1 0	: Bit 11-12	: Sample Rate, 00-11025, 01-22050, 10-44100, 11-??
+				// 0 1	: Bit 13-14	: Period Length, 00-32, 01-64, 10-128, 11-??? 
+				// 0	: Bit 15	: If We Are Sampling or Not 
+				
+				if((Status.U16 >> 15) & 1) // We ARE Sampling
+				{
+					printf("We are now Sampling");
+					Sampling = true;
+				}
+				else
+				{
+					Sampling = false;
+					m_bInterruptSet = false;
+				}
+				if(!(Status.U16 >> 11) & 1)
+					if((Status.U16 >> 12) & 1 )
+						SFreq = 22050;
+					else
+						SFreq = 11025;
+				else
+					SFreq = 44100;
+					
+				if(!(Status.U16 >> 13) & 1)
+					if((Status.U16 >> 14) & 1)
+						SNum = 64;
+					else
+						SNum = 32;
+				else
+					SNum = 128;
+			
+				for(int a = 0;a < 16;a++)
+					printf("%d ", (Status.U16 >> a) & 1);
+				printf("\n");
 			}
-
-			if(m_uPosition >= 5)
-				programming_buffer[((m_uPosition - 5) & 0x7F)] = byte; // wrap around after 128 bytes
-
-			byte = 0xFF;
-			break;
-
+		}
+		break;
+		case cmdGetBuffer:
+			printf("POS %d\n", m_uPosition);
+			if(m_uPosition == SNum / 2) // It's 16bit Audio, so we divide by two
+				;//m_bInterruptSet = false;
+			byte = rand() % 0xFF;
+		break;
 		default:
-			LOG(EXPANSIONINTERFACE, "EXI MEMCARD: unknown command byte %02x\n", byte);
-			byte = 0xFF;	*/
+			printf("Don't know command %x in Byte transfer\n", command);
+		break;
 		}
 	}
 	m_uPosition++;
diff --git a/Source/Core/Core/Src/HW/EXI_DeviceMic.h b/Source/Core/Core/Src/HW/EXI_DeviceMic.h
index 81583a8a23..b183b28333 100644
--- a/Source/Core/Core/Src/HW/EXI_DeviceMic.h
+++ b/Source/Core/Core/Src/HW/EXI_DeviceMic.h
@@ -18,6 +18,7 @@
 #ifndef _EXI_DEVICEMIC_H
 #define _EXI_DEVICEMIC_H
 
+
 class CEXIMic : public IEXIDevice
 {
 public:
@@ -35,7 +36,7 @@ private:
 		cmdID					= 0x00,
 		cmdStatus				= 0x40,
 		cmdSetStatus			= 0x80,
-		cmdSetInterrupt			= 0x81,
+		cmdGetBuffer			= 0x20,
 		cmdWriteBuffer			= 0x82,
 		cmdReadStatus			= 0x83,		
 		cmdReadID				= 0x85,
@@ -62,6 +63,10 @@ private:
 	u32 m_uPosition;
 	u32 formatDelay;
 	uStatus Status;
+	bool Sampling;
+	short SFreq;
+	short SNum;
+	int Sample;
 	
 	//! memory card parameters 
 	unsigned int ID;
@@ -71,5 +76,8 @@ protected:
 	virtual void TransferByte(u8 &byte);
 };
 
+void SetMic(bool Value);
+bool GetMic();
+
 #endif
 
diff --git a/Source/Core/Core/Src/HW/SerialInterface_Devices.cpp b/Source/Core/Core/Src/HW/SerialInterface_Devices.cpp
index d7e1a36d51..82fe3b5b48 100644
--- a/Source/Core/Core/Src/HW/SerialInterface_Devices.cpp
+++ b/Source/Core/Core/Src/HW/SerialInterface_Devices.cpp
@@ -20,6 +20,9 @@
 

 #include "SerialInterface_Devices.h"

 

+#include "EXI_Device.h"

+#include "EXI_DeviceMic.h"

+

 #include "../Plugins/Plugin_PAD.h"

 

 #include "../PowerPC/PowerPC.h"

@@ -169,6 +172,7 @@ CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
 	_Low |= (u32)((u8)PadStatus.triggerLeft << 8);

 	_Low |= (u32)((u8)PadStatus.substickY << 16);

 	_Low |= (u32)((u8)PadStatus.substickX << 24);

+	SetMic(PadStatus.MicButton);

 

 	// F|RES:

 	// i dunno if i should force it here

diff --git a/Source/PluginSpecs/pluginspecs_pad.h b/Source/PluginSpecs/pluginspecs_pad.h
index 52b20d3399..c0c6b9552a 100644
--- a/Source/PluginSpecs/pluginspecs_pad.h
+++ b/Source/PluginSpecs/pluginspecs_pad.h
@@ -47,6 +47,7 @@ typedef struct
 	unsigned char	triggerRight;           // 0 <= triggerRight <= 255

 	unsigned char	analogA;                // 0 <= analogA      <= 255

 	unsigned char	analogB;                // 0 <= analogB      <= 255

+	bool			MicButton;

 	signed char		err;                    // one of PAD_ERR_* number

 } SPADStatus;

 

diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
index 665bd51761..2557057f6e 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.cpp
@@ -459,6 +459,10 @@ void X11_Read(int _numPAD, SPADStatus* _pPADStatus)
     }
     
     if (KeyStatus[CTL_START]){_pPADStatus->button |= PAD_BUTTON_START;}
+    if (KeyStatus[CTL_MIC])
+    	_pPADStatus->MicButton = true;
+    else
+    	_pPADStatus->MicButton = false;
 }
 
 
@@ -630,7 +634,8 @@ void LoadConfig()
           XK_g,
           XK_f,
           XK_h,
-		  XK_Shift_L //halfpress
+		  XK_Shift_L, //halfpress
+		  XK_p
 	};
 #endif
 	IniFile file;
diff --git a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h
index 3d5a061bcf..8282302a69 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h
+++ b/Source/Plugins/Plugin_PadSimple/Src/PadSimple.h
@@ -42,6 +42,7 @@ enum
 	CTL_DPADLEFT,
 	CTL_DPADRIGHT,
 	CTL_HALFPRESS,
+	CTL_MIC,
 	NUMCONTROLS
 };
 
@@ -69,6 +70,7 @@ static const char* controlNames[] =
 	"D-Pad_left",
 	"D-Pad_right",
 	"half_press_toggle",
+	"Mic-button",
 };
 
 struct SPads {