mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-24 22:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13385 from Tilka/sp2_ad16

Browse source 
Fix AD16 and make SP2 configurable
This commit is contained in:
JMC47 2025-03-23 15:20:45 -04:00 • committed by GitHub
commit 178462e10f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/Core/Config/MainSettings.cpp
View file

@ -116,6 +116,8 @@ const Info<ExpansionInterface::EXIDeviceType> MAIN_SLOT_B{{System::Main, "Core",
ExpansionInterface::EXIDeviceType::None}; ExpansionInterface::EXIDeviceType::None};
const Info<ExpansionInterface::EXIDeviceType> MAIN_SERIAL_PORT_1{ const Info<ExpansionInterface::EXIDeviceType> MAIN_SERIAL_PORT_1{
{System::Main, "Core", "SerialPort1"}, ExpansionInterface::EXIDeviceType::None}; {System::Main, "Core", "SerialPort1"}, ExpansionInterface::EXIDeviceType::None};
const Info<ExpansionInterface::EXIDeviceType> MAIN_SERIAL_PORT_2{
{System::Main, "Core", "SerialPort2"}, ExpansionInterface::EXIDeviceType::None};
const Info<ExpansionInterface::EXIDeviceType>& GetInfoForEXIDevice(ExpansionInterface::Slot slot) const Info<ExpansionInterface::EXIDeviceType>& GetInfoForEXIDevice(ExpansionInterface::Slot slot)
{ {
@ -125,6 +127,7 @@ const Info<ExpansionInterface::EXIDeviceType>& GetInfoForEXIDevice(ExpansionInte
&MAIN_SLOT_A, &MAIN_SLOT_A,
&MAIN_SLOT_B, &MAIN_SLOT_B,
&MAIN_SERIAL_PORT_1, &MAIN_SERIAL_PORT_1,
&MAIN_SERIAL_PORT_2,
}; };
return *infos[slot]; return *infos[slot];
} }

1
Source/Core/Core/Config/MainSettings.h
View file

@ -89,6 +89,7 @@ extern const Info<int> MAIN_MEMORY_CARD_SIZE;
extern const Info<ExpansionInterface::EXIDeviceType> MAIN_SLOT_A; extern const Info<ExpansionInterface::EXIDeviceType> MAIN_SLOT_A;
extern const Info<ExpansionInterface::EXIDeviceType> MAIN_SLOT_B; extern const Info<ExpansionInterface::EXIDeviceType> MAIN_SLOT_B;
extern const Info<ExpansionInterface::EXIDeviceType> MAIN_SERIAL_PORT_1; extern const Info<ExpansionInterface::EXIDeviceType> MAIN_SERIAL_PORT_1;
extern const Info<ExpansionInterface::EXIDeviceType> MAIN_SERIAL_PORT_2;
const Info<ExpansionInterface::EXIDeviceType>& GetInfoForEXIDevice(ExpansionInterface::Slot slot); const Info<ExpansionInterface::EXIDeviceType>& GetInfoForEXIDevice(ExpansionInterface::Slot slot);
extern const Info<std::string> MAIN_BBA_MAC; extern const Info<std::string> MAIN_BBA_MAC;
extern const Info<std::string> MAIN_BBA_XLINK_IP; extern const Info<std::string> MAIN_BBA_XLINK_IP;

7
Source/Core/Core/HW/EXI/EXI.cpp
View file

@ -76,6 +76,8 @@ u8 SlotToEXIChannel(Slot slot)
return 1; return 1;
case Slot::SP1: case Slot::SP1:
return 0; return 0;
case Slot::SP2:
return 2;
default: default:
PanicAlertFmt("Unhandled slot {}", slot); PanicAlertFmt("Unhandled slot {}", slot);
return 0; return 0;
@ -92,6 +94,8 @@ u8 SlotToEXIDevice(Slot slot)
return 0; return 0;
case Slot::SP1: case Slot::SP1:
return 2; return 2;
case Slot::SP2:
return 0;
default: default:
PanicAlertFmt("Unhandled slot {}", slot); PanicAlertFmt("Unhandled slot {}", slot);
return 0; return 0;
@ -143,7 +147,8 @@ void ExpansionInterfaceManager::Init(const Sram* override_sram)
m_channels[0]->AddDevice(EXIDeviceType::MaskROM, 1); m_channels[0]->AddDevice(EXIDeviceType::MaskROM, 1);
m_channels[SlotToEXIChannel(Slot::SP1)]->AddDevice(Config::Get(Config::MAIN_SERIAL_PORT_1), m_channels[SlotToEXIChannel(Slot::SP1)]->AddDevice(Config::Get(Config::MAIN_SERIAL_PORT_1),
SlotToEXIDevice(Slot::SP1)); SlotToEXIDevice(Slot::SP1));
m_channels[2]->AddDevice(EXIDeviceType::AD16, 0); m_channels[SlotToEXIChannel(Slot::SP2)]->AddDevice(Config::Get(Config::MAIN_SERIAL_PORT_2),
SlotToEXIDevice(Slot::SP2));
m_event_type_change_device = core_timing.RegisterEvent("ChangeEXIDevice", ChangeDeviceCallback); m_event_type_change_device = core_timing.RegisterEvent("ChangeEXIDevice", ChangeDeviceCallback);
m_event_type_update_interrupts = m_event_type_update_interrupts =

