diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-08-24 23:16:58 +1200 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-08-24 23:16:58 +1200 |
| commit | 7de9bda35e21232ddf7bd97eec1debc892d6b4c4 (patch) | |
| tree | af04153960387f179a6d2ba7f6ef16225e8b2c76 /Source/Core | |
| parent | 98a038aefb0bc188af5e6728f407848863c1421e (diff) | |
Fixes hid.
Fix small bug in ssl when testing certain demos.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h | 4 | ||||
| -rw-r--r-- | Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h index 051baf978c..0db0ff3853 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.h @@ -14,7 +14,9 @@ namespace WII_IPC_HLE_Interface #define IPC_FIRST_ID 0x00 // first IPC device ID #define IPC_MAX_FILES 0x10 // first IPC file ID - + +void EnqueReplyCallback(u64 userdata, int =0); + // Init void Init(); diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp index 2996cdf563..aacf93d69d 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_hid.cpp @@ -60,7 +60,7 @@ void CWII_IPC_HLE_Device_hid::checkUsbUpdates(CWII_IPC_HLE_Device_hid* hid) // Return value Memory::Write_U32(0, hid->deviceCommandAddress + 4); - WII_IPC_HLE_Interface::EnqReply(hid->deviceCommandAddress); + WII_IPC_HLE_Interface::EnqueReplyCallback(hid->deviceCommandAddress); hid->deviceCommandAddress = 0; } } @@ -87,7 +87,7 @@ void CWII_IPC_HLE_Device_hid::handleUsbUpdates(struct libusb_transfer *transfer) // Return value Memory::Write_U32(ret, replyAddress + 4); - WII_IPC_HLE_Interface::EnqReply(replyAddress); + WII_IPC_HLE_Interface::EnqueReplyCallback(replyAddress); //DEBUG_LOG(WII_IPC_HID, "OMG OMG OMG I GOT A CALLBACK, IMMA BE FAMOUS %d %d %d", transfer->actual_length, transfer->length, transfer->status); } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp index a942cef7c8..c8a1b3296a 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net_ssl.cpp @@ -215,7 +215,7 @@ bool CWII_IPC_HLE_Device_net_ssl::IOCtlV(u32 _CommandAddress) ssl_set_verify(&_SSL[sslID].ctx, _verify_certificate_callback, NULL); ssl_set_endpoint(&_SSL[sslID].ctx, SSL_IS_CLIENT); - ssl_set_authmode(&_SSL[sslID].ctx, SSL_VERIFY_OPTIONAL); + ssl_set_authmode(&_SSL[sslID].ctx, SSL_VERIFY_NONE); ssl_set_renegotiation(&_SSL[sslID].ctx, SSL_RENEGOTIATION_ENABLED); memcpy(_SSL[sslID].hostname, hostname, min((int)BufferOutSize2, NET_SSL_MAX_HOSTNAME_LEN)); |