Mirrors/yuzu
2
0
Fork 0
mirror of https://github.com/yuzu-mirror/yuzu synced 2024-11-24 07:13:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

service: nfp: address comments

Browse source
This commit is contained in:
german77 2022-09-24 22:52:33 -05:00
parent afea5c163f
commit 3ce0ef04dd
9 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/input.h
View file

@ -332,7 +332,7 @@ public:
return CameraError::NotSupported;
}
virtual NfcState SupportsNfc() {
virtual NfcState SupportsNfc() const {
return NfcState::NotSupported;
}

2
src/core/hid/input_converter.cpp
View file

@ -291,7 +291,7 @@ Common::Input::NfcStatus TransformToNfc(const Common::Input::CallbackStatus& cal
Common::Input::NfcStatus nfc{};
switch (callback.type) {
case Common::Input::InputType::Nfc:
nfc = callback.nfc_status;
return callback.nfc_status;
break;
default:
LOG_ERROR(Input, "Conversion from type {} to NFC not implemented", callback.type);

9
src/core/hle/service/nfp/nfp_device.cpp
View file

@ -42,10 +42,11 @@ NfpDevice::NfpDevice(Core::HID::NpadIdType npad_id_, Core::System& system_,
}
NfpDevice::~NfpDevice() {
if (is_controller_set) {
if (!is_controller_set) {
return;
}
npad_device->DeleteCallback(callback_key);
is_controller_set = false;
}
};
void NfpDevice::NpadUpdate(Core::HID::ControllerTriggerType type) {
@ -453,7 +454,7 @@ Result NfpDevice::SetApplicationArea(const std::vector<u8>& data) {
return ResultSuccess;
}
Result NfpDevice::CreateApplicationArea(u32 access_id, const std::vector<u8>& data) {
Result NfpDevice::CreateApplicationArea(u32 access_id, std::span<const u8> data) {
if (device_state != DeviceState::TagMounted) {
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
if (device_state == DeviceState::TagRemoved) {
@ -470,7 +471,7 @@ Result NfpDevice::CreateApplicationArea(u32 access_id, const std::vector<u8>& da
return RecreateApplicationArea(access_id, data);
}
Result NfpDevice::RecreateApplicationArea(u32 access_id, const std::vector<u8>& data) {
Result NfpDevice::RecreateApplicationArea(u32 access_id, std::span<const u8> data) {
if (device_state != DeviceState::TagMounted) {
LOG_ERROR(Service_NFP, "Wrong device state {}", device_state);
if (device_state == DeviceState::TagRemoved) {

4
src/core/hle/service/nfp/nfp_device.h
View file

@ -56,8 +56,8 @@ public:
Result OpenApplicationArea(u32 access_id);
Result GetApplicationArea(std::vector<u8>& data) const;
Result SetApplicationArea(const std::vector<u8>& data);
Result CreateApplicationArea(u32 access_id, const std::vector<u8>& data);
Result RecreateApplicationArea(u32 access_id, const std::vector<u8>& data);
Result CreateApplicationArea(u32 access_id, std::span<const u8> data);
Result RecreateApplicationArea(u32 access_id, std::span<const u8> data);
Result DeleteApplicationArea();
u64 GetHandle() const;

25
src/core/hle/service/nfp/nfp_types.h
View file

@ -5,6 +5,7 @@
#include <array>
#include "common/swap.h"
#include "core/hle/service/mii/types.h"
namespace Service::NFP {
@ -80,33 +81,33 @@ using ApplicationArea = std::array<u8, 0xD8>;
using AmiiboName = std::array<char, (amiibo_name_length * 4) + 1>;
struct AmiiboDate {
u16_be raw_date{};
u16 raw_date{};
u16 DateRaw() const {
return static_cast<u16>(raw_date);
u16 GetValue() const {
return Common::swap16(raw_date);
}
u16 GetYear() const {
return static_cast<u16>(((DateRaw() & 0xFE00) >> 9) + 2000);
return static_cast<u16>(((GetValue() & 0xFE00) >> 9) + 2000);
}
u8 GetMonth() const {
return static_cast<u8>(((DateRaw() & 0x01E0) >> 5) - 1);
return static_cast<u8>(((GetValue() & 0x01E0) >> 5) - 1);
}
u8 GetDay() const {
return static_cast<u8>(DateRaw() & 0x001F);
return static_cast<u8>(GetValue() & 0x001F);
}
void SetYear(u16 year) {
raw_date = DateRaw() & ~0xFE00;
raw_date |= static_cast<u16_be>((year - 2000) << 9);
const u16 year_converted = static_cast<u16>((year - 2000) << 9);
raw_date = Common::swap16((GetValue() & ~0xFE00) | year_converted);
}
void SetMonth(u8 month) {
raw_date = DateRaw() & ~0x01E0;
raw_date |= static_cast<u16_be>((month + 1) << 5);
const u16 month_converted = static_cast<u16>((month + 1) << 5);
raw_date = Common::swap16((GetValue() & ~0x01E0) | month_converted);
}
void SetDay(u8 day) {
raw_date = DateRaw() & ~0x001F;
raw_date |= static_cast<u16_be>(day);
const u16 day_converted = static_cast<u16>(day);
raw_date = Common::swap16((GetValue() & ~0x001F) | day_converted);
}
};
static_assert(sizeof(AmiiboDate) == 2, "AmiiboDate is an invalid size");

4
src/input_common/drivers/virtual_amiibo.cpp
View file

@ -20,7 +20,7 @@ constexpr PadIdentifier identifier = {
VirtualAmiibo::VirtualAmiibo(std::string input_engine_) : InputEngine(std::move(input_engine_)) {}
VirtualAmiibo::~VirtualAmiibo() {}
VirtualAmiibo::~VirtualAmiibo() = default;
Common::Input::PollingError VirtualAmiibo::SetPollingMode(
[[maybe_unused]] const PadIdentifier& identifier_,
@ -41,7 +41,7 @@ Common::Input::PollingError VirtualAmiibo::SetPollingMode(
}
Common::Input::NfcState VirtualAmiibo::SupportsNfc(
[[maybe_unused]] const PadIdentifier& identifier_) {
[[maybe_unused]] const PadIdentifier& identifier_) const {
return Common::Input::NfcState::Success;
}

2
src/input_common/drivers/virtual_amiibo.h
View file

@ -39,7 +39,7 @@ public:
Common::Input::PollingError SetPollingMode(
const PadIdentifier& identifier_, const Common::Input::PollingMode polling_mode_) override;
Common::Input::NfcState SupportsNfc(const PadIdentifier& identifier_) override;
Common::Input::NfcState SupportsNfc(const PadIdentifier& identifier_) const override;
Common::Input::NfcState WriteNfcData(const PadIdentifier& identifier_,
const std::vector<u8>& data) override;

3
src/input_common/input_engine.h
View file

@ -129,7 +129,8 @@ public:
}
// Request nfc data from a controller
virtual Common::Input::NfcState SupportsNfc([[maybe_unused]] const PadIdentifier& identifier) {
virtual Common::Input::NfcState SupportsNfc(
[[maybe_unused]] const PadIdentifier& identifier) const {
return Common::Input::NfcState::NotSupported;
}

2
src/input_common/input_poller.cpp
View file

@ -768,7 +768,7 @@ public:
return input_engine->SetCameraFormat(identifier, camera_format);
}
Common::Input::NfcState SupportsNfc() override {
Common::Input::NfcState SupportsNfc() const override {
return input_engine->SupportsNfc(identifier);
}