reenable wifi socket code

This commit is contained in:
StapleButter
2017-09-21 04:42:31 +02:00
parent 2eea801d26
commit 65b332b152
2 changed files with 15 additions and 16 deletions

View File

@ -23,7 +23,7 @@
#include "../Platform.h" #include "../Platform.h"
#include "../Config.h" #include "../Config.h"
/*#ifdef __WXMSW__ #ifdef __WIN32__
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#define socket_t SOCKET #define socket_t SOCKET
@ -37,7 +37,7 @@
#define sockaddr_t struct sockaddr #define sockaddr_t struct sockaddr
#define closesocket close #define closesocket close
#define pcap_dev_name name #define pcap_dev_name name
#endif*/ #endif
#ifndef INVALID_SOCKET #ifndef INVALID_SOCKET
#define INVALID_SOCKET (socket_t)-1 #define INVALID_SOCKET (socket_t)-1
@ -66,11 +66,11 @@ int ThreadEntry(void* data)
} }
/*socket_t MPSocket; socket_t MPSocket;
sockaddr_t MPSendAddr; sockaddr_t MPSendAddr;
u8 PacketBuffer[2048]; u8 PacketBuffer[2048];
#define NIFI_VER 1*/ #define NIFI_VER 1
void StopEmu() void StopEmu()
@ -126,10 +126,10 @@ void Semaphore_Post(void* sema)
bool MP_Init() bool MP_Init()
{ {
/*int opt_true = 1; int opt_true = 1;
int res; int res;
#ifdef __WXMSW__ #ifdef __WIN32__
WSADATA wsadata; WSADATA wsadata;
if (WSAStartup(MAKEWORD(2, 2), &wsadata) != 0) if (WSAStartup(MAKEWORD(2, 2), &wsadata) != 0)
{ {
@ -173,24 +173,24 @@ bool MP_Init()
MPSendAddr.sa_family = AF_INET; MPSendAddr.sa_family = AF_INET;
*(u32*)&MPSendAddr.sa_data[2] = htonl(INADDR_BROADCAST); *(u32*)&MPSendAddr.sa_data[2] = htonl(INADDR_BROADCAST);
*(u16*)&MPSendAddr.sa_data[0] = htons(7064);*/ *(u16*)&MPSendAddr.sa_data[0] = htons(7064);
return true; return true;
} }
void MP_DeInit() void MP_DeInit()
{ {
/*if (MPSocket >= 0) if (MPSocket >= 0)
closesocket(MPSocket); closesocket(MPSocket);
#ifdef __WXMSW__ #ifdef __WIN32__
WSACleanup(); WSACleanup();
#endif // __WXMSW__*/ #endif // __WXMSW__
} }
int MP_SendPacket(u8* data, int len) int MP_SendPacket(u8* data, int len)
{ {
/*if (MPSocket < 0) if (MPSocket < 0)
return 0; return 0;
if (len > 2048-8) if (len > 2048-8)
@ -207,13 +207,12 @@ int MP_SendPacket(u8* data, int len)
int slen = sendto(MPSocket, (const char*)PacketBuffer, len+8, 0, &MPSendAddr, sizeof(sockaddr_t)); int slen = sendto(MPSocket, (const char*)PacketBuffer, len+8, 0, &MPSendAddr, sizeof(sockaddr_t));
if (slen < 8) return 0; if (slen < 8) return 0;
return slen - 8;*/ return slen - 8;
return 0;
} }
int MP_RecvPacket(u8* data, bool block) int MP_RecvPacket(u8* data, bool block)
{ {
/*if (MPSocket < 0) if (MPSocket < 0)
return 0; return 0;
fd_set fd; fd_set fd;
@ -254,8 +253,7 @@ int MP_RecvPacket(u8* data, bool block)
} }
memcpy(data, &PacketBuffer[8], rlen); memcpy(data, &PacketBuffer[8], rlen);
return rlen;*/ return rlen;
return 0;
} }

View File

@ -423,6 +423,7 @@ int main(int argc, char** argv)
uiMenuItemDisable(MenuItem_Pause); uiMenuItemDisable(MenuItem_Pause);
uiMenuItemDisable(MenuItem_Reset); uiMenuItemDisable(MenuItem_Reset);
uiMenuItemDisable(MenuItem_Stop);
uiAreaHandler areahandler; uiAreaHandler areahandler;