Merge pull request #857 from lioncash/wlan

service: Add wlan services
merge-requests/60/head
bunnei 2018-07-30 10:06:52 +07:00 committed by GitHub
commit c5fa3560a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 194 additions and 1 deletions

@ -193,6 +193,7 @@ void FileBackend::Write(const Entry& entry) {
SUB(Service, SSL) \
SUB(Service, Time) \
SUB(Service, VI) \
SUB(Service, WLAN) \
CLS(HW) \
SUB(HW, Memory) \
SUB(HW, LCD) \

@ -80,6 +80,7 @@ enum class Class : ClassType {
Service_SSL, ///< The SSL service
Service_Time, ///< The time service
Service_VI, ///< The VI (Video interface) service
Service_WLAN, ///< The WLAN (Wireless local area network) service
HW, ///< Low-level hardware emulation
HW_Memory, ///< Memory-map and address translation
HW_LCD, ///< LCD register emulation

@ -279,6 +279,8 @@ add_library(core STATIC
hle/service/vi/vi_s.h
hle/service/vi/vi_u.cpp
hle/service/vi/vi_u.h
hle/service/wlan/wlan.cpp
hle/service/wlan/wlan.h
hw/hw.cpp
hw/hw.h
hw/lcd.cpp

@ -56,6 +56,7 @@
#include "core/hle/service/ssl/ssl.h"
#include "core/hle/service/time/time.h"
#include "core/hle/service/vi/vi.h"
#include "core/hle/service/wlan/wlan.h"
using Kernel::ClientPort;
using Kernel::ServerPort;
@ -227,12 +228,13 @@ void Init(std::shared_ptr<SM::ServiceManager>& sm) {
PCTL::InstallInterfaces(*sm);
PlayReport::InstallInterfaces(*sm);
PM::InstallInterfaces(*sm);
Set::InstallInterfaces(*sm);
Sockets::InstallInterfaces(*sm);
SPL::InstallInterfaces(*sm);
SSL::InstallInterfaces(*sm);
Time::InstallInterfaces(*sm);
VI::InstallInterfaces(*sm, nv_flinger);
Set::InstallInterfaces(*sm);
WLAN::InstallInterfaces(*sm);
LOG_DEBUG(Service, "initialized OK");
}

@ -0,0 +1,172 @@
// Copyright 2018 yuzu emulator team
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#include <memory>
#include "core/hle/service/service.h"
#include "core/hle/service/sm/sm.h"
#include "core/hle/service/wlan/wlan.h"
namespace Service::WLAN {
class WLANInfra final : public ServiceFramework<WLANInfra> {
public:
explicit WLANInfra() : ServiceFramework{"wlan:inf"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "Unknown1"},
{1, nullptr, "Unknown2"},
{2, nullptr, "GetMacAddress"},
{3, nullptr, "StartScan"},
{4, nullptr, "StopScan"},
{5, nullptr, "Connect"},
{6, nullptr, "CancelConnect"},
{7, nullptr, "Disconnect"},
{8, nullptr, "Unknown3"},
{9, nullptr, "Unknown4"},
{10, nullptr, "GetState"},
{11, nullptr, "GetScanResult"},
{12, nullptr, "GetRssi"},
{13, nullptr, "ChangeRxAntenna"},
{14, nullptr, "Unknown5"},
{15, nullptr, "Unknown6"},
{16, nullptr, "RequestWakeUp"},
{17, nullptr, "RequestIfUpDown"},
{18, nullptr, "Unknown7"},
{19, nullptr, "Unknown8"},
{20, nullptr, "Unknown9"},
{21, nullptr, "Unknown10"},
{22, nullptr, "Unknown11"},
{23, nullptr, "Unknown12"},
{24, nullptr, "Unknown13"},
{25, nullptr, "Unknown14"},
{26, nullptr, "Unknown15"},
{27, nullptr, "Unknown16"},
};
// clang-format on
RegisterHandlers(functions);
}
};
class WLANLocal final : public ServiceFramework<WLANLocal> {
public:
explicit WLANLocal() : ServiceFramework{"wlan:lcl"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "Unknown1"},
{1, nullptr, "Unknown2"},
{2, nullptr, "Unknown3"},
{3, nullptr, "Unknown4"},
{4, nullptr, "Unknown5"},
{5, nullptr, "Unknown6"},
{6, nullptr, "GetMacAddress"},
{7, nullptr, "CreateBss"},
{8, nullptr, "DestroyBss"},
{9, nullptr, "StartScan"},
{10, nullptr, "StopScan"},
{11, nullptr, "Connect"},
{12, nullptr, "CancelConnect"},
{13, nullptr, "Join"},
{14, nullptr, "CancelJoin"},
{15, nullptr, "Disconnect"},
{16, nullptr, "SetBeaconLostCount"},
{17, nullptr, "Unknown7"},
{18, nullptr, "Unknown8"},
{19, nullptr, "Unknown9"},
{20, nullptr, "GetBssIndicationEvent"},
{21, nullptr, "GetBssIndicationInfo"},
{22, nullptr, "GetState"},
{23, nullptr, "GetAllowedChannels"},
{24, nullptr, "AddIe"},
{25, nullptr, "DeleteIe"},
{26, nullptr, "Unknown10"},
{27, nullptr, "Unknown11"},
{28, nullptr, "CreateRxEntry"},
{29, nullptr, "DeleteRxEntry"},
{30, nullptr, "Unknown12"},
{31, nullptr, "Unknown13"},
{32, nullptr, "AddMatchingDataToRxEntry"},
{33, nullptr, "RemoveMatchingDataFromRxEntry"},
{34, nullptr, "GetScanResult"},
{35, nullptr, "Unknown14"},
{36, nullptr, "SetActionFrameWithBeacon"},
{37, nullptr, "CancelActionFrameWithBeacon"},
{38, nullptr, "CreateRxEntryForActionFrame"},
{39, nullptr, "DeleteRxEntryForActionFrame"},
{40, nullptr, "Unknown15"},
{41, nullptr, "Unknown16"},
{42, nullptr, "CancelGetActionFrame"},
{43, nullptr, "GetRssi"},
{44, nullptr, "Unknown17"},
{45, nullptr, "Unknown18"},
{46, nullptr, "Unknown19"},
{47, nullptr, "Unknown20"},
{48, nullptr, "Unknown21"},
};
// clang-format on
RegisterHandlers(functions);
}
};
class WLANLocalGetFrame final : public ServiceFramework<WLANLocalGetFrame> {
public:
explicit WLANLocalGetFrame() : ServiceFramework{"wlan:lg"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "Unknown"},
};
// clang-format on
RegisterHandlers(functions);
}
};
class WLANSocketGetFrame final : public ServiceFramework<WLANSocketGetFrame> {
public:
explicit WLANSocketGetFrame() : ServiceFramework{"wlan:sg"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "Unknown"},
};
// clang-format on
RegisterHandlers(functions);
}
};
class WLANSocketManager final : public ServiceFramework<WLANSocketManager> {
public:
explicit WLANSocketManager() : ServiceFramework{"wlan:soc"} {
// clang-format off
static const FunctionInfo functions[] = {
{0, nullptr, "Unknown1"},
{1, nullptr, "Unknown2"},
{2, nullptr, "Unknown3"},
{3, nullptr, "Unknown4"},
{4, nullptr, "Unknown5"},
{5, nullptr, "Unknown6"},
{6, nullptr, "GetMacAddress"},
{7, nullptr, "SwitchTsfTimerFunction"},
{8, nullptr, "Unknown7"},
{9, nullptr, "Unknown8"},
{10, nullptr, "Unknown9"},
{11, nullptr, "Unknown10"},
};
// clang-format on
RegisterHandlers(functions);
}
};
void InstallInterfaces(SM::ServiceManager& sm) {
std::make_shared<WLANInfra>()->InstallAsService(sm);
std::make_shared<WLANLocal>()->InstallAsService(sm);
std::make_shared<WLANLocalGetFrame>()->InstallAsService(sm);
std::make_shared<WLANSocketGetFrame>()->InstallAsService(sm);
std::make_shared<WLANSocketManager>()->InstallAsService(sm);
}
} // namespace Service::WLAN

@ -0,0 +1,15 @@
// Copyright 2018 yuzu emulator team
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
#pragma once
namespace Service::SM {
class ServiceManager;
}
namespace Service::WLAN {
void InstallInterfaces(SM::ServiceManager& sm);
} // namespace Service::WLAN