7
Source/Core/Core/HW/EXI/EXI.h
View file

@ -44,11 +44,12 @@ enum class Slot : int
A, A,
B, B,
SP1, SP1,
SP2,
}; };
// Note: using auto here results in a false warning on GCC // Note: using auto here results in a false warning on GCC
// See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80351 // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80351
constexpr std::initializer_list<Slot> SLOTS = {Slot::A, Slot::B, Slot::SP1}; constexpr std::initializer_list<Slot> SLOTS = {Slot::A, Slot::B, Slot::SP1, Slot::SP2};
constexpr auto MAX_SLOT = Slot::SP1; constexpr auto MAX_SLOT = Slot::SP2;
constexpr std::initializer_list<Slot> MEMCARD_SLOTS = {Slot::A, Slot::B}; constexpr std::initializer_list<Slot> MEMCARD_SLOTS = {Slot::A, Slot::B};
constexpr auto MAX_MEMCARD_SLOT = Slot::B; constexpr auto MAX_MEMCARD_SLOT = Slot::B;
constexpr bool IsMemcardSlot(Slot slot) constexpr bool IsMemcardSlot(Slot slot)
@ -106,5 +107,5 @@ private:
template <> template <>
struct fmt::formatter<ExpansionInterface::Slot> : EnumFormatter<ExpansionInterface::MAX_SLOT> struct fmt::formatter<ExpansionInterface::Slot> : EnumFormatter<ExpansionInterface::MAX_SLOT>
{ {
constexpr formatter() : EnumFormatter({"Slot A", "Slot B", "Serial Port 1"}) {} constexpr formatter() : EnumFormatter({"Slot A", "Slot B", "Serial Port 1", "Serial Port 2"}) {}
}; };

4
Source/Core/Core/HW/EXI/EXI_DeviceAD16.cpp
View file

