izzy/dolphin
0
0
Fork 0
mirror of https://github.com/izzy2lost/dolphin.git synced 2026-06-19 01:16:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Some poll changes and changed INFO to WARN, also commented out POLL debug as it was way too much. Made all net funcs non-blocking, due to stupid Skylanders :D

Browse Source
This commit is contained in:
Matthew Parlane
2012-02-04 16:50:52 +13:00
parent f9979701e1
commit 0cf3222e68
3 changed files with 117 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
+110 -83
View File
File diff suppressed because it is too large Load Diff
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
+2 -2
View File
@@ -134,7 +134,7 @@ private:
IOCTL_NWC24_EXEC_TRY_SUSPEND_SCHEDULAR = 0x02,
IOCTL_NWC24_EXEC_RESUME_SCHEDULAR = 0x03,
IOCTL_NWC24_KD_GET_TIME_TRIGGERS = 0x04,
IOCTL_NWC24_UNK_5 = 0x05,
IOCTL_NWC24_SET_SCHEDULE_SPAN = 0x05,
IOCTL_NWC24_STARTUP_SOCKET = 0x06,
IOCTL_NWC24_CLEANUP_SOCKET = 0x07,
IOCTL_NWC24_LOCK_SOCKET = 0x08,
@@ -333,7 +333,7 @@ private:
IOCTLV_NCD_GETLINKSTATUS = 0x7, // NCDGetLinkStatus
IOCTLV_NCD_GETWIRELESSMACADDRESS = 0x8, // NCDGetWirelessMacAddress
};
bool isSet;
network_config_t m_Ifconfig;
};
Source/Core/Core/Src/IPC_HLE/fakepoll.h
+5 -5
View File
@@ -31,15 +31,15 @@
typedef struct pollfd {
int fd; /* file desc to poll */
short events; /* events of interest on fd */
short revents; /* events that occurred on fd */
int events; /* events of interest on fd */
int revents; /* events that occurred on fd */
} pollfd_t;
#define EINVAL 22
// poll flags
#define POLLIN 0x0001
#define POLLOUT 0x0008
#define POLLERR 0x0040
#define POLLERR 0x0020
// synonyms
#define POLLNORM POLLIN
@@ -50,8 +50,8 @@ typedef struct pollfd {
#define POLLWRBAND POLLOUT
// ignored
#define POLLHUP 0x0010
#define POLLNVAL 0x0020
#define POLLHUP 0x0040
#define POLLNVAL 0x0080
inline int poll(struct pollfd *pollSet, int pollCount, int pollTimeout)
{