Commit for Windows in BBA. A bunch of asserts fail, but I don't have time to tweak at the moment. Will fix them in a bit. Progress is progress though

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

1 files changed, 97 insertions, 2 deletions

diff --git a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp b/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp
index 941f8eb739..2fbd629301 100644
--- a/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp
+++ b/Source/Core/Core/Src/HW/BBA-TAP/TAP_Win32.cpp
@@ -19,6 +19,7 @@
 #include "../EXI_Device.h"
 #include "../EXI_DeviceEthernet.h"
 #include "Tap_Win32.h"
+#include <assert.h>
 
 
 bool CEXIETHERNET::deactivate()
@@ -157,8 +158,48 @@ bool CEXIETHERNET::sendPacket(u8 *etherpckt, int size)
 }
 bool CEXIETHERNET::handleRecvdPacket() 
 {
-	DEBUGPRINT(" Handle received Packet!\n");
-	exit(0);
+	int rbwpp = mCbw.p_write() + CB_OFFSET;	//read buffer write page pointer
+	u32 available_bytes_in_cb;
+	if(rbwpp < mRBRPP)
+		available_bytes_in_cb = mRBRPP - rbwpp;
+	else if(rbwpp == mRBRPP)
+		available_bytes_in_cb = mRBEmpty ? CB_SIZE : 0;
+	else //rbwpp > mRBRPP
+		available_bytes_in_cb = CB_SIZE - rbwpp + (mRBRPP - CB_OFFSET);
+
+	//DUMPWORD(rbwpp);
+	//DUMPWORD(mRBRPP);
+	//DUMPWORD(available_bytes_in_cb);
+
+	assert(available_bytes_in_cb <= CB_SIZE);
+	if(available_bytes_in_cb != CB_SIZE)//< mRecvBufferLength + SIZEOF_RECV_DESCRIPTOR)
+		return true;
+	cbwriteDescriptor(mRecvBufferLength);
+	mCbw.write(mRecvBuffer, mRecvBufferLength);
+	mCbw.align();
+	rbwpp = mCbw.p_write() + CB_OFFSET;
+	//DUMPWORD(rbwpp);
+
+	//mPacketsRcvd++;
+	mRecvBufferLength = 0;
+
+	if(mBbaMem[0x08] & BBA_INTERRUPT_RECV) 
+	{
+		if(!(mBbaMem[0x09] & BBA_INTERRUPT_RECV)) 
+		{
+			mBbaMem[0x09] |= BBA_INTERRUPT_RECV;
+			DEBUGPRINT("BBA Recv interrupt raised\n");
+			//interrupt.raiseEXI("BBA Recv");
+			m_bInterruptSet = true;
+		}
+	}
+
+	if(mBbaMem[BBA_NCRA] & BBA_NCRA_SR) 
+	{
+		startRecv();
+	}
+
+	return true;
 }
 bool CEXIETHERNET::resume() {
 	if(!isActivated())
@@ -213,4 +254,58 @@ VOID CALLBACK CEXIETHERNET::ReadWaitCallback(PVOID lpParameter, BOOLEAN TimerFir
 	self->mWaiting = false;
 	self->handleRecvdPacket();
 	DEBUGPRINT("WaitCallback %i done\n", cNumber);
+}
+union bba_descr {
+	struct { u32 next_packet_ptr:12, packet_len:12, status:8; };
+	u32 word;
+};
+bool CEXIETHERNET::cbwriteDescriptor(u32 size) {
+	//if(size < 0x3C) {//60
+#define ETHERNET_HEADER_SIZE 0xE
+	if(size < ETHERNET_HEADER_SIZE) 
+	{
+		DEBUGPRINT("Packet too small: %i bytes\n", size);
+		return false;
+	}
+
+	size += SIZEOF_RECV_DESCRIPTOR;  //The descriptor supposed to include the size of itself
+
+	//We should probably not implement wraparound here,
+	//since neither tmbinc, riptool.dol, or libogc does...
+	if(mCbw.p_write() + SIZEOF_RECV_DESCRIPTOR >= CB_SIZE) 
+	{
+		DEBUGPRINT("The descriptor won't fit\n");
+		return false;
+	}
+	if(size >= CB_SIZE) 
+	{
+		DEBUGPRINT("Packet too big: %i bytes\n", size);
+		return false;
+	}
+
+	bba_descr descr;
+	descr.word = 0;
+	descr.packet_len = size;
+	descr.status = 0;
+	u32 npp;
+	if(mCbw.p_write() + size < CB_SIZE) 
+	{
+		npp = mCbw.p_write() + size + CB_OFFSET;
+	} 
+	else 
+	{
+		npp = mCbw.p_write() + size + CB_OFFSET - CB_SIZE;
+	}
+	npp = (npp + 0xff) & ~0xff;
+	if(npp >= CB_SIZE + CB_OFFSET)
+		npp -= CB_SIZE;
+	descr.next_packet_ptr = npp >> 8;
+	//DWORD swapped = swapw(descr.word);
+	//next_packet_ptr:12, packet_len:12, status:8;
+	DEBUGPRINT("Writing descriptor 0x%08X @ 0x%04X: next 0x%03X len 0x%03X status 0x%02X\n",
+		descr.word, mCbw.p_write() + CB_OFFSET, descr.next_packet_ptr,
+		descr.packet_len, descr.status);
+	mCbw.write(&descr.word, SIZEOF_RECV_DESCRIPTOR);
+
+	return true;
 }
\ No newline at end of file