early-access version 3625

src/input_common/drivers/virtual_amiibo.cpp

@@ -73,7 +73,10 @@ VirtualAmiibo::State VirtualAmiibo::GetCurrentState() const {
 VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(const std::string& filename) {
     const Common::FS::IOFile nfc_file{filename, Common::FS::FileAccessMode::Read,
                                       Common::FS::FileType::BinaryFile};
-    std::vector<u8> data{};
+
+    if (state != State::WaitingForAmiibo) {
+        return Info::WrongDeviceState;
+    }
 
     if (!nfc_file.IsOpen()) {
         return Info::UnableToLoad;
@@ -98,28 +101,7 @@ VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(const std::string& filename) {
     }
 
     file_path = filename;
-    return LoadAmiibo(data);
-}
-
-VirtualAmiibo::Info VirtualAmiibo::LoadAmiibo(std::span<u8> data) {
-    if (state != State::WaitingForAmiibo) {
-        return Info::WrongDeviceState;
-    }
-
-    switch (data.size_bytes()) {
-    case AmiiboSize:
-    case AmiiboSizeWithoutPassword:
-        nfc_data.resize(AmiiboSize);
-        break;
-    case MifareSize:
-        nfc_data.resize(MifareSize);
-        break;
-    default:
-        return Info::NotAnAmiibo;
-    }
-
     state = State::AmiiboIsOpen;
-    memcpy(nfc_data.data(), data.data(), data.size_bytes());
     SetNfc(identifier, {Common::Input::NfcState::NewAmiibo, nfc_data});
     return Info::Success;
 }

src/input_common/drivers/virtual_amiibo.h

@@ -4,7 +4,6 @@
 #pragma once
 
 #include <array>
-#include <span>
 #include <string>
 #include <vector>
 
@@ -48,7 +47,6 @@ public:
     State GetCurrentState() const;
 
     Info LoadAmiibo(const std::string& amiibo_file);
-    Info LoadAmiibo(std::span<u8> data);
     Info ReloadAmiibo();
     Info CloseAmiibo();
 

src/input_common/drivers/virtual_gamepad.cpp

@@ -39,22 +39,6 @@ void VirtualGamepad::SetStickPosition(std::size_t player_index, VirtualStick axi
     SetStickPosition(player_index, static_cast<int>(axis_id), x_value, y_value);
 }
 
-void VirtualGamepad::SetMotionState(std::size_t player_index, u64 delta_timestamp, float gyro_x,
-                                    float gyro_y, float gyro_z, float accel_x, float accel_y,
-                                    float accel_z) {
-    const auto identifier = GetIdentifier(player_index);
-    const BasicMotion motion_data{
-        .gyro_x = gyro_x,
-        .gyro_y = gyro_y,
-        .gyro_z = gyro_z,
-        .accel_x = accel_x,
-        .accel_y = accel_y,
-        .accel_z = accel_z,
-        .delta_timestamp = delta_timestamp,
-    };
-    SetMotion(identifier, 0, motion_data);
-}
-
 void VirtualGamepad::ResetControllers() {
     for (std::size_t i = 0; i < PlayerIndexCount; i++) {
         SetStickPosition(i, VirtualStick::Left, 0.0f, 0.0f);

src/input_common/drivers/virtual_gamepad.h

@@ -52,7 +52,7 @@ public:
     void SetButtonState(std::size_t player_index, VirtualButton button_id, bool value);
 
     /**
-     * Sets the status of a stick to a specific player index
+     * Sets the status of all buttons bound with the key to released
      * @param player_index the player number that will take this action
      * @param axis_id the id of the axis to move
      * @param x_value the position of the stick in the x axis
@@ -62,16 +62,6 @@ public:
     void SetStickPosition(std::size_t player_index, VirtualStick axis_id, float x_value,
                           float y_value);
 
-    /**
-     * Sets the status of the motion sensor to a specific player index
-     * @param player_index the player number that will take this action
-     * @param delta_timestamp time passed since last reading
-     * @param gyro_x,gyro_y,gyro_z the gyro sensor readings
-     * @param accel_x,accel_y,accel_z the acelerometer reading
-     */
-    void SetMotionState(std::size_t player_index, u64 delta_timestamp, float gyro_x, float gyro_y,
-                        float gyro_z, float accel_x, float accel_y, float accel_z);
-
     /// Restores all inputs into the neutral position
     void ResetControllers();