mirror of
https://github.com/citra-mirror/citra.git
synced 2024-08-21 10:53:23 +02:00
commit
597a7c615c
@ -54,7 +54,9 @@ set(SRCS
|
|||||||
hle/kernel/thread.cpp
|
hle/kernel/thread.cpp
|
||||||
hle/kernel/timer.cpp
|
hle/kernel/timer.cpp
|
||||||
hle/kernel/vm_manager.cpp
|
hle/kernel/vm_manager.cpp
|
||||||
hle/service/ac_u.cpp
|
hle/service/ac/ac.cpp
|
||||||
|
hle/service/ac/ac_i.cpp
|
||||||
|
hle/service/ac/ac_u.cpp
|
||||||
hle/service/act/act.cpp
|
hle/service/act/act.cpp
|
||||||
hle/service/act/act_a.cpp
|
hle/service/act/act_a.cpp
|
||||||
hle/service/act/act_u.cpp
|
hle/service/act/act_u.cpp
|
||||||
@ -229,7 +231,9 @@ set(HEADERS
|
|||||||
hle/kernel/timer.h
|
hle/kernel/timer.h
|
||||||
hle/kernel/vm_manager.h
|
hle/kernel/vm_manager.h
|
||||||
hle/result.h
|
hle/result.h
|
||||||
hle/service/ac_u.h
|
hle/service/ac/ac.h
|
||||||
|
hle/service/ac/ac_i.h
|
||||||
|
hle/service/ac/ac_u.h
|
||||||
hle/service/act/act.h
|
hle/service/act/act.h
|
||||||
hle/service/act/act_a.h
|
hle/service/act/act_a.h
|
||||||
hle/service/act/act_u.h
|
hle/service/act/act_u.h
|
||||||
|
181
src/core/hle/service/ac/ac.cpp
Normal file
181
src/core/hle/service/ac/ac.cpp
Normal file
@ -0,0 +1,181 @@
|
|||||||
|
// Copyright 2016 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include <array>
|
||||||
|
|
||||||
|
#include "common/logging/log.h"
|
||||||
|
#include "core/hle/kernel/event.h"
|
||||||
|
#include "core/hle/service/ac/ac.h"
|
||||||
|
#include "core/hle/service/ac/ac_i.h"
|
||||||
|
#include "core/hle/service/ac/ac_u.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace AC {
|
||||||
|
|
||||||
|
struct ACConfig {
|
||||||
|
std::array<u8, 0x200> data;
|
||||||
|
};
|
||||||
|
|
||||||
|
static ACConfig default_config{};
|
||||||
|
|
||||||
|
static bool ac_connected = false;
|
||||||
|
|
||||||
|
static Kernel::SharedPtr<Kernel::Event> close_event;
|
||||||
|
static Kernel::SharedPtr<Kernel::Event> connect_event;
|
||||||
|
static Kernel::SharedPtr<Kernel::Event> disconnect_event;
|
||||||
|
|
||||||
|
void CreateDefaultConfig(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
u32 ac_config_addr = cmd_buff[65];
|
||||||
|
|
||||||
|
ASSERT_MSG(cmd_buff[64] == (sizeof(ACConfig) << 14 | 2),
|
||||||
|
"Output buffer size not equal ACConfig size");
|
||||||
|
|
||||||
|
Memory::WriteBlock(ac_config_addr, &default_config, sizeof(ACConfig));
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void ConnectAsync(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
connect_event = Kernel::g_handle_table.Get<Kernel::Event>(cmd_buff[4]);
|
||||||
|
if (connect_event) {
|
||||||
|
connect_event->name = "AC:connect_event";
|
||||||
|
connect_event->Signal();
|
||||||
|
ac_connected = true;
|
||||||
|
}
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetConnectResult(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void CloseAsync(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
if (ac_connected && disconnect_event) {
|
||||||
|
disconnect_event->Signal();
|
||||||
|
}
|
||||||
|
|
||||||
|
close_event = Kernel::g_handle_table.Get<Kernel::Event>(cmd_buff[4]);
|
||||||
|
if (close_event) {
|
||||||
|
close_event->name = "AC:close_event";
|
||||||
|
close_event->Signal();
|
||||||
|
}
|
||||||
|
|
||||||
|
ac_connected = false;
|
||||||
|
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetCloseResult(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetWifiStatus(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
// TODO(purpasmart96): This function is only a stub,
|
||||||
|
// it returns a valid result without implementing full functionality.
|
||||||
|
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
cmd_buff[2] = 0; // Connection type set to none
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void GetInfraPriority(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
cmd_buff[2] = 0; // Infra Priority, default 0
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void SetRequestEulaVersion(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
u32 major = cmd_buff[1] & 0xFF;
|
||||||
|
u32 minor = cmd_buff[2] & 0xFF;
|
||||||
|
|
||||||
|
ASSERT_MSG(cmd_buff[3] == (sizeof(ACConfig) << 14 | 2),
|
||||||
|
"Input buffer size not equal ACConfig size");
|
||||||
|
ASSERT_MSG(cmd_buff[64] == (sizeof(ACConfig) << 14 | 2),
|
||||||
|
"Output buffer size not equal ACConfig size");
|
||||||
|
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
cmd_buff[2] = 0; // Infra Priority
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called, major=%u, minor=%u", major, minor);
|
||||||
|
}
|
||||||
|
|
||||||
|
void RegisterDisconnectEvent(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
disconnect_event = Kernel::g_handle_table.Get<Kernel::Event>(cmd_buff[4]);
|
||||||
|
if (disconnect_event) {
|
||||||
|
disconnect_event->name = "AC:disconnect_event";
|
||||||
|
}
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void IsConnected(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
cmd_buff[2] = ac_connected;
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called");
|
||||||
|
}
|
||||||
|
|
||||||
|
void SetClientVersion(Interface* self) {
|
||||||
|
u32* cmd_buff = Kernel::GetCommandBuffer();
|
||||||
|
|
||||||
|
const u32 version = cmd_buff[1];
|
||||||
|
self->SetVersion(version);
|
||||||
|
|
||||||
|
LOG_WARNING(Service_AC, "(STUBBED) called, version: 0x%08X", version);
|
||||||
|
|
||||||
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
|
}
|
||||||
|
|
||||||
|
void Init() {
|
||||||
|
AddService(new AC_I);
|
||||||
|
AddService(new AC_U);
|
||||||
|
|
||||||
|
ac_connected = false;
|
||||||
|
|
||||||
|
close_event = nullptr;
|
||||||
|
connect_event = nullptr;
|
||||||
|
disconnect_event = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Shutdown() {
|
||||||
|
ac_connected = false;
|
||||||
|
|
||||||
|
close_event = nullptr;
|
||||||
|
connect_event = nullptr;
|
||||||
|
disconnect_event = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace AC
|
||||||
|
} // namespace Service
|
134
src/core/hle/service/ac/ac.h
Normal file
134
src/core/hle/service/ac/ac.h
Normal file
@ -0,0 +1,134 @@
|
|||||||
|
// Copyright 2016 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
|
||||||
|
class Interface;
|
||||||
|
|
||||||
|
namespace AC {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::CreateDefaultConfig service function
|
||||||
|
* Inputs:
|
||||||
|
* 64 : ACConfig size << 14 | 2
|
||||||
|
* 65 : pointer to ACConfig struct
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
void CreateDefaultConfig(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::ConnectAsync service function
|
||||||
|
* Inputs:
|
||||||
|
* 1 : ProcessId Header
|
||||||
|
* 3 : Copy Handle Header
|
||||||
|
* 4 : Connection Event handle
|
||||||
|
* 5 : ACConfig size << 14 | 2
|
||||||
|
* 6 : pointer to ACConfig struct
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
void ConnectAsync(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::GetConnectResult service function
|
||||||
|
* Inputs:
|
||||||
|
* 1 : ProcessId Header
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
void GetConnectResult(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::CloseAsync service function
|
||||||
|
* Inputs:
|
||||||
|
* 1 : ProcessId Header
|
||||||
|
* 3 : Copy Handle Header
|
||||||
|
* 4 : Event handle, should be signaled when AC connection is closed
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
void CloseAsync(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::GetCloseResult service function
|
||||||
|
* Inputs:
|
||||||
|
* 1 : ProcessId Header
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
void GetCloseResult(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::GetWifiStatus service function
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
* 2 : Output connection type, 0 = none, 1 = Old3DS Internet, 2 = New3DS Internet.
|
||||||
|
*/
|
||||||
|
void GetWifiStatus(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::GetInfraPriority service function
|
||||||
|
* Inputs:
|
||||||
|
* 1 : ACConfig size << 14 | 2
|
||||||
|
* 2 : pointer to ACConfig struct
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
* 2 : Infra Priority
|
||||||
|
*/
|
||||||
|
void GetInfraPriority(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::SetRequestEulaVersion service function
|
||||||
|
* Inputs:
|
||||||
|
* 1 : Eula Version major
|
||||||
|
* 2 : Eula Version minor
|
||||||
|
* 3 : ACConfig size << 14 | 2
|
||||||
|
* 4 : Input pointer to ACConfig struct
|
||||||
|
* 64 : ACConfig size << 14 | 2
|
||||||
|
* 65 : Output pointer to ACConfig struct
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
* 2 : Infra Priority
|
||||||
|
*/
|
||||||
|
void SetRequestEulaVersion(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::RegisterDisconnectEvent service function
|
||||||
|
* Inputs:
|
||||||
|
* 1 : ProcessId Header
|
||||||
|
* 3 : Copy Handle Header
|
||||||
|
* 4 : Event handle, should be signaled when AC connection is closed
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
void RegisterDisconnectEvent(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::IsConnected service function
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
* 2 : bool, is connected
|
||||||
|
*/
|
||||||
|
void IsConnected(Interface* self);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* AC::SetClientVersion service function
|
||||||
|
* Inputs:
|
||||||
|
* 1 : Used SDK Version
|
||||||
|
* Outputs:
|
||||||
|
* 1 : Result of function, 0 on success, otherwise error code
|
||||||
|
*/
|
||||||
|
void SetClientVersion(Interface* self);
|
||||||
|
|
||||||
|
/// Initialize AC service
|
||||||
|
void Init();
|
||||||
|
|
||||||
|
/// Shutdown AC service
|
||||||
|
void Shutdown();
|
||||||
|
|
||||||
|
} // namespace AC
|
||||||
|
} // namespace Service
|
39
src/core/hle/service/ac/ac_i.cpp
Normal file
39
src/core/hle/service/ac/ac_i.cpp
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// Copyright 2016 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include "core/hle/service/ac/ac.h"
|
||||||
|
#include "core/hle/service/ac/ac_i.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace AC {
|
||||||
|
|
||||||
|
const Interface::FunctionInfo FunctionTable[] = {
|
||||||
|
{0x00010000, CreateDefaultConfig, "CreateDefaultConfig"},
|
||||||
|
{0x00040006, ConnectAsync, "ConnectAsync"},
|
||||||
|
{0x00050002, GetConnectResult, "GetConnectResult"},
|
||||||
|
{0x00070002, nullptr, "CancelConnectAsync"},
|
||||||
|
{0x00080004, CloseAsync, "CloseAsync"},
|
||||||
|
{0x00090002, GetCloseResult, "GetCloseResult"},
|
||||||
|
{0x000A0000, nullptr, "GetLastErrorCode"},
|
||||||
|
{0x000C0000, nullptr, "GetStatus"},
|
||||||
|
{0x000D0000, GetWifiStatus, "GetWifiStatus"},
|
||||||
|
{0x000E0042, nullptr, "GetCurrentAPInfo"},
|
||||||
|
{0x00100042, nullptr, "GetCurrentNZoneInfo"},
|
||||||
|
{0x00110042, nullptr, "GetNZoneApNumService"},
|
||||||
|
{0x001D0042, nullptr, "ScanAPs"},
|
||||||
|
{0x00240042, nullptr, "AddDenyApType"},
|
||||||
|
{0x00270002, GetInfraPriority, "GetInfraPriority"},
|
||||||
|
{0x002D0082, SetRequestEulaVersion, "SetRequestEulaVersion"},
|
||||||
|
{0x00300004, RegisterDisconnectEvent, "RegisterDisconnectEvent"},
|
||||||
|
{0x003C0042, nullptr, "GetAPSSIDList"},
|
||||||
|
{0x003E0042, IsConnected, "IsConnected"},
|
||||||
|
{0x00400042, SetClientVersion, "SetClientVersion"},
|
||||||
|
};
|
||||||
|
|
||||||
|
AC_I::AC_I() {
|
||||||
|
Register(FunctionTable);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace AC
|
||||||
|
} // namespace Service
|
22
src/core/hle/service/ac/ac_i.h
Normal file
22
src/core/hle/service/ac/ac_i.h
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
// Copyright 2016 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "core/hle/service/service.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace AC {
|
||||||
|
|
||||||
|
class AC_I final : public Interface {
|
||||||
|
public:
|
||||||
|
AC_I();
|
||||||
|
|
||||||
|
std::string GetPortName() const override {
|
||||||
|
return "ac:i";
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace AC
|
||||||
|
} // namespace Service
|
39
src/core/hle/service/ac/ac_u.cpp
Normal file
39
src/core/hle/service/ac/ac_u.cpp
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
// Copyright 2014 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include "core/hle/service/ac/ac.h"
|
||||||
|
#include "core/hle/service/ac/ac_u.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace AC {
|
||||||
|
|
||||||
|
const Interface::FunctionInfo FunctionTable[] = {
|
||||||
|
{0x00010000, CreateDefaultConfig, "CreateDefaultConfig"},
|
||||||
|
{0x00040006, ConnectAsync, "ConnectAsync"},
|
||||||
|
{0x00050002, GetConnectResult, "GetConnectResult"},
|
||||||
|
{0x00070002, nullptr, "CancelConnectAsync"},
|
||||||
|
{0x00080004, CloseAsync, "CloseAsync"},
|
||||||
|
{0x00090002, GetCloseResult, "GetCloseResult"},
|
||||||
|
{0x000A0000, nullptr, "GetLastErrorCode"},
|
||||||
|
{0x000C0000, nullptr, "GetStatus"},
|
||||||
|
{0x000D0000, GetWifiStatus, "GetWifiStatus"},
|
||||||
|
{0x000E0042, nullptr, "GetCurrentAPInfo"},
|
||||||
|
{0x00100042, nullptr, "GetCurrentNZoneInfo"},
|
||||||
|
{0x00110042, nullptr, "GetNZoneApNumService"},
|
||||||
|
{0x001D0042, nullptr, "ScanAPs"},
|
||||||
|
{0x00240042, nullptr, "AddDenyApType"},
|
||||||
|
{0x00270002, GetInfraPriority, "GetInfraPriority"},
|
||||||
|
{0x002D0082, SetRequestEulaVersion, "SetRequestEulaVersion"},
|
||||||
|
{0x00300004, RegisterDisconnectEvent, "RegisterDisconnectEvent"},
|
||||||
|
{0x003C0042, nullptr, "GetAPSSIDList"},
|
||||||
|
{0x003E0042, IsConnected, "IsConnected"},
|
||||||
|
{0x00400042, SetClientVersion, "SetClientVersion"},
|
||||||
|
};
|
||||||
|
|
||||||
|
AC_U::AC_U() {
|
||||||
|
Register(FunctionTable);
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace AC
|
||||||
|
} // namespace Service
|
@ -12,7 +12,6 @@ namespace AC {
|
|||||||
class AC_U final : public Interface {
|
class AC_U final : public Interface {
|
||||||
public:
|
public:
|
||||||
AC_U();
|
AC_U();
|
||||||
~AC_U();
|
|
||||||
|
|
||||||
std::string GetPortName() const override {
|
std::string GetPortName() const override {
|
||||||
return "ac:u";
|
return "ac:u";
|
@ -1,291 +0,0 @@
|
|||||||
// Copyright 2014 Citra Emulator Project
|
|
||||||
// Licensed under GPLv2 or any later version
|
|
||||||
// Refer to the license.txt file included.
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
|
|
||||||
#include "common/logging/log.h"
|
|
||||||
#include "core/hle/kernel/event.h"
|
|
||||||
#include "core/hle/service/ac_u.h"
|
|
||||||
|
|
||||||
namespace Service {
|
|
||||||
namespace AC {
|
|
||||||
|
|
||||||
struct ACConfig {
|
|
||||||
std::array<u8, 0x200> data;
|
|
||||||
};
|
|
||||||
|
|
||||||
static ACConfig default_config{};
|
|
||||||
|
|
||||||
static bool ac_connected = false;
|
|
||||||
|
|
||||||
static Kernel::SharedPtr<Kernel::Event> close_event;
|
|
||||||
static Kernel::SharedPtr<Kernel::Event> connect_event;
|
|
||||||
static Kernel::SharedPtr<Kernel::Event> disconnect_event;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::CreateDefaultConfig service function
|
|
||||||
* Inputs:
|
|
||||||
* 64 : ACConfig size << 14 | 2
|
|
||||||
* 65 : pointer to ACConfig struct
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
*/
|
|
||||||
static void CreateDefaultConfig(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
u32 ac_config_addr = cmd_buff[65];
|
|
||||||
|
|
||||||
ASSERT_MSG(cmd_buff[64] == (sizeof(ACConfig) << 14 | 2),
|
|
||||||
"Output buffer size not equal ACConfig size");
|
|
||||||
|
|
||||||
Memory::WriteBlock(ac_config_addr, &default_config, sizeof(ACConfig));
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::ConnectAsync service function
|
|
||||||
* Inputs:
|
|
||||||
* 1 : ProcessId Header
|
|
||||||
* 3 : Copy Handle Header
|
|
||||||
* 4 : Connection Event handle
|
|
||||||
* 5 : ACConfig size << 14 | 2
|
|
||||||
* 6 : pointer to ACConfig struct
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
*/
|
|
||||||
static void ConnectAsync(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
connect_event = Kernel::g_handle_table.Get<Kernel::Event>(cmd_buff[4]);
|
|
||||||
if (connect_event) {
|
|
||||||
connect_event->name = "AC_U:connect_event";
|
|
||||||
connect_event->Signal();
|
|
||||||
ac_connected = true;
|
|
||||||
}
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::GetConnectResult service function
|
|
||||||
* Inputs:
|
|
||||||
* 1 : ProcessId Header
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
*/
|
|
||||||
static void GetConnectResult(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::CloseAsync service function
|
|
||||||
* Inputs:
|
|
||||||
* 1 : ProcessId Header
|
|
||||||
* 3 : Copy Handle Header
|
|
||||||
* 4 : Event handle, should be signaled when AC connection is closed
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
*/
|
|
||||||
static void CloseAsync(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
if (ac_connected && disconnect_event) {
|
|
||||||
disconnect_event->Signal();
|
|
||||||
}
|
|
||||||
|
|
||||||
close_event = Kernel::g_handle_table.Get<Kernel::Event>(cmd_buff[4]);
|
|
||||||
if (close_event) {
|
|
||||||
close_event->name = "AC_U:close_event";
|
|
||||||
close_event->Signal();
|
|
||||||
}
|
|
||||||
|
|
||||||
ac_connected = false;
|
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::GetCloseResult service function
|
|
||||||
* Inputs:
|
|
||||||
* 1 : ProcessId Header
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
*/
|
|
||||||
static void GetCloseResult(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::GetWifiStatus service function
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
* 2 : Output connection type, 0 = none, 1 = Old3DS Internet, 2 = New3DS Internet.
|
|
||||||
*/
|
|
||||||
static void GetWifiStatus(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
// TODO(purpasmart96): This function is only a stub,
|
|
||||||
// it returns a valid result without implementing full functionality.
|
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
cmd_buff[2] = 0; // Connection type set to none
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::GetInfraPriority service function
|
|
||||||
* Inputs:
|
|
||||||
* 1 : ACConfig size << 14 | 2
|
|
||||||
* 2 : pointer to ACConfig struct
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
* 2 : Infra Priority
|
|
||||||
*/
|
|
||||||
static void GetInfraPriority(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
cmd_buff[2] = 0; // Infra Priority, default 0
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::SetRequestEulaVersion service function
|
|
||||||
* Inputs:
|
|
||||||
* 1 : Eula Version major
|
|
||||||
* 2 : Eula Version minor
|
|
||||||
* 3 : ACConfig size << 14 | 2
|
|
||||||
* 4 : Input pointer to ACConfig struct
|
|
||||||
* 64 : ACConfig size << 14 | 2
|
|
||||||
* 65 : Output pointer to ACConfig struct
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
* 2 : Infra Priority
|
|
||||||
*/
|
|
||||||
static void SetRequestEulaVersion(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
u32 major = cmd_buff[1] & 0xFF;
|
|
||||||
u32 minor = cmd_buff[2] & 0xFF;
|
|
||||||
|
|
||||||
ASSERT_MSG(cmd_buff[3] == (sizeof(ACConfig) << 14 | 2),
|
|
||||||
"Input buffer size not equal ACConfig size");
|
|
||||||
ASSERT_MSG(cmd_buff[64] == (sizeof(ACConfig) << 14 | 2),
|
|
||||||
"Output buffer size not equal ACConfig size");
|
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
cmd_buff[2] = 0; // Infra Priority
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called, major=%u, minor=%u", major, minor);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::RegisterDisconnectEvent service function
|
|
||||||
* Inputs:
|
|
||||||
* 1 : ProcessId Header
|
|
||||||
* 3 : Copy Handle Header
|
|
||||||
* 4 : Event handle, should be signaled when AC connection is closed
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
*/
|
|
||||||
static void RegisterDisconnectEvent(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
disconnect_event = Kernel::g_handle_table.Get<Kernel::Event>(cmd_buff[4]);
|
|
||||||
if (disconnect_event) {
|
|
||||||
disconnect_event->name = "AC_U:disconnect_event";
|
|
||||||
}
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::IsConnected service function
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
* 2 : bool, is connected
|
|
||||||
*/
|
|
||||||
static void IsConnected(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
cmd_buff[2] = ac_connected;
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* AC_U::SetClientVersion service function
|
|
||||||
* Inputs:
|
|
||||||
* 1 : Used SDK Version
|
|
||||||
* Outputs:
|
|
||||||
* 1 : Result of function, 0 on success, otherwise error code
|
|
||||||
*/
|
|
||||||
static void SetClientVersion(Interface* self) {
|
|
||||||
u32* cmd_buff = Kernel::GetCommandBuffer();
|
|
||||||
|
|
||||||
const u32 version = cmd_buff[1];
|
|
||||||
self->SetVersion(version);
|
|
||||||
|
|
||||||
LOG_WARNING(Service_AC, "(STUBBED) called, version: 0x%08X", version);
|
|
||||||
|
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
|
||||||
}
|
|
||||||
|
|
||||||
const Interface::FunctionInfo FunctionTable[] = {
|
|
||||||
{0x00010000, CreateDefaultConfig, "CreateDefaultConfig"},
|
|
||||||
{0x00040006, ConnectAsync, "ConnectAsync"},
|
|
||||||
{0x00050002, GetConnectResult, "GetConnectResult"},
|
|
||||||
{0x00070002, nullptr, "CancelConnectAsync"},
|
|
||||||
{0x00080004, CloseAsync, "CloseAsync"},
|
|
||||||
{0x00090002, GetCloseResult, "GetCloseResult"},
|
|
||||||
{0x000A0000, nullptr, "GetLastErrorCode"},
|
|
||||||
{0x000C0000, nullptr, "GetStatus"},
|
|
||||||
{0x000D0000, GetWifiStatus, "GetWifiStatus"},
|
|
||||||
{0x000E0042, nullptr, "GetCurrentAPInfo"},
|
|
||||||
{0x00100042, nullptr, "GetCurrentNZoneInfo"},
|
|
||||||
{0x00110042, nullptr, "GetNZoneApNumService"},
|
|
||||||
{0x001D0042, nullptr, "ScanAPs"},
|
|
||||||
{0x00240042, nullptr, "AddDenyApType"},
|
|
||||||
{0x00270002, GetInfraPriority, "GetInfraPriority"},
|
|
||||||
{0x002D0082, SetRequestEulaVersion, "SetRequestEulaVersion"},
|
|
||||||
{0x00300004, RegisterDisconnectEvent, "RegisterDisconnectEvent"},
|
|
||||||
{0x003C0042, nullptr, "GetAPSSIDList"},
|
|
||||||
{0x003E0042, IsConnected, "IsConnected"},
|
|
||||||
{0x00400042, SetClientVersion, "SetClientVersion"},
|
|
||||||
};
|
|
||||||
|
|
||||||
AC_U::AC_U() {
|
|
||||||
Register(FunctionTable);
|
|
||||||
|
|
||||||
ac_connected = false;
|
|
||||||
|
|
||||||
close_event = nullptr;
|
|
||||||
connect_event = nullptr;
|
|
||||||
disconnect_event = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
AC_U::~AC_U() {
|
|
||||||
close_event = nullptr;
|
|
||||||
connect_event = nullptr;
|
|
||||||
disconnect_event = nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace AC
|
|
||||||
} // namespace Service
|
|
@ -6,9 +6,8 @@
|
|||||||
|
|
||||||
#include "common/logging/log.h"
|
#include "common/logging/log.h"
|
||||||
#include "common/string_util.h"
|
#include "common/string_util.h"
|
||||||
|
|
||||||
#include "core/hle/kernel/server_port.h"
|
#include "core/hle/kernel/server_port.h"
|
||||||
#include "core/hle/service/ac_u.h"
|
#include "core/hle/service/ac/ac.h"
|
||||||
#include "core/hle/service/act/act.h"
|
#include "core/hle/service/act/act.h"
|
||||||
#include "core/hle/service/am/am.h"
|
#include "core/hle/service/am/am.h"
|
||||||
#include "core/hle/service/apt/apt.h"
|
#include "core/hle/service/apt/apt.h"
|
||||||
@ -138,6 +137,7 @@ void Init() {
|
|||||||
AddNamedPort(new ERR::ERR_F);
|
AddNamedPort(new ERR::ERR_F);
|
||||||
|
|
||||||
FS::ArchiveInit();
|
FS::ArchiveInit();
|
||||||
|
AC::Init();
|
||||||
ACT::Init();
|
ACT::Init();
|
||||||
AM::Init();
|
AM::Init();
|
||||||
APT::Init();
|
APT::Init();
|
||||||
@ -158,7 +158,6 @@ void Init() {
|
|||||||
PTM::Init();
|
PTM::Init();
|
||||||
QTM::Init();
|
QTM::Init();
|
||||||
|
|
||||||
AddService(new AC::AC_U);
|
|
||||||
AddService(new CSND::CSND_SND);
|
AddService(new CSND::CSND_SND);
|
||||||
AddService(new DSP_DSP::Interface);
|
AddService(new DSP_DSP::Interface);
|
||||||
AddService(new GSP::GSP_GPU);
|
AddService(new GSP::GSP_GPU);
|
||||||
@ -192,6 +191,7 @@ void Shutdown() {
|
|||||||
BOSS::Shutdown();
|
BOSS::Shutdown();
|
||||||
APT::Shutdown();
|
APT::Shutdown();
|
||||||
AM::Shutdown();
|
AM::Shutdown();
|
||||||
|
AC::Shutdown();
|
||||||
FS::ArchiveShutdown();
|
FS::ArchiveShutdown();
|
||||||
|
|
||||||
g_srv_services.clear();
|
g_srv_services.clear();
|
||||||
|
Loading…
Reference in New Issue
Block a user