@ -6,6 +6,7 @@
#include "Common/Assert.h" #include "Common/Assert.h"
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Swap.h"
namespace ExpansionInterface namespace ExpansionInterface
{ {
@ -36,7 +37,7 @@ void CEXIAD16::TransferByte(u8& byte)
{ {
case init: case init:
{ {
m_ad16_register.U32 = 0x04120000; m_ad16_register.U32 = Common::swap32(0x04120000);
switch (m_position) switch (m_position)
{ {
case 1: case 1:
@ -73,6 +74,7 @@ void CEXIAD16::TransferByte(u8& byte)
break; break;
case 4: case 4:
m_ad16_register.U8[3] = byte; m_ad16_register.U8[3] = byte;
INFO_LOG_FMT(EXPANSIONINTERFACE, "AD16 received: 0x{:08X}", m_ad16_register.U32);
break; break;
} }
} }

2
Source/Core/Core/HW/EXI/EXI_DeviceAD16.h
View file

@ -28,7 +28,7 @@ private:
union AD16Reg union AD16Reg
{ {
u32 U32 = 0; u32 U32 = 0;
u32 U8[4]; u8 U8[4];
}; };
// STATE_TO_SAVE // STATE_TO_SAVE

2
Source/Core/Core/State.cpp
View file

@ -99,7 +99,7 @@ static size_t s_state_writes_in_queue;
static std::condition_variable s_state_write_queue_is_empty; static std::condition_variable s_state_write_queue_is_empty;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
constexpr u32 STATE_VERSION = 171; // Last changed in PR 13416 constexpr u32 STATE_VERSION = 172; // Last changed in PR 13385
// Increase this if the StateExtendedHeader definition changes // Increase this if the StateExtendedHeader definition changes
constexpr u32 EXTENDED_HEADER_VERSION = 1; // Last changed in PR 12217 constexpr u32 EXTENDED_HEADER_VERSION = 1; // Last changed in PR 12217

20
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View file

@ -44,13 +44,8 @@
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"
#include "DolphinQt/Settings/BroadbandAdapterSettingsDialog.h" #include "DolphinQt/Settings/BroadbandAdapterSettingsDialog.h"
enum constexpr std::initializer_list<ExpansionInterface::Slot> GUI_SLOTS = {
{ ExpansionInterface::Slot::A, ExpansionInterface::Slot::B, ExpansionInterface::Slot::SP1};
SLOT_A_INDEX,
SLOT_B_INDEX,
SLOT_SP1_INDEX,
SLOT_COUNT
};
GameCubePane::GameCubePane() GameCubePane::GameCubePane()
{ {
@ -95,7 +90,7 @@ void GameCubePane::CreateWidgets()
QGridLayout* device_layout = new QGridLayout(device_box); QGridLayout* device_layout = new QGridLayout(device_box);
device_box->setLayout(device_layout); device_box->setLayout(device_layout);
for (ExpansionInterface::Slot slot : ExpansionInterface::SLOTS) for (ExpansionInterface::Slot slot : GUI_SLOTS)
{ {
m_slot_combos[slot] = new QComboBox(device_box); m_slot_combos[slot] = new QComboBox(device_box);
m_slot_combos[slot]->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); m_slot_combos[slot]->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
@ -251,7 +246,7 @@ void GameCubePane::ConnectWidgets()
connect(m_language_combo, &QComboBox::currentIndexChanged, this, &GameCubePane::SaveSettings); connect(m_language_combo, &QComboBox::currentIndexChanged, this, &GameCubePane::SaveSettings);
// Device Settings // Device Settings
for (ExpansionInterface::Slot slot : ExpansionInterface::SLOTS) for (ExpansionInterface::Slot slot : GUI_SLOTS)
{ {
connect(m_slot_combos[slot], &QComboBox::currentIndexChanged, this, connect(m_slot_combos[slot], &QComboBox::currentIndexChanged, this,
[this, slot] { UpdateButton(slot); }); [this, slot] { UpdateButton(slot); });
@ -358,6 +353,9 @@ void GameCubePane::UpdateButton(ExpansionInterface::Slot slot)
device == ExpansionInterface::EXIDeviceType::EthernetBuiltIn || device == ExpansionInterface::EXIDeviceType::EthernetBuiltIn ||
device == ExpansionInterface::EXIDeviceType::ModemTapServer); device == ExpansionInterface::EXIDeviceType::ModemTapServer);
break; break;
case ExpansionInterface::Slot::SP2:
has_config = false;
break;
} }
m_slot_buttons[slot]->setEnabled(has_config); m_slot_buttons[slot]->setEnabled(has_config);
@ -739,7 +737,7 @@ void GameCubePane::LoadSettings()
m_skip_main_menu->setToolTip(have_menu ? QString{} : tr("Put IPL ROMs in User/GC/<region>.")); m_skip_main_menu->setToolTip(have_menu ? QString{} : tr("Put IPL ROMs in User/GC/<region>."));
// Device Settings // Device Settings
for (ExpansionInterface::Slot slot : ExpansionInterface::SLOTS) for (ExpansionInterface::Slot slot : GUI_SLOTS)
{ {
const ExpansionInterface::EXIDeviceType exi_device = const ExpansionInterface::EXIDeviceType exi_device =
Config::Get(Config::GetInfoForEXIDevice(slot)); Config::Get(Config::GetInfoForEXIDevice(slot));
@ -784,7 +782,7 @@ void GameCubePane::SaveSettings()
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
// Device Settings // Device Settings
for (ExpansionInterface::Slot slot : ExpansionInterface::SLOTS) for (ExpansionInterface::Slot slot : GUI_SLOTS)
{ {
const auto dev = const auto dev =
static_cast<ExpansionInterface::EXIDeviceType>(m_slot_combos[slot]->currentData().toInt()); static_cast<ExpansionInterface::EXIDeviceType>(m_slot_combos[slot]->currentData().toInt());

4
Source/Core/DolphinQt/Settings/GameCubePane.h
View file

@ -55,8 +55,8 @@ private:
QCheckBox* m_skip_main_menu; QCheckBox* m_skip_main_menu;
QComboBox* m_language_combo; QComboBox* m_language_combo;
Common::EnumMap<QPushButton*, ExpansionInterface::MAX_SLOT> m_slot_buttons; Common::EnumMap<QPushButton*, ExpansionInterface::Slot::SP1> m_slot_buttons;
Common::EnumMap<QComboBox*, ExpansionInterface::MAX_SLOT> m_slot_combos; Common::EnumMap<QComboBox*, ExpansionInterface::Slot::SP1> m_slot_combos;
Common::EnumMap<QHBoxLayout*, ExpansionInterface::MAX_MEMCARD_SLOT> m_memcard_path_layouts; Common::EnumMap<QHBoxLayout*, ExpansionInterface::MAX_MEMCARD_SLOT> m_memcard_path_layouts;
Common::EnumMap<QLabel*, ExpansionInterface::MAX_MEMCARD_SLOT> m_memcard_path_labels; Common::EnumMap<QLabel*, ExpansionInterface::MAX_MEMCARD_SLOT> m_memcard_path_labels;