mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-04-26 01:56:34 -05:00
AMMediaboard: Move things from global namespace to AMMediaboard namespace.
This commit is contained in:
parent
f00b1c590e
commit
282e14cce6
|
|
@ -75,14 +75,14 @@ static int WSAGetLastError()
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
namespace AMMediaboard
|
||||||
|
{
|
||||||
|
|
||||||
MediaBoardRange::MediaBoardRange(u32 start_, u32 size_, std::span<u8> buffer_)
|
MediaBoardRange::MediaBoardRange(u32 start_, u32 size_, std::span<u8> buffer_)
|
||||||
: start{start_}, end{start_ + size_}, buffer{buffer_.data()}, buffer_size{buffer_.size()}
|
: start{start_}, end{start_ + size_}, buffer{buffer_.data()}, buffer_size{buffer_.size()}
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace AMMediaboard
|
|
||||||
{
|
|
||||||
|
|
||||||
using Common::SEND_FLAGS;
|
using Common::SEND_FLAGS;
|
||||||
|
|
||||||
enum class GuestSocket : s32
|
enum class GuestSocket : s32
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,15 @@
|
||||||
|
|
||||||
#include "DiscIO/Volume.h"
|
#include "DiscIO/Volume.h"
|
||||||
|
|
||||||
|
namespace Core
|
||||||
|
{
|
||||||
|
class CPUThreadGuard;
|
||||||
|
class System;
|
||||||
|
} // namespace Core
|
||||||
|
|
||||||
|
namespace AMMediaboard
|
||||||
|
{
|
||||||
|
|
||||||
enum GameType
|
enum GameType
|
||||||
{
|
{
|
||||||
FZeroAX = 1,
|
FZeroAX = 1,
|
||||||
|
|
@ -59,12 +68,6 @@ enum InquiryType
|
||||||
Version2 = 0x29484100,
|
Version2 = 0x29484100,
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace Core
|
|
||||||
{
|
|
||||||
class CPUThreadGuard;
|
|
||||||
class System;
|
|
||||||
} // namespace Core
|
|
||||||
|
|
||||||
struct MediaBoardRange
|
struct MediaBoardRange
|
||||||
{
|
{
|
||||||
u32 start;
|
u32 start;
|
||||||
|
|
@ -75,9 +78,6 @@ struct MediaBoardRange
|
||||||
MediaBoardRange(u32 start_, u32 size_, std::span<u8> buffer_);
|
MediaBoardRange(u32 start_, u32 size_, std::span<u8> buffer_);
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace AMMediaboard
|
|
||||||
{
|
|
||||||
|
|
||||||
enum class AMMBDICommand : u16
|
enum class AMMBDICommand : u16
|
||||||
{
|
{
|
||||||
Inquiry = 0x12,
|
Inquiry = 0x12,
|
||||||
|
|
|
||||||
|
|
@ -77,8 +77,8 @@ CEXIBaseboard::CEXIBaseboard(Core::System& system) : IEXIDevice(system)
|
||||||
|
|
||||||
// Virtua Striker 4 and Gekitou Pro Yakyuu need a higher FIRM version
|
// Virtua Striker 4 and Gekitou Pro Yakyuu need a higher FIRM version
|
||||||
// Which is read from the backup data?!
|
// Which is read from the backup data?!
|
||||||
if (AMMediaboard::GetGameType() == VirtuaStriker4 ||
|
if (AMMediaboard::GetGameType() == AMMediaboard::VirtuaStriker4 ||
|
||||||
AMMediaboard::GetGameType() == GekitouProYakyuu)
|
AMMediaboard::GetGameType() == AMMediaboard::GekitouProYakyuu)
|
||||||
{
|
{
|
||||||
const u64 backup_size = m_backup.GetSize();
|
const u64 backup_size = m_backup.GetSize();
|
||||||
if (backup_size >= 0x20C + 0x1F4)
|
if (backup_size >= 0x20C + 0x1F4)
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,8 @@
|
||||||
|
|
||||||
namespace SerialInterface
|
namespace SerialInterface
|
||||||
{
|
{
|
||||||
|
using namespace AMMediaboard;
|
||||||
|
|
||||||
void JVSIOMessage::Start(int node)
|
void JVSIOMessage::Start(int node)
|
||||||
{
|
{
|
||||||
m_last_start = m_pointer;
|
m_last_start = m_pointer;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user