summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/dsp_dsp.cpp18
-rw-r--r--src/core/hle/service/ldr_ro/ldr_ro.cpp331
-rw-r--r--src/core/hle/service/nwm/nwm_uds.cpp367
-rw-r--r--src/core/hle/service/nwm/nwm_uds.h66
4 files changed, 544 insertions, 238 deletions
diff --git a/src/core/hle/service/dsp_dsp.cpp b/src/core/hle/service/dsp_dsp.cpp
index fe8a6c2d6..39711ea97 100644
--- a/src/core/hle/service/dsp_dsp.cpp
+++ b/src/core/hle/service/dsp_dsp.cpp
@@ -303,6 +303,24 @@ static void WriteProcessPipe(Service::Interface* self) {
message[i] = Memory::Read8(buffer + i);
}
+ // This behaviour was confirmed by RE.
+ // The likely reason for this is that games tend to pass in garbage at these bytes
+ // because they read random bytes off the stack.
+ switch (pipe) {
+ case DSP::HLE::DspPipe::Audio:
+ ASSERT(message.size() >= 4);
+ message[2] = 0;
+ message[3] = 0;
+ break;
+ case DSP::HLE::DspPipe::Binary:
+ ASSERT(message.size() >= 8);
+ message[4] = 1;
+ message[5] = 0;
+ message[6] = 0;
+ message[7] = 0;
+ break;
+ }
+
DSP::HLE::PipeWrite(pipe, message);
cmd_buff[0] = IPC::MakeHeader(0xD, 1, 0);
diff --git a/src/core/hle/service/ldr_ro/ldr_ro.cpp b/src/core/hle/service/ldr_ro/ldr_ro.cpp
index 7af76676b..d1e6d869f 100644
--- a/src/core/hle/service/ldr_ro/ldr_ro.cpp
+++ b/src/core/hle/service/ldr_ro/ldr_ro.cpp
@@ -40,9 +40,6 @@ static const ResultCode ERROR_INVALID_MEMORY_STATE = // 0xD8A12C08
static const ResultCode ERROR_NOT_LOADED = // 0xD8A12C0D
ResultCode(static_cast<ErrorDescription>(13), ErrorModule::RO, ErrorSummary::InvalidState,
ErrorLevel::Permanent);
-static const ResultCode ERROR_INVALID_DESCRIPTOR = // 0xD9001830
- ResultCode(ErrorDescription::OS_InvalidBufferDescriptor, ErrorModule::OS,
- ErrorSummary::WrongArgument, ErrorLevel::Permanent);
static MemorySynchronizer memory_synchronizer;
@@ -71,66 +68,61 @@ static bool VerifyBufferState(VAddr buffer_ptr, u32 size) {
* 1 : Result of function, 0 on success, otherwise error code
*/
static void Initialize(Interface* self) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- VAddr crs_buffer_ptr = cmd_buff[1];
- u32 crs_size = cmd_buff[2];
- VAddr crs_address = cmd_buff[3];
- u32 descriptor = cmd_buff[4];
- u32 process = cmd_buff[5];
-
- LOG_DEBUG(Service_LDR, "called, crs_buffer_ptr=0x%08X, crs_address=0x%08X, crs_size=0x%X, "
- "descriptor=0x%08X, process=0x%08X",
- crs_buffer_ptr, crs_address, crs_size, descriptor, process);
-
- if (descriptor != 0) {
- LOG_ERROR(Service_LDR, "IPC handle descriptor failed validation (0x%X)", descriptor);
- cmd_buff[0] = IPC::MakeHeader(0, 1, 0);
- cmd_buff[1] = ERROR_INVALID_DESCRIPTOR.raw;
- return;
- }
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x01, 3, 2);
+ VAddr crs_buffer_ptr = rp.Pop<u32>();
+ u32 crs_size = rp.Pop<u32>();
+ VAddr crs_address = rp.Pop<u32>();
+ // TODO (wwylele): RO service checks the descriptor here and return error 0xD9001830 for
+ // incorrect descriptor. This error return should be probably built in IPC::RequestParser.
+ // All other service functions below have the same issue.
+ Kernel::Handle process = rp.PopHandle();
+
+ LOG_DEBUG(Service_LDR,
+ "called, crs_buffer_ptr=0x%08X, crs_address=0x%08X, crs_size=0x%X, process=0x%08X",
+ crs_buffer_ptr, crs_address, crs_size, process);
- cmd_buff[0] = IPC::MakeHeader(1, 1, 0);
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
if (loaded_crs != 0) {
LOG_ERROR(Service_LDR, "Already initialized");
- cmd_buff[1] = ERROR_ALREADY_INITIALIZED.raw;
+ rb.Push(ERROR_ALREADY_INITIALIZED);
return;
}
if (crs_size < CRO_HEADER_SIZE) {
LOG_ERROR(Service_LDR, "CRS is too small");
- cmd_buff[1] = ERROR_BUFFER_TOO_SMALL.raw;
+ rb.Push(ERROR_BUFFER_TOO_SMALL);
return;
}
if (crs_buffer_ptr & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRS original address is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_ADDRESS.raw;
+ rb.Push(ERROR_MISALIGNED_ADDRESS);
return;
}
if (crs_address & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRS mapping address is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_ADDRESS.raw;
+ rb.Push(ERROR_MISALIGNED_ADDRESS);
return;
}
if (crs_size & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRS size is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_SIZE.raw;
+ rb.Push(ERROR_MISALIGNED_SIZE);
return;
}
if (!VerifyBufferState(crs_buffer_ptr, crs_size)) {
LOG_ERROR(Service_LDR, "CRS original buffer is in invalid state");
- cmd_buff[1] = ERROR_INVALID_MEMORY_STATE.raw;
+ rb.Push(ERROR_INVALID_MEMORY_STATE);
return;
}
if (crs_address < Memory::PROCESS_IMAGE_VADDR ||
crs_address + crs_size > Memory::PROCESS_IMAGE_VADDR_END) {
LOG_ERROR(Service_LDR, "CRS mapping address is not in the process image region");
- cmd_buff[1] = ERROR_ILLEGAL_ADDRESS.raw;
+ rb.Push(ERROR_ILLEGAL_ADDRESS);
return;
}
@@ -145,7 +137,7 @@ static void Initialize(Interface* self) {
.Code();
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error mapping memory block %08X", result.raw);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
return;
}
@@ -153,7 +145,7 @@ static void Initialize(Interface* self) {
Kernel::VMAPermission::Read);
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error reprotecting memory block %08X", result.raw);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
return;
}
@@ -172,7 +164,7 @@ static void Initialize(Interface* self) {
result = crs.Rebase(0, crs_size, 0, 0, 0, 0, true);
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error rebasing CRS 0x%08X", result.raw);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
return;
}
@@ -180,7 +172,7 @@ static void Initialize(Interface* self) {
loaded_crs = crs_address;
- cmd_buff[1] = RESULT_SUCCESS.raw;
+ rb.Push(RESULT_SUCCESS);
}
/**
@@ -196,25 +188,17 @@ static void Initialize(Interface* self) {
* 1 : Result of function, 0 on success, otherwise error code
*/
static void LoadCRR(Interface* self) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- u32 crr_buffer_ptr = cmd_buff[1];
- u32 crr_size = cmd_buff[2];
- u32 descriptor = cmd_buff[3];
- u32 process = cmd_buff[4];
-
- if (descriptor != 0) {
- LOG_ERROR(Service_LDR, "IPC handle descriptor failed validation (0x%X)", descriptor);
- cmd_buff[0] = IPC::MakeHeader(0, 1, 0);
- cmd_buff[1] = ERROR_INVALID_DESCRIPTOR.raw;
- return;
- }
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x02, 2, 2);
+ VAddr crr_buffer_ptr = rp.Pop<u32>();
+ u32 crr_size = rp.Pop<u32>();
+ Kernel::Handle process = rp.PopHandle();
- cmd_buff[0] = IPC::MakeHeader(2, 1, 0);
- cmd_buff[1] = RESULT_SUCCESS.raw; // No error
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(RESULT_SUCCESS);
- LOG_WARNING(Service_LDR, "(STUBBED) called, crr_buffer_ptr=0x%08X, crr_size=0x%08X, "
- "descriptor=0x%08X, process=0x%08X",
- crr_buffer_ptr, crr_size, descriptor, process);
+ LOG_WARNING(Service_LDR,
+ "(STUBBED) called, crr_buffer_ptr=0x%08X, crr_size=0x%08X, process=0x%08X",
+ crr_buffer_ptr, crr_size, process);
}
/**
@@ -229,24 +213,15 @@ static void LoadCRR(Interface* self) {
* 1 : Result of function, 0 on success, otherwise error code
*/
static void UnloadCRR(Interface* self) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- u32 crr_buffer_ptr = cmd_buff[1];
- u32 descriptor = cmd_buff[2];
- u32 process = cmd_buff[3];
-
- if (descriptor != 0) {
- LOG_ERROR(Service_LDR, "IPC handle descriptor failed validation (0x%X)", descriptor);
- cmd_buff[0] = IPC::MakeHeader(0, 1, 0);
- cmd_buff[1] = ERROR_INVALID_DESCRIPTOR.raw;
- return;
- }
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x03, 1, 2);
+ u32 crr_buffer_ptr = rp.Pop<u32>();
+ Kernel::Handle process = rp.PopHandle();
- cmd_buff[0] = IPC::MakeHeader(3, 1, 0);
- cmd_buff[1] = RESULT_SUCCESS.raw; // No error
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(RESULT_SUCCESS);
- LOG_WARNING(Service_LDR,
- "(STUBBED) called, crr_buffer_ptr=0x%08X, descriptor=0x%08X, process=0x%08X",
- crr_buffer_ptr, descriptor, process);
+ LOG_WARNING(Service_LDR, "(STUBBED) called, crr_buffer_ptr=0x%08X, process=0x%08X",
+ crr_buffer_ptr, process);
}
/**
@@ -276,87 +251,85 @@ static void UnloadCRR(Interface* self) {
* There is a dispatcher template below.
*/
static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- VAddr cro_buffer_ptr = cmd_buff[1];
- VAddr cro_address = cmd_buff[2];
- u32 cro_size = cmd_buff[3];
- VAddr data_segment_address = cmd_buff[4];
- u32 zero = cmd_buff[5];
- u32 data_segment_size = cmd_buff[6];
- u32 bss_segment_address = cmd_buff[7];
- u32 bss_segment_size = cmd_buff[8];
- bool auto_link = (cmd_buff[9] & 0xFF) != 0;
- u32 fix_level = cmd_buff[10];
- VAddr crr_address = cmd_buff[11];
- u32 descriptor = cmd_buff[12];
- u32 process = cmd_buff[13];
-
- LOG_DEBUG(Service_LDR,
- "called (%s), cro_buffer_ptr=0x%08X, cro_address=0x%08X, cro_size=0x%X, "
- "data_segment_address=0x%08X, zero=%d, data_segment_size=0x%X, "
- "bss_segment_address=0x%08X, bss_segment_size=0x%X, "
- "auto_link=%s, fix_level=%d, crr_address=0x%08X, descriptor=0x%08X, process=0x%08X",
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), link_on_load_bug_fix ? 0x09 : 0x04, 11, 2);
+ VAddr cro_buffer_ptr = rp.Pop<u32>();
+ VAddr cro_address = rp.Pop<u32>();
+ u32 cro_size = rp.Pop<u32>();
+ VAddr data_segment_address = rp.Pop<u32>();
+ u32 zero = rp.Pop<u32>();
+ u32 data_segment_size = rp.Pop<u32>();
+ u32 bss_segment_address = rp.Pop<u32>();
+ u32 bss_segment_size = rp.Pop<u32>();
+ bool auto_link = rp.Pop<bool>();
+ u32 fix_level = rp.Pop<u32>();
+ VAddr crr_address = rp.Pop<u32>();
+ Kernel::Handle process = rp.PopHandle();
+
+ LOG_DEBUG(Service_LDR, "called (%s), cro_buffer_ptr=0x%08X, cro_address=0x%08X, cro_size=0x%X, "
+ "data_segment_address=0x%08X, zero=%d, data_segment_size=0x%X, "
+ "bss_segment_address=0x%08X, bss_segment_size=0x%X, auto_link=%s, "
+ "fix_level=%d, crr_address=0x%08X, process=0x%08X",
link_on_load_bug_fix ? "new" : "old", cro_buffer_ptr, cro_address, cro_size,
data_segment_address, zero, data_segment_size, bss_segment_address, bss_segment_size,
- auto_link ? "true" : "false", fix_level, crr_address, descriptor, process);
-
- if (descriptor != 0) {
- LOG_ERROR(Service_LDR, "IPC handle descriptor failed validation (0x%X)", descriptor);
- cmd_buff[0] = IPC::MakeHeader(0, 1, 0);
- cmd_buff[1] = ERROR_INVALID_DESCRIPTOR.raw;
- return;
- }
+ auto_link ? "true" : "false", fix_level, crr_address, process);
- cmd_buff[0] = IPC::MakeHeader(link_on_load_bug_fix ? 9 : 4, 2, 0);
+ IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
if (loaded_crs == 0) {
LOG_ERROR(Service_LDR, "Not initialized");
- cmd_buff[1] = ERROR_NOT_INITIALIZED.raw;
+ rb.Push(ERROR_NOT_INITIALIZED);
+ rb.Push<u32>(0);
return;
}
if (cro_size < CRO_HEADER_SIZE) {
LOG_ERROR(Service_LDR, "CRO too small");
- cmd_buff[1] = ERROR_BUFFER_TOO_SMALL.raw;
+ rb.Push(ERROR_BUFFER_TOO_SMALL);
+ rb.Push<u32>(0);
return;
}
if (cro_buffer_ptr & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRO original address is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_ADDRESS.raw;
+ rb.Push(ERROR_MISALIGNED_ADDRESS);
+ rb.Push<u32>(0);
return;
}
if (cro_address & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRO mapping address is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_ADDRESS.raw;
+ rb.Push(ERROR_MISALIGNED_ADDRESS);
+ rb.Push<u32>(0);
return;
}
if (cro_size & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRO size is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_SIZE.raw;
+ rb.Push(ERROR_MISALIGNED_SIZE);
+ rb.Push<u32>(0);
return;
}
if (!VerifyBufferState(cro_buffer_ptr, cro_size)) {
LOG_ERROR(Service_LDR, "CRO original buffer is in invalid state");
- cmd_buff[1] = ERROR_INVALID_MEMORY_STATE.raw;
+ rb.Push(ERROR_INVALID_MEMORY_STATE);
+ rb.Push<u32>(0);
return;
}
if (cro_address < Memory::PROCESS_IMAGE_VADDR ||
cro_address + cro_size > Memory::PROCESS_IMAGE_VADDR_END) {
LOG_ERROR(Service_LDR, "CRO mapping address is not in the process image region");
- cmd_buff[1] = ERROR_ILLEGAL_ADDRESS.raw;
+ rb.Push(ERROR_ILLEGAL_ADDRESS);
+ rb.Push<u32>(0);
return;
}
if (zero) {
LOG_ERROR(Service_LDR, "Zero is not zero %d", zero);
- cmd_buff[1] = ResultCode(static_cast<ErrorDescription>(29), ErrorModule::RO,
- ErrorSummary::Internal, ErrorLevel::Usage)
- .raw;
+ rb.Push(ResultCode(static_cast<ErrorDescription>(29), ErrorModule::RO,
+ ErrorSummary::Internal, ErrorLevel::Usage));
+ rb.Push<u32>(0);
return;
}
@@ -371,7 +344,8 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
.Code();
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error mapping memory block %08X", result.raw);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
+ rb.Push<u32>(0);
return;
}
@@ -380,7 +354,8 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error reprotecting memory block %08X", result.raw);
Kernel::g_current_process->vm_manager.UnmapRange(cro_address, cro_size);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
+ rb.Push<u32>(0);
return;
}
@@ -400,7 +375,8 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error verifying CRO in CRR %08X", result.raw);
Kernel::g_current_process->vm_manager.UnmapRange(cro_address, cro_size);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
+ rb.Push<u32>(0);
return;
}
@@ -409,7 +385,8 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error rebasing CRO %08X", result.raw);
Kernel::g_current_process->vm_manager.UnmapRange(cro_address, cro_size);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
+ rb.Push<u32>(0);
return;
}
@@ -417,7 +394,8 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error linking CRO %08X", result.raw);
Kernel::g_current_process->vm_manager.UnmapRange(cro_address, cro_size);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
+ rb.Push<u32>(0);
return;
}
@@ -435,7 +413,8 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error unmapping memory block %08X", result.raw);
Kernel::g_current_process->vm_manager.UnmapRange(cro_address, cro_size);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
+ rb.Push<u32>(0);
return;
}
}
@@ -453,7 +432,8 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error reprotecting memory block %08X", result.raw);
Kernel::g_current_process->vm_manager.UnmapRange(cro_address, fix_size);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
+ rb.Push<u32>(0);
return;
}
}
@@ -463,8 +443,7 @@ static void LoadCRO(Interface* self, bool link_on_load_bug_fix) {
LOG_INFO(Service_LDR, "CRO \"%s\" loaded at 0x%08X, fixed_end=0x%08X", cro.ModuleName().data(),
cro_address, cro_address + fix_size);
- cmd_buff[1] = RESULT_SUCCESS.raw;
- cmd_buff[2] = fix_size;
+ rb.Push(RESULT_SUCCESS, fix_size);
}
template <bool link_on_load_bug_fix>
@@ -486,43 +465,35 @@ static void LoadCRO(Interface* self) {
* 1 : Result of function, 0 on success, otherwise error code
*/
static void UnloadCRO(Interface* self) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- VAddr cro_address = cmd_buff[1];
- u32 zero = cmd_buff[2];
- VAddr cro_buffer_ptr = cmd_buff[3];
- u32 descriptor = cmd_buff[4];
- u32 process = cmd_buff[5];
-
- LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X, zero=%d, cro_buffer_ptr=0x%08X, "
- "descriptor=0x%08X, process=0x%08X",
- cro_address, zero, cro_buffer_ptr, descriptor, process);
-
- if (descriptor != 0) {
- LOG_ERROR(Service_LDR, "IPC handle descriptor failed validation (0x%X)", descriptor);
- cmd_buff[0] = IPC::MakeHeader(0, 1, 0);
- cmd_buff[1] = ERROR_INVALID_DESCRIPTOR.raw;
- return;
- }
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x05, 3, 2);
+ VAddr cro_address = rp.Pop<u32>();
+ u32 zero = rp.Pop<u32>();
+ VAddr cro_buffer_ptr = rp.Pop<u32>();
+ Kernel::Handle process = rp.PopHandle();
+
+ LOG_DEBUG(Service_LDR,
+ "called, cro_address=0x%08X, zero=%d, cro_buffer_ptr=0x%08X, process=0x%08X",
+ cro_address, zero, cro_buffer_ptr, process);
CROHelper cro(cro_address);
- cmd_buff[0] = IPC::MakeHeader(5, 1, 0);
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
if (loaded_crs == 0) {
LOG_ERROR(Service_LDR, "Not initialized");
- cmd_buff[1] = ERROR_NOT_INITIALIZED.raw;
+ rb.Push(ERROR_NOT_INITIALIZED);
return;
}
if (cro_address & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRO address is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_ADDRESS.raw;
+ rb.Push(ERROR_MISALIGNED_ADDRESS);
return;
}
if (!cro.IsLoaded()) {
LOG_ERROR(Service_LDR, "Invalid or not loaded CRO");
- cmd_buff[1] = ERROR_NOT_LOADED.raw;
+ rb.Push(ERROR_NOT_LOADED);
return;
}
@@ -535,7 +506,7 @@ static void UnloadCRO(Interface* self) {
ResultCode result = cro.Unlink(loaded_crs);
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error unlinking CRO %08X", result.raw);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
return;
}
@@ -545,7 +516,7 @@ static void UnloadCRO(Interface* self) {
result = cro.ClearRelocations();
if (result.IsError()) {
LOG_ERROR(Service_LDR, "Error clearing relocations %08X", result.raw);
- cmd_buff[1] = result.raw;
+ rb.Push(result);
return;
}
}
@@ -565,7 +536,7 @@ static void UnloadCRO(Interface* self) {
Core::CPU().ClearInstructionCache();
- cmd_buff[1] = result.raw;
+ rb.Push(result);
}
/**
@@ -580,40 +551,31 @@ static void UnloadCRO(Interface* self) {
* 1 : Result of function, 0 on success, otherwise error code
*/
static void LinkCRO(Interface* self) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- VAddr cro_address = cmd_buff[1];
- u32 descriptor = cmd_buff[2];
- u32 process = cmd_buff[3];
-
- LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X, descriptor=0x%08X, process=0x%08X",
- cro_address, descriptor, process);
-
- if (descriptor != 0) {
- LOG_ERROR(Service_LDR, "IPC handle descriptor failed validation (0x%X)", descriptor);
- cmd_buff[0] = IPC::MakeHeader(0, 1, 0);
- cmd_buff[1] = ERROR_INVALID_DESCRIPTOR.raw;
- return;
- }
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x06, 1, 2);
+ VAddr cro_address = rp.Pop<u32>();
+ Kernel::Handle process = rp.PopHandle();
+
+ LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X, process=0x%08X", cro_address, process);
CROHelper cro(cro_address);
- cmd_buff[0] = IPC::MakeHeader(6, 1, 0);
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
if (loaded_crs == 0) {
LOG_ERROR(Service_LDR, "Not initialized");
- cmd_buff[1] = ERROR_NOT_INITIALIZED.raw;
+ rb.Push(ERROR_NOT_INITIALIZED);
return;
}
if (cro_address & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRO address is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_ADDRESS.raw;
+ rb.Push(ERROR_MISALIGNED_ADDRESS);
return;
}
if (!cro.IsLoaded()) {
LOG_ERROR(Service_LDR, "Invalid or not loaded CRO");
- cmd_buff[1] = ERROR_NOT_LOADED.raw;
+ rb.Push(ERROR_NOT_LOADED);
return;
}
@@ -627,7 +589,7 @@ static void LinkCRO(Interface* self) {
memory_synchronizer.SynchronizeOriginalMemory();
Core::CPU().ClearInstructionCache();
- cmd_buff[1] = result.raw;
+ rb.Push(result);
}
/**
@@ -642,40 +604,31 @@ static void LinkCRO(Interface* self) {
* 1 : Result of function, 0 on success, otherwise error code
*/
static void UnlinkCRO(Interface* self) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- VAddr cro_address = cmd_buff[1];
- u32 descriptor = cmd_buff[2];
- u32 process = cmd_buff[3];
-
- LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X, descriptor=0x%08X, process=0x%08X",
- cro_address, descriptor, process);
-
- if (descriptor != 0) {
- LOG_ERROR(Service_LDR, "IPC handle descriptor failed validation (0x%X)", descriptor);
- cmd_buff[0] = IPC::MakeHeader(0, 1, 0);
- cmd_buff[1] = ERROR_INVALID_DESCRIPTOR.raw;
- return;
- }
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x07, 1, 2);
+ VAddr cro_address = rp.Pop<u32>();
+ Kernel::Handle process = rp.PopHandle();
+
+ LOG_DEBUG(Service_LDR, "called, cro_address=0x%08X, process=0x%08X", cro_address, process);
CROHelper cro(cro_address);
- cmd_buff[0] = IPC::MakeHeader(7, 1, 0);
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
if (loaded_crs == 0) {
LOG_ERROR(Service_LDR, "Not initialized");
- cmd_buff[1] = ERROR_NOT_INITIALIZED.raw;
+ rb.Push(ERROR_NOT_INITIALIZED);
return;
}
if (cro_address & Memory::PAGE_MASK) {
LOG_ERROR(Service_LDR, "CRO address is not aligned");
- cmd_buff[1] = ERROR_MISALIGNED_ADDRESS.raw;
+ rb.Push(ERROR_MISALIGNED_ADDRESS);
return;
}
if (!cro.IsLoaded()) {
LOG_ERROR(Service_LDR, "Invalid or not loaded CRO");
- cmd_buff[1] = ERROR_NOT_LOADED.raw;
+ rb.Push(ERROR_NOT_LOADED);
return;
}
@@ -689,7 +642,7 @@ static void UnlinkCRO(Interface* self) {
memory_synchronizer.SynchronizeOriginalMemory();
Core::CPU().ClearInstructionCache();
- cmd_buff[1] = result.raw;
+ rb.Push(result);
}
/**
@@ -704,29 +657,21 @@ static void UnlinkCRO(Interface* self) {
* 1 : Result of function, 0 on success, otherwise error code
*/
static void Shutdown(Interface* self) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- VAddr crs_buffer_ptr = cmd_buff[1];
- u32 descriptor = cmd_buff[2];
- u32 process = cmd_buff[3];
-
- LOG_DEBUG(Service_LDR, "called, crs_buffer_ptr=0x%08X, descriptor=0x%08X, process=0x%08X",
- crs_buffer_ptr, descriptor, process);
-
- if (descriptor != 0) {
- LOG_ERROR(Service_LDR, "IPC handle descriptor failed validation (0x%X)", descriptor);
- cmd_buff[0] = IPC::MakeHeader(0, 1, 0);
- cmd_buff[1] = ERROR_INVALID_DESCRIPTOR.raw;
- return;
- }
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x08, 1, 2);
+ VAddr crs_buffer_ptr = rp.Pop<u32>();
+ Kernel::Handle process = rp.PopHandle();
+
+ LOG_DEBUG(Service_LDR, "called, crs_buffer_ptr=0x%08X, process=0x%08X", crs_buffer_ptr,
+ process);
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
if (loaded_crs == 0) {
LOG_ERROR(Service_LDR, "Not initialized");
- cmd_buff[1] = ERROR_NOT_INITIALIZED.raw;
+ rb.Push(ERROR_NOT_INITIALIZED);
return;
}
- cmd_buff[0] = IPC::MakeHeader(8, 1, 0);
-
CROHelper crs(loaded_crs);
crs.Unrebase(true);
@@ -744,7 +689,7 @@ static void Shutdown(Interface* self) {
}
loaded_crs = 0;
- cmd_buff[1] = result.raw;
+ rb.Push(result);
}
const Interface::FunctionInfo FunctionTable[] = {
diff --git a/src/core/hle/service/nwm/nwm_uds.cpp b/src/core/hle/service/nwm/nwm_uds.cpp
index 08fade320..ef6c5ebe3 100644
--- a/src/core/hle/service/nwm/nwm_uds.cpp
+++ b/src/core/hle/service/nwm/nwm_uds.cpp
@@ -1,16 +1,49 @@
-// Copyright 2014 Citra Emulator Project
+// Copyright 2017 Citra Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include <cstring>
+#include <unordered_map>
+#include <vector>
#include "common/common_types.h"
#include "common/logging/log.h"
+#include "core/core_timing.h"
#include "core/hle/kernel/event.h"
+#include "core/hle/kernel/shared_memory.h"
+#include "core/hle/result.h"
#include "core/hle/service/nwm/nwm_uds.h"
+#include "core/memory.h"
namespace Service {
namespace NWM {
-static Kernel::SharedPtr<Kernel::Event> uds_handle_event;
+// Event that is signaled every time the connection status changes.
+static Kernel::SharedPtr<Kernel::Event> connection_status_event;
+
+// Shared memory provided by the application to store the receive buffer.
+// This is not currently used.
+static Kernel::SharedPtr<Kernel::SharedMemory> recv_buffer_memory;
+
+// Connection status of this 3DS.
+static ConnectionStatus connection_status{};
+
+// Node information about the current 3DS.
+// TODO(Subv): Keep an array of all nodes connected to the network,
+// that data has to be retransmitted in every beacon frame.
+static NodeInfo node_info;
+
+// Mapping of bind node ids to their respective events.
+static std::unordered_map<u32, Kernel::SharedPtr<Kernel::Event>> bind_node_events;
+
+// The WiFi network channel that the network is currently on.
+// Since we're not actually interacting with physical radio waves, this is just a dummy value.
+static u8 network_channel = DefaultNetworkChannel;
+
+// Information about the network that we're currently connected to.
+static NetworkInfo network_info;
+
+// Event that will generate and send the 802.11 beacon frames.
+static int beacon_broadcast_event;
/**
* NWM_UDS::Shutdown service function
@@ -32,14 +65,14 @@ static void Shutdown(Interface* self) {
/**
* NWM_UDS::RecvBeaconBroadcastData service function
+ * Returns the raw beacon data for nearby networks that match the supplied WlanCommId.
* Inputs:
* 1 : Output buffer max size
- * 2 : Unknown
- * 3 : Unknown
- * 4 : MAC address?
- * 6-14 : Unknown, usually zero / uninitialized?
- * 15 : WLan Comm ID
- * 16 : This is the ID also located at offset 0xE in the CTR-generation structure.
+ * 2-3 : Unknown
+ * 4-5 : Host MAC address.
+ * 6-14 : Unused
+ * 15 : WLan Comm Id
+ * 16 : Id
* 17 : Value 0
* 18 : Input handle
* 19 : (Size<<4) | 12
@@ -77,42 +110,274 @@ static void RecvBeaconBroadcastData(Interface* self) {
/**
* NWM_UDS::Initialize service function
* Inputs:
- * 1 : Unknown
- * 2-11 : Input Structure
- * 12 : Unknown u16
+ * 1 : Shared memory size
+ * 2-11 : Input NodeInfo Structure
+ * 12 : 2-byte Version
* 13 : Value 0
- * 14 : Handle
+ * 14 : Shared memory handle
* Outputs:
* 0 : Return header
* 1 : Result of function, 0 on success, otherwise error code
* 2 : Value 0
- * 3 : Output handle
+ * 3 : Output event handle
*/
static void InitializeWithVersion(Interface* self) {
- u32* cmd_buff = Kernel::GetCommandBuffer();
- u32 unk1 = cmd_buff[1];
- u32 unk2 = cmd_buff[12];
- u32 value = cmd_buff[13];
- u32 handle = cmd_buff[14];
-
- // Because NWM service is not implemented at all, we stub the Initialize function with an error
- // code instead of success to prevent games from using the service and from causing more issues.
- // The error code is from a real 3DS with wifi off, thus believed to be "network disabled".
- /*
- cmd_buff[1] = RESULT_SUCCESS.raw;
- cmd_buff[2] = 0;
- cmd_buff[3] = Kernel::g_handle_table.Create(uds_handle_event)
- .MoveFrom(); // TODO(purpasmart): Verify if this is a event handle
- */
- cmd_buff[0] = IPC::MakeHeader(0x1B, 1, 2);
- cmd_buff[1] = ResultCode(static_cast<ErrorDescription>(2), ErrorModule::UDS,
- ErrorSummary::StatusChanged, ErrorLevel::Status)
- .raw;
- cmd_buff[2] = 0;
- cmd_buff[3] = 0;
-
- LOG_WARNING(Service_NWM, "(STUBBED) called unk1=0x%08X, unk2=0x%08X, value=%u, handle=0x%08X",
- unk1, unk2, value, handle);
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x1B, 12, 2);
+
+ u32 sharedmem_size = rp.Pop<u32>();
+
+ // Update the node information with the data the game gave us.
+ rp.PopRaw(node_info);
+
+ u16 version;
+ rp.PopRaw(version);
+ Kernel::Handle sharedmem_handle = rp.PopHandle();
+
+ recv_buffer_memory = Kernel::g_handle_table.Get<Kernel::SharedMemory>(sharedmem_handle);
+
+ ASSERT_MSG(recv_buffer_memory->size == sharedmem_size, "Invalid shared memory size.");
+
+ // Reset the connection status, it contains all zeros after initialization,
+ // except for the actual status value.
+ connection_status = {};
+ connection_status.status = static_cast<u32>(NetworkStatus::NotConnected);
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 2);
+ rb.Push(RESULT_SUCCESS);
+ rb.PushCopyHandles(Kernel::g_handle_table.Create(connection_status_event).MoveFrom());
+
+ LOG_DEBUG(Service_NWM, "called sharedmem_size=0x%08X, version=0x%08X, sharedmem_handle=0x%08X",
+ sharedmem_size, version, sharedmem_handle);
+}
+
+/**
+ * NWM_UDS::GetConnectionStatus service function.
+ * Returns the connection status structure for the currently open network connection.
+ * This structure contains information about the connection,
+ * like the number of connected nodes, etc.
+ * Inputs:
+ * 0 : Command header.
+ * Outputs:
+ * 0 : Return header
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2-13 : Channel of the current WiFi network connection.
+ */
+static void GetConnectionStatus(Interface* self) {
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0xB, 0, 0);
+ IPC::RequestBuilder rb = rp.MakeBuilder(13, 0);
+
+ rb.Push(RESULT_SUCCESS);
+ rb.PushRaw(connection_status);
+
+ LOG_DEBUG(Service_NWM, "called");
+}
+
+/**
+ * NWM_UDS::Bind service function.
+ * Binds a BindNodeId to a data channel and retrieves a data event.
+ * Inputs:
+ * 1 : BindNodeId
+ * 2 : Receive buffer size.
+ * 3 : u8 Data channel to bind to.
+ * 4 : Network node id.
+ * Outputs:
+ * 0 : Return header
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 : Copy handle descriptor.
+ * 3 : Data available event handle.
+ */
+static void Bind(Interface* self) {
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x12, 4, 0);
+
+ u32 bind_node_id = rp.Pop<u32>();
+ u32 recv_buffer_size = rp.Pop<u32>();
+ u8 data_channel;
+ rp.PopRaw(data_channel);
+ u16 network_node_id;
+ rp.PopRaw(network_node_id);
+
+ // TODO(Subv): Store the data channel and verify it when receiving data frames.
+
+ LOG_DEBUG(Service_NWM, "called");
+
+ if (data_channel == 0) {
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(ResultCode(ErrorDescription::NotAuthorized, ErrorModule::UDS,
+ ErrorSummary::WrongArgument, ErrorLevel::Usage));
+ return;
+ }
+
+ // Create a new event for this bind node.
+ // TODO(Subv): Signal this event when new data is received on this data channel.
+ auto event = Kernel::Event::Create(Kernel::ResetType::OneShot,
+ "NWM::BindNodeEvent" + std::to_string(bind_node_id));
+ bind_node_events[bind_node_id] = event;
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 2);
+
+ rb.Push(RESULT_SUCCESS);
+ rb.PushCopyHandles(Kernel::g_handle_table.Create(event).MoveFrom());
+}
+
+/**
+ * NWM_UDS::BeginHostingNetwork service function.
+ * Creates a network and starts broadcasting its presence.
+ * Inputs:
+ * 1 : Passphrase buffer size.
+ * 3 : VAddr of the NetworkInfo structure.
+ * 5 : VAddr of the passphrase.
+ * Outputs:
+ * 0 : Return header
+ * 1 : Result of function, 0 on success, otherwise error code
+ */
+static void BeginHostingNetwork(Interface* self) {
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x1D, 1, 4);
+
+ const u32 passphrase_size = rp.Pop<u32>();
+
+ size_t desc_size;
+ const VAddr network_info_address = rp.PopStaticBuffer(&desc_size, false);
+ ASSERT(desc_size == sizeof(NetworkInfo));
+ const VAddr passphrase_address = rp.PopStaticBuffer(&desc_size, false);
+ ASSERT(desc_size == passphrase_size);
+
+ // TODO(Subv): Store the passphrase and verify it when attempting a connection.
+
+ LOG_DEBUG(Service_NWM, "called");
+
+ Memory::ReadBlock(network_info_address, &network_info, sizeof(NetworkInfo));
+
+ // The real UDS module throws a fatal error if this assert fails.
+ ASSERT_MSG(network_info.max_nodes > 1, "Trying to host a network of only one member.");
+
+ connection_status.status = static_cast<u32>(NetworkStatus::ConnectedAsHost);
+ connection_status.max_nodes = network_info.max_nodes;
+
+ // There's currently only one node in the network (the host).
+ connection_status.total_nodes = 1;
+ // The host is always the first node
+ connection_status.network_node_id = 1;
+ node_info.network_node_id = 1;
+ // Set the bit 0 in the nodes bitmask to indicate that node 1 is already taken.
+ connection_status.node_bitmask |= 1;
+
+ // If the game has a preferred channel, use that instead.
+ if (network_info.channel != 0)
+ network_channel = network_info.channel;
+
+ connection_status_event->Signal();
+
+ // Start broadcasting the network, send a beacon frame every 102.4ms.
+ CoreTiming::ScheduleEvent(msToCycles(DefaultBeaconInterval * MillisecondsPerTU),
+ beacon_broadcast_event, 0);
+
+ LOG_WARNING(Service_NWM,
+ "An UDS network has been created, but broadcasting it is unimplemented.");
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+ rb.Push(RESULT_SUCCESS);
+}
+
+/**
+ * NWM_UDS::DestroyNetwork service function.
+ * Closes the network that we're currently hosting.
+ * Inputs:
+ * 0 : Command header.
+ * Outputs:
+ * 0 : Return header
+ * 1 : Result of function, 0 on success, otherwise error code
+ */
+static void DestroyNetwork(Interface* self) {
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x08, 0, 0);
+
+ // TODO(Subv): Find out what happens if this is called while
+ // no network is being hosted.
+
+ // Unschedule the beacon broadcast event.
+ CoreTiming::UnscheduleEvent(beacon_broadcast_event, 0);
+
+ connection_status.status = static_cast<u8>(NetworkStatus::NotConnected);
+ connection_status_event->Signal();
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+
+ rb.Push(RESULT_SUCCESS);
+
+ LOG_WARNING(Service_NWM, "called");
+}
+
+/**
+ * NWM_UDS::GetChannel service function.
+ * Returns the WiFi channel in which the network we're connected to is transmitting.
+ * Inputs:
+ * 0 : Command header.
+ * Outputs:
+ * 0 : Return header
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 : Channel of the current WiFi network connection.
+ */
+static void GetChannel(Interface* self) {
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x1A, 0, 0);
+ IPC::RequestBuilder rb = rp.MakeBuilder(2, 0);
+
+ bool is_connected = connection_status.status != static_cast<u32>(NetworkStatus::NotConnected);
+
+ u8 channel = is_connected ? network_channel : 0;
+
+ rb.Push(RESULT_SUCCESS);
+ rb.PushRaw(channel);
+
+ LOG_DEBUG(Service_NWM, "called");
+}
+
+/**
+ * NWM_UDS::SetApplicationData service function.
+ * Updates the application data that is being broadcast in the beacon frames
+ * for the network that we're hosting.
+ * Inputs:
+ * 1 : Data size.
+ * 3 : VAddr of the data.
+ * Outputs:
+ * 0 : Return header
+ * 1 : Result of function, 0 on success, otherwise error code
+ * 2 : Channel of the current WiFi network connection.
+ */
+static void SetApplicationData(Interface* self) {
+ IPC::RequestParser rp(Kernel::GetCommandBuffer(), 0x1A, 1, 2);
+
+ u32 size = rp.Pop<u32>();
+
+ size_t desc_size;
+ const VAddr address = rp.PopStaticBuffer(&desc_size, false);
+ ASSERT(desc_size == size);
+
+ LOG_DEBUG(Service_NWM, "called");
+
+ IPC::RequestBuilder rb = rp.MakeBuilder(1, 0);
+
+ if (size > ApplicationDataSize) {
+ rb.Push(ResultCode(ErrorDescription::TooLarge, ErrorModule::UDS,
+ ErrorSummary::WrongArgument, ErrorLevel::Usage));
+ return;
+ }
+
+ network_info.application_data_size = size;
+ Memory::ReadBlock(address, network_info.application_data.data(), size);
+
+ rb.Push(RESULT_SUCCESS);
+}
+
+// Sends a 802.11 beacon frame with information about the current network.
+static void BeaconBroadcastCallback(u64 userdata, int cycles_late) {
+ // Don't do anything if we're not actually hosting a network
+ if (connection_status.status != static_cast<u32>(NetworkStatus::ConnectedAsHost))
+ return;
+
+ // TODO(Subv): Actually generate the beacon and send it.
+
+ // Start broadcasting the network, send a beacon frame every 102.4ms.
+ CoreTiming::ScheduleEvent(msToCycles(DefaultBeaconInterval * MillisecondsPerTU) - cycles_late,
+ beacon_broadcast_event, 0);
}
const Interface::FunctionInfo FunctionTable[] = {
@@ -123,23 +388,23 @@ const Interface::FunctionInfo FunctionTable[] = {
{0x00050040, nullptr, "EjectClient"},
{0x00060000, nullptr, "EjectSpectator"},
{0x00070080, nullptr, "UpdateNetworkAttribute"},
- {0x00080000, nullptr, "DestroyNetwork"},
+ {0x00080000, DestroyNetwork, "DestroyNetwork"},
{0x00090442, nullptr, "ConnectNetwork (deprecated)"},
{0x000A0000, nullptr, "DisconnectNetwork"},
- {0x000B0000, nullptr, "GetConnectionStatus"},
+ {0x000B0000, GetConnectionStatus, "GetConnectionStatus"},
{0x000D0040, nullptr, "GetNodeInformation"},
{0x000E0006, nullptr, "DecryptBeaconData (deprecated)"},
{0x000F0404, RecvBeaconBroadcastData, "RecvBeaconBroadcastData"},
- {0x00100042, nullptr, "SetApplicationData"},
+ {0x00100042, SetApplicationData, "SetApplicationData"},
{0x00110040, nullptr, "GetApplicationData"},
- {0x00120100, nullptr, "Bind"},
+ {0x00120100, Bind, "Bind"},
{0x00130040, nullptr, "Unbind"},
{0x001400C0, nullptr, "PullPacket"},
{0x00150080, nullptr, "SetMaxSendDelay"},
{0x00170182, nullptr, "SendTo"},
- {0x001A0000, nullptr, "GetChannel"},
+ {0x001A0000, GetChannel, "GetChannel"},
{0x001B0302, InitializeWithVersion, "InitializeWithVersion"},
- {0x001D0044, nullptr, "BeginHostingNetwork"},
+ {0x001D0044, BeginHostingNetwork, "BeginHostingNetwork"},
{0x001E0084, nullptr, "ConnectToNetwork"},
{0x001F0006, nullptr, "DecryptBeaconData"},
{0x00200040, nullptr, "Flush"},
@@ -148,13 +413,25 @@ const Interface::FunctionInfo FunctionTable[] = {
};
NWM_UDS::NWM_UDS() {
- uds_handle_event = Kernel::Event::Create(Kernel::ResetType::OneShot, "NWM::uds_handle_event");
+ connection_status_event =
+ Kernel::Event::Create(Kernel::ResetType::OneShot, "NWM::connection_status_event");
Register(FunctionTable);
+
+ beacon_broadcast_event =
+ CoreTiming::RegisterEvent("UDS::BeaconBroadcastCallback", BeaconBroadcastCallback);
}
NWM_UDS::~NWM_UDS() {
- uds_handle_event = nullptr;
+ network_info = {};
+ bind_node_events.clear();
+ connection_status_event = nullptr;
+ recv_buffer_memory = nullptr;
+
+ connection_status = {};
+ connection_status.status = static_cast<u32>(NetworkStatus::NotConnected);
+
+ CoreTiming::UnscheduleEvent(beacon_broadcast_event, 0);
}
} // namespace NWM
diff --git a/src/core/hle/service/nwm/nwm_uds.h b/src/core/hle/service/nwm/nwm_uds.h
index 55db748f6..65349f9fd 100644
--- a/src/core/hle/service/nwm/nwm_uds.h
+++ b/src/core/hle/service/nwm/nwm_uds.h
@@ -4,6 +4,10 @@
#pragma once
+#include <array>
+#include <cstddef>
+#include "common/common_types.h"
+#include "common/swap.h"
#include "core/hle/service/service.h"
// Local-WLAN service
@@ -11,6 +15,68 @@
namespace Service {
namespace NWM {
+const size_t ApplicationDataSize = 0xC8;
+const u8 DefaultNetworkChannel = 11;
+
+// Number of milliseconds in a TU.
+const double MillisecondsPerTU = 1.024;
+// Interval measured in TU, the default value is 100TU = 102.4ms
+const u16 DefaultBeaconInterval = 100;
+
+struct NodeInfo {
+ u64_le friend_code_seed;
+ std::array<u16_le, 10> username;
+ INSERT_PADDING_BYTES(4);
+ u16_le network_node_id;
+ INSERT_PADDING_BYTES(6);
+};
+
+static_assert(sizeof(NodeInfo) == 40, "NodeInfo has incorrect size.");
+
+enum class NetworkStatus {
+ NotConnected = 3,
+ ConnectedAsHost = 6,
+ ConnectedAsClient = 9,
+ ConnectedAsSpectator = 10,
+};
+
+struct ConnectionStatus {
+ u32_le status;
+ INSERT_PADDING_WORDS(1);
+ u16_le network_node_id;
+ INSERT_PADDING_BYTES(2);
+ INSERT_PADDING_BYTES(32);
+ u8 total_nodes;
+ u8 max_nodes;
+ u16_le node_bitmask;
+};
+
+static_assert(sizeof(ConnectionStatus) == 0x30, "ConnectionStatus has incorrect size.");
+
+struct NetworkInfo {
+ std::array<u8, 6> host_mac_address;
+ u8 channel;
+ INSERT_PADDING_BYTES(1);
+ u8 initialized;
+ INSERT_PADDING_BYTES(3);
+ std::array<u8, 3> oui_value;
+ u8 oui_type;
+ // This field is received as BigEndian from the game.
+ u32_be wlan_comm_id;
+ u8 id;
+ INSERT_PADDING_BYTES(1);
+ u16_be attributes;
+ u32_be network_id;
+ u8 total_nodes;
+ u8 max_nodes;
+ INSERT_PADDING_BYTES(2);
+ INSERT_PADDING_BYTES(0x1F);
+ u8 application_data_size;
+ std::array<u8, ApplicationDataSize> application_data;
+};
+
+static_assert(sizeof(NetworkInfo) == 0x108, "NetworkInfo has incorrect size.");
+
class NWM_UDS final : public Interface {
public:
NWM_UDS();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 23:53:26 +0100