Merge pull request #8083 from Techjar/clang-7-format
Reformat repo to clang-format 7.0 rules
This commit is contained in:
commit
6f6c7e5df0
|
@ -730,4 +730,4 @@ float InputDevice::AxisValue(int padID, ButtonType axis)
|
|||
else
|
||||
return _buttons[binding->second->_buttontype] == BUTTON_PRESSED ? 1.0f : 0.0f;
|
||||
}
|
||||
}
|
||||
} // namespace ButtonManager
|
||||
|
|
|
@ -256,4 +256,4 @@ float GetAxisValue(int padID, ButtonType axis);
|
|||
bool GamepadEvent(const std::string& dev, int button, int action);
|
||||
void GamepadAxisEvent(const std::string& dev, int axis, float value);
|
||||
void Shutdown();
|
||||
}
|
||||
} // namespace ButtonManager
|
||||
|
|
|
@ -31,4 +31,4 @@ void StopAudioDump();
|
|||
void IncreaseVolume(unsigned short offset);
|
||||
void DecreaseVolume(unsigned short offset);
|
||||
void ToggleMuteVolume();
|
||||
}
|
||||
} // namespace AudioCommon
|
||||
|
|
|
@ -25,4 +25,4 @@ private:
|
|||
double m_stretch_ratio = 1.0;
|
||||
};
|
||||
|
||||
} // AudioCommon
|
||||
} // namespace AudioCommon
|
||||
|
|
|
@ -33,4 +33,4 @@ private:
|
|||
FixedSizeQueue<float, 32768> m_decoded_fifo;
|
||||
};
|
||||
|
||||
} // AudioCommon
|
||||
} // namespace AudioCommon
|
||||
|
|
|
@ -4380,4 +4380,4 @@ void ARM64FloatEmitter::MOVI2FDUP(ARM64Reg Rd, float value, ARM64Reg scratch)
|
|||
DUP(32, Rd, Rd, 0);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace Arm64Gen
|
||||
|
|
|
@ -1143,4 +1143,4 @@ private:
|
|||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
} // namespace Arm64Gen
|
||||
|
|
|
@ -83,4 +83,4 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
|
|||
{
|
||||
return __atomic_exchange_n(&loc, newval, __ATOMIC_ACQ_REL);
|
||||
}
|
||||
}
|
||||
} // namespace Common
|
||||
|
|
|
@ -91,4 +91,4 @@ inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
|
|||
{
|
||||
return (T*)_InterlockedExchangePointer_acq((void* volatile*)&loc, (void*)newval);
|
||||
}
|
||||
}
|
||||
} // namespace Common
|
||||
|
|
|
@ -253,4 +253,4 @@ private:
|
|||
Flag m_may_sleep; // If this is set, we fall back from the busy loop to an event based
|
||||
// synchronization.
|
||||
};
|
||||
}
|
||||
} // namespace Common
|
||||
|
|
|
@ -32,4 +32,4 @@ bool ConfigLocation::operator<(const ConfigLocation& other) const
|
|||
const int key_compare = strcasecmp(key.c_str(), other.key.c_str());
|
||||
return key_compare < 0;
|
||||
}
|
||||
}
|
||||
} // namespace Config
|
||||
|
|
|
@ -50,4 +50,4 @@ struct ConfigInfo
|
|||
ConfigLocation location;
|
||||
T default_value;
|
||||
};
|
||||
}
|
||||
} // namespace Config
|
||||
|
|
|
@ -41,4 +41,4 @@ constexpr std::array<LayerType, 7> SEARCH_ORDER{{
|
|||
LayerType::GlobalGame,
|
||||
LayerType::Base,
|
||||
}};
|
||||
}
|
||||
} // namespace Config
|
||||
|
|
|
@ -97,4 +97,4 @@ const LayerMap& Layer::GetLayerMap() const
|
|||
{
|
||||
return m_map;
|
||||
}
|
||||
}
|
||||
} // namespace Config
|
||||
|
|
|
@ -42,7 +42,7 @@ inline std::optional<std::string> TryParse(const std::string& str_value)
|
|||
{
|
||||
return str_value;
|
||||
}
|
||||
}
|
||||
} // namespace detail
|
||||
|
||||
template <typename T>
|
||||
struct ConfigInfo;
|
||||
|
@ -154,4 +154,4 @@ protected:
|
|||
const LayerType m_layer;
|
||||
std::unique_ptr<ConfigLayerLoader> m_loader;
|
||||
};
|
||||
}
|
||||
} // namespace Config
|
||||
|
|
|
@ -36,4 +36,4 @@ int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event)
|
|||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
} // namespace ENetUtil
|
||||
|
|
|
@ -10,4 +10,4 @@ namespace ENetUtil
|
|||
{
|
||||
void WakeupThread(ENetHost* host);
|
||||
int ENET_CALLBACK InterceptCallback(ENetHost* host, ENetEvent* event);
|
||||
}
|
||||
} // namespace ENetUtil
|
||||
|
|
|
@ -43,4 +43,4 @@ void SetSIMDMode(int rounding_mode, bool non_ieee_mode);
|
|||
void SaveSIMDState();
|
||||
void LoadSIMDState();
|
||||
void LoadDefaultSIMDState();
|
||||
}
|
||||
} // namespace FPURoundMode
|
||||
|
|
|
@ -106,8 +106,8 @@ bool GLContextAGL::Initialize(void* display_handle, void* window_handle, bool st
|
|||
|
||||
std::unique_ptr<GLContext> GLContextAGL::CreateSharedContext()
|
||||
{
|
||||
NSOpenGLContext* new_agl_context =
|
||||
[[NSOpenGLContext alloc] initWithFormat:m_pixel_format shareContext:m_context];
|
||||
NSOpenGLContext* new_agl_context = [[NSOpenGLContext alloc] initWithFormat:m_pixel_format
|
||||
shareContext:m_context];
|
||||
if (new_agl_context == nil)
|
||||
{
|
||||
ERROR_LOG(VIDEO, "failed to create shared context");
|
||||
|
|
|
@ -969,7 +969,7 @@ void GekkoDisassembler::mtfsb(u32 in, int n)
|
|||
}
|
||||
}
|
||||
|
||||
// Paired instructions
|
||||
// Paired instructions
|
||||
|
||||
#define RA ((inst >> 16) & 0x1f)
|
||||
#define RB ((inst >> 11) & 0x1f)
|
||||
|
|
|
@ -26,4 +26,4 @@ void LoadSIMDState()
|
|||
void LoadDefaultSIMDState()
|
||||
{
|
||||
}
|
||||
}
|
||||
} // namespace FPURoundMode
|
||||
|
|
|
@ -110,4 +110,4 @@ void RegisterV(const void* base_address, u32 code_size, const char* format, va_l
|
|||
s_perf_map_file.WriteBytes(entry.data(), entry.size());
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace JitRegister
|
||||
|
|
|
@ -30,4 +30,4 @@ inline void Register(const void* start, const void* end, const char* format, ...
|
|||
RegisterV(start, code_size, format, args);
|
||||
va_end(args);
|
||||
}
|
||||
}
|
||||
} // namespace JitRegister
|
||||
|
|
|
@ -46,4 +46,4 @@ private:
|
|||
|
||||
mutable std::variant<T, std::function<T()>> m_value;
|
||||
};
|
||||
}
|
||||
} // namespace Common
|
||||
|
|
|
@ -72,7 +72,7 @@ enum LOG_LEVELS
|
|||
|
||||
static const char LOG_LEVEL_TO_CHAR[7] = "-NEWID";
|
||||
|
||||
} // namespace
|
||||
} // namespace LogTypes
|
||||
|
||||
void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* file, int line,
|
||||
const char* fmt, ...)
|
||||
|
|
|
@ -49,4 +49,4 @@ std::string MD5Sum(const std::string& file_path, std::function<bool(int)> report
|
|||
|
||||
return output_string;
|
||||
}
|
||||
}
|
||||
} // namespace MD5
|
||||
|
|
|
@ -161,4 +161,4 @@ std::string Profiler::Read()
|
|||
|
||||
return buffer.str();
|
||||
}
|
||||
}
|
||||
} // namespace Common
|
||||
|
|
|
@ -55,7 +55,7 @@ public:
|
|||
private:
|
||||
Profiler* m_p;
|
||||
};
|
||||
};
|
||||
}; // namespace Common
|
||||
|
||||
// Warning: This profiler isn't thread safe. Only profile functions which doesn't run simultaneously
|
||||
#define PROFILE(name) \
|
||||
|
|
|
@ -107,4 +107,4 @@ private:
|
|||
ElementPtr* m_read_ptr;
|
||||
std::atomic<u32> m_size;
|
||||
};
|
||||
}
|
||||
} // namespace Common
|
||||
|
|
|
@ -112,7 +112,7 @@ struct hash<TraversalHostId>
|
|||
return p[0] ^ ((p[1] << 13) | (p[1] >> 19));
|
||||
}
|
||||
};
|
||||
}
|
||||
} // namespace std
|
||||
|
||||
static int sock;
|
||||
static std::unordered_map<TraversalRequestId, OutgoingPacketInfo> outgoingPackets;
|
||||
|
|
|
@ -12,6 +12,6 @@ namespace UPnP
|
|||
{
|
||||
void TryPortmapping(u16 port);
|
||||
void StopPortmapping();
|
||||
}
|
||||
} // namespace UPnP
|
||||
|
||||
#endif
|
||||
|
|
|
@ -3389,4 +3389,4 @@ void XEmitter::RDTSC()
|
|||
Write8(0x0F);
|
||||
Write8(0x31);
|
||||
}
|
||||
}
|
||||
} // namespace Gen
|
||||
|
|
|
@ -1177,4 +1177,4 @@ private:
|
|||
}
|
||||
};
|
||||
|
||||
} // namespace
|
||||
} // namespace Gen
|
||||
|
|
|
@ -61,4 +61,4 @@ void LoadDefaultSIMDState()
|
|||
{
|
||||
_mm_setcsr(default_sse_state);
|
||||
}
|
||||
}
|
||||
} // namespace FPURoundMode
|
||||
|
|
|
@ -14,4 +14,4 @@ namespace ActionReplay
|
|||
{
|
||||
void DecryptARCode(std::vector<std::string> vCodes, std::vector<AREntry>* ops);
|
||||
|
||||
} // namespace
|
||||
} // namespace ActionReplay
|
||||
|
|
|
@ -48,4 +48,4 @@ void EnableSelfLogging(bool enable);
|
|||
std::vector<std::string> GetSelfLog();
|
||||
void ClearSelfLog();
|
||||
bool IsSelfLogging();
|
||||
} // namespace
|
||||
} // namespace ActionReplay
|
||||
|
|
|
@ -10,10 +10,10 @@ namespace Config
|
|||
{
|
||||
class ConfigLayerLoader;
|
||||
enum class LayerType;
|
||||
}
|
||||
} // namespace Config
|
||||
|
||||
namespace ConfigLoaders
|
||||
{
|
||||
void SaveToSYSCONF(Config::LayerType layer);
|
||||
std::unique_ptr<Config::ConfigLayerLoader> GenerateBaseConfigLoader();
|
||||
}
|
||||
} // namespace ConfigLoaders
|
||||
|
|
|
@ -25,4 +25,4 @@ std::unique_ptr<Config::ConfigLayerLoader> GenerateGlobalGameConfigLoader(const
|
|||
u16 revision);
|
||||
std::unique_ptr<Config::ConfigLayerLoader> GenerateLocalGameConfigLoader(const std::string& id,
|
||||
u16 revision);
|
||||
}
|
||||
} // namespace ConfigLoaders
|
||||
|
|
|
@ -15,4 +15,4 @@ namespace ConfigLoaders
|
|||
// systems to co-exist without trampling on each other while saving.
|
||||
// This function shall be removed when the old configuration system retires.
|
||||
bool IsSettingSaveable(const Config::ConfigLocation& config_location);
|
||||
} // namespace ConfigLoader
|
||||
} // namespace ConfigLoaders
|
||||
|
|
|
@ -32,4 +32,4 @@ private:
|
|||
|
||||
void SaveToDTM(Movie::DTMHeader* header);
|
||||
std::unique_ptr<Config::ConfigLayerLoader> GenerateMovieConfigLoader(Movie::DTMHeader* header);
|
||||
}
|
||||
} // namespace ConfigLoaders
|
||||
|
|
|
@ -442,4 +442,4 @@ void SetFakeTBStartTicks(u64 val)
|
|||
g.fake_TB_start_ticks = val;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace CoreTiming
|
||||
|
|
|
@ -108,4 +108,4 @@ void SetFakeTBStartTicks(u64 val);
|
|||
|
||||
void ForceExceptionCheck(s64 cycles);
|
||||
|
||||
} // end of namespace
|
||||
} // namespace CoreTiming
|
||||
|
|
|
@ -495,7 +495,7 @@ void nop(const UDSPInstruction opc)
|
|||
}
|
||||
|
||||
} // namespace Ext
|
||||
} // namespace Interpeter
|
||||
} // namespace Interpreter
|
||||
|
||||
// The ext ops are calculated in parallel with the actual op. That means that
|
||||
// both the main op and the ext op see the same register state as input. The
|
||||
|
|
|
@ -44,5 +44,5 @@ void nr(UDSPInstruction opc);
|
|||
void nop(UDSPInstruction opc);
|
||||
|
||||
} // namespace Ext
|
||||
} // namespace Interpeter
|
||||
} // namespace Interpreter
|
||||
} // namespace DSP
|
||||
|
|
|
@ -159,4 +159,4 @@ void PrintDataBuffer(LogTypes::LOG_TYPE type, const u8* data, size_t size, const
|
|||
}
|
||||
}
|
||||
|
||||
} // end of namespace Debugger
|
||||
} // namespace Dolphin_Debugger
|
||||
|
|
|
@ -25,4 +25,4 @@ void PrintDataBuffer(LogTypes::LOG_TYPE type, const u8* data, size_t size,
|
|||
const std::string& title);
|
||||
void AddAutoBreakpoints();
|
||||
|
||||
} // end of namespace Debugger
|
||||
} // namespace Dolphin_Debugger
|
||||
|
|
|
@ -290,4 +290,4 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory& cpMe
|
|||
vtxDescHex >>= 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace FifoAnalyzer
|
||||
|
|
|
@ -38,4 +38,4 @@ void CalculateVertexElementSizes(int sizes[], int vatIndex, const CPMemory& cpMe
|
|||
|
||||
extern bool s_DrawingObject;
|
||||
extern FifoAnalyzer::CPMemory s_CpMem;
|
||||
}
|
||||
} // namespace FifoAnalyzer
|
||||
|
|
|
@ -253,4 +253,4 @@ void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes)
|
|||
inifile.SetLines("Gecko", lines);
|
||||
inifile.SetLines("Gecko_Enabled", enabledLines);
|
||||
}
|
||||
}
|
||||
} // namespace Gecko
|
||||
|
|
|
@ -15,4 +15,4 @@ namespace Gecko
|
|||
std::vector<GeckoCode> LoadCodes(const IniFile& globalIni, const IniFile& localIni);
|
||||
std::vector<GeckoCode> DownloadCodes(std::string gametdb_id, bool* succeeded);
|
||||
void SaveCodes(IniFile& inifile, const std::vector<GeckoCode>& gcodes);
|
||||
}
|
||||
} // namespace Gecko
|
||||
|
|
|
@ -68,4 +68,4 @@ void GeckoReturnTrampoline()
|
|||
PowerPC::HostRead_U64(SP + 24 + (2 * i + 1) * sizeof(u64)));
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace HLE_Misc
|
||||
|
|
|
@ -10,4 +10,4 @@ void UnimplementedFunction();
|
|||
void HBReload();
|
||||
void GeckoCodeHandlerICacheFlush();
|
||||
void GeckoReturnTrampoline();
|
||||
}
|
||||
} // namespace HLE_Misc
|
||||
|
|
|
@ -14,4 +14,4 @@ void HLE_LogDPrint();
|
|||
void HLE_LogVDPrint();
|
||||
void HLE_LogFPrint();
|
||||
void HLE_LogVFPrint();
|
||||
}
|
||||
} // namespace HLE_OS
|
||||
|
|
|
@ -28,4 +28,4 @@ unsigned int GetAIDSampleRate();
|
|||
|
||||
void GenerateAISInterrupt();
|
||||
|
||||
} // namespace
|
||||
} // namespace AudioInterface
|
||||
|
|
|
@ -328,4 +328,4 @@ bool PauseAndLock(bool do_lock, bool unpause_on_unlock, bool control_adjacent)
|
|||
}
|
||||
return was_unpaused;
|
||||
}
|
||||
}
|
||||
} // namespace CPU
|
||||
|
|
|
@ -74,4 +74,4 @@ const State* GetStatePtr();
|
|||
// "control_adjacent" causes PauseAndLock to behave like EnableStepping by modifying the
|
||||
// state of the Audio and FIFO subsystems as well.
|
||||
bool PauseAndLock(bool do_lock, bool unpause_on_unlock = true, bool control_adjacent = false);
|
||||
}
|
||||
} // namespace CPU
|
||||
|
|
|
@ -460,8 +460,8 @@ void ProcessVoice(PB_TYPE& pb, const AXBuffers& buffers, u16 count, AXMixControl
|
|||
pb.lpf.yn1 = LowPassFilter(samples, count, pb.lpf.yn1, pb.lpf.a0, pb.lpf.b0);
|
||||
}
|
||||
|
||||
// Mix LRS, AUXA and AUXB depending on mixer_control
|
||||
// TODO: Handle DPL2 on AUXB.
|
||||
// Mix LRS, AUXA and AUXB depending on mixer_control
|
||||
// TODO: Handle DPL2 on AUXB.
|
||||
|
||||
#define MIX_ON(C) (0 != (mctrl & MIX_##C))
|
||||
#define RAMP_ON(C) (0 != (mctrl & MIX_##C##_RAMP))
|
||||
|
|
|
@ -16,7 +16,7 @@ namespace DiscIO
|
|||
{
|
||||
class Volume;
|
||||
struct Partition;
|
||||
}
|
||||
} // namespace DiscIO
|
||||
namespace MMIO
|
||||
{
|
||||
class Mapping;
|
||||
|
|
|
@ -388,4 +388,4 @@ static void DVDThread()
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace DVDThread
|
||||
|
|
|
@ -23,15 +23,15 @@ namespace DiscIO
|
|||
{
|
||||
enum class Platform;
|
||||
class Volume;
|
||||
}
|
||||
} // namespace DiscIO
|
||||
namespace IOS
|
||||
{
|
||||
namespace ES
|
||||
{
|
||||
class TMDReader;
|
||||
class TicketReader;
|
||||
}
|
||||
}
|
||||
} // namespace ES
|
||||
} // namespace IOS
|
||||
|
||||
namespace DVDThread
|
||||
{
|
||||
|
@ -60,4 +60,4 @@ void StartRead(u64 dvd_offset, u32 length, const DiscIO::Partition& partition,
|
|||
void StartReadToEmulatedRAM(u32 output_address, u64 dvd_offset, u32 length,
|
||||
const DiscIO::Partition& partition, DVDInterface::ReplyType reply_type,
|
||||
s64 ticks_until_completion);
|
||||
}
|
||||
} // namespace DVDThread
|
||||
|
|
|
@ -10,7 +10,7 @@ namespace DiscIO
|
|||
{
|
||||
struct Partition;
|
||||
class Volume;
|
||||
}
|
||||
} // namespace DiscIO
|
||||
|
||||
namespace FileMonitor
|
||||
{
|
||||
|
|
|
@ -25,4 +25,4 @@ InputConfig* GetConfig();
|
|||
ControllerEmu::ControlGroup* GetGroup(int port, KeyboardGroup group);
|
||||
|
||||
KeyboardStatus GetStatus(int port);
|
||||
}
|
||||
} // namespace Keyboard
|
||||
|
|
|
@ -14,7 +14,7 @@ namespace ControllerEmu
|
|||
{
|
||||
class ControlGroup;
|
||||
class Buttons;
|
||||
}
|
||||
} // namespace ControllerEmu
|
||||
|
||||
enum class KeyboardGroup
|
||||
{
|
||||
|
|
|
@ -31,4 +31,4 @@ void Rumble(int pad_num, ControlState strength);
|
|||
void ResetRumble(int pad_num);
|
||||
|
||||
bool GetMicButton(int pad_num);
|
||||
}
|
||||
} // namespace Pad
|
||||
|
|
|
@ -40,4 +40,4 @@ void FastWrite8(u8 value);
|
|||
void FastWrite16(u16 value);
|
||||
void FastWrite32(u32 value);
|
||||
void FastWrite64(u64 value);
|
||||
}
|
||||
} // namespace GPFifo
|
||||
|
|
|
@ -108,4 +108,4 @@ void DoState(PointerWrap& p)
|
|||
|
||||
p.DoMarker("WIIHW");
|
||||
}
|
||||
}
|
||||
} // namespace HW
|
||||
|
|
|
@ -11,4 +11,4 @@ namespace HW
|
|||
void Init();
|
||||
void Shutdown();
|
||||
void DoState(PointerWrap& p);
|
||||
}
|
||||
} // namespace HW
|
||||
|
|
|
@ -387,4 +387,4 @@ void WriteHandler<T>::ResetMethod(WriteHandlingMethod<T>* method)
|
|||
#define MaybeExtern
|
||||
MMIO_PUBLIC_SPECIALIZATIONS()
|
||||
#undef MaybeExtern
|
||||
}
|
||||
} // namespace MMIO
|
||||
|
|
|
@ -91,7 +91,7 @@ inline u16* HighPart(volatile u32* ptr)
|
|||
{
|
||||
return LowPart(ptr) + 1;
|
||||
}
|
||||
}
|
||||
} // namespace Utils
|
||||
|
||||
class Mapping
|
||||
{
|
||||
|
@ -220,4 +220,4 @@ inline void Mapping::Write(u32 addr, u64 val)
|
|||
{
|
||||
DEBUG_ASSERT(0);
|
||||
}
|
||||
}
|
||||
} // namespace MMIO
|
||||
|
|
|
@ -237,4 +237,4 @@ private:
|
|||
#define MaybeExtern extern
|
||||
MMIO_PUBLIC_SPECIALIZATIONS()
|
||||
#undef MaybeExtern
|
||||
}
|
||||
} // namespace MMIO
|
||||
|
|
|
@ -461,4 +461,4 @@ void Write_U64_Swap(u64 value, u32 address)
|
|||
std::memcpy(GetPointer(address), &value, sizeof(u64));
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace Memory
|
||||
|
|
|
@ -110,4 +110,4 @@ void CopyToEmuSwapped(u32 address, const T* data, size_t size)
|
|||
for (size_t i = 0; i < size / sizeof(T); i++)
|
||||
dest[i] = Common::FromBigEndian(data[i]);
|
||||
}
|
||||
}
|
||||
} // namespace Memory
|
||||
|
|
|
@ -70,4 +70,4 @@ void ADPCMDecoder::DecodeBlock(s16* pcm, const u8* adpcm)
|
|||
m_histr1, m_histr2);
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace StreamADPCM
|
||||
|
|
|
@ -31,4 +31,4 @@ private:
|
|||
s32 m_histr1 = 0;
|
||||
s32 m_histr2 = 0;
|
||||
};
|
||||
}
|
||||
} // namespace StreamADPCM
|
||||
|
|
|
@ -20,8 +20,8 @@ namespace FS
|
|||
class FileSystem;
|
||||
}
|
||||
class IOSC;
|
||||
}
|
||||
} // namespace IOS::HLE
|
||||
} // namespace HLE
|
||||
} // namespace IOS
|
||||
|
||||
namespace WiiSave
|
||||
{
|
||||
|
|
|
@ -125,4 +125,4 @@ void InitAdapterClass()
|
|||
jclass adapter_class = env->FindClass("org/dolphinemu/dolphinemu/utils/Java_WiimoteAdapter");
|
||||
s_adapter_class = reinterpret_cast<jclass>(env->NewGlobalRef(adapter_class));
|
||||
}
|
||||
}
|
||||
} // namespace WiimoteReal
|
||||
|
|
|
@ -49,7 +49,7 @@ public:
|
|||
void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override;
|
||||
void Update() override {}
|
||||
};
|
||||
}
|
||||
} // namespace WiimoteReal
|
||||
|
||||
#else
|
||||
#include "Core/HW/WiimoteReal/IODummy.h"
|
||||
|
|
|
@ -17,4 +17,4 @@ public:
|
|||
void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override {}
|
||||
void Update() override {}
|
||||
};
|
||||
}
|
||||
} // namespace WiimoteReal
|
||||
|
|
|
@ -275,4 +275,4 @@ int WiimoteLinux::IOWrite(u8 const* buf, size_t len)
|
|||
return write(m_int_sock, buf, (int)len);
|
||||
}
|
||||
|
||||
}; // WiimoteReal
|
||||
}; // namespace WiimoteReal
|
||||
|
|
|
@ -51,7 +51,7 @@ private:
|
|||
int m_device_id;
|
||||
int m_device_sock;
|
||||
};
|
||||
}
|
||||
} // namespace WiimoteReal
|
||||
|
||||
#else
|
||||
#include "Core/HW/WiimoteReal/IODummy.h"
|
||||
|
|
|
@ -53,7 +53,7 @@ public:
|
|||
void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override;
|
||||
void Update() override;
|
||||
};
|
||||
}
|
||||
} // namespace WiimoteReal
|
||||
|
||||
#else
|
||||
#include "Core/HW/WiimoteReal/IODummy.h"
|
||||
|
|
|
@ -20,7 +20,7 @@ public:
|
|||
private:
|
||||
bool stopScanning = false;
|
||||
};
|
||||
}
|
||||
} // namespace WiimoteReal
|
||||
|
||||
#else
|
||||
#include "Core/HW/WiimoteReal/IODummy.h"
|
||||
|
|
|
@ -257,13 +257,12 @@ void WiimoteDarwin::DisablePowerAssertionInternal()
|
|||
@implementation SearchBT
|
||||
- (void)deviceInquiryComplete:(IOBluetoothDeviceInquiry*)sender
|
||||
error:(IOReturn)error
|
||||
aborted:(BOOL)aborted
|
||||
{
|
||||
aborted:(BOOL)aborted {
|
||||
done = true;
|
||||
}
|
||||
|
||||
- (void)deviceInquiryDeviceFound:(IOBluetoothDeviceInquiry*)sender device:(IOBluetoothDevice*)device
|
||||
{
|
||||
- (void)deviceInquiryDeviceFound:(IOBluetoothDeviceInquiry*)sender
|
||||
device:(IOBluetoothDevice*)device {
|
||||
NOTICE_LOG(WIIMOTE, "Discovered Bluetooth device at %s: %s", [[device addressString] UTF8String],
|
||||
[[device name] UTF8String]);
|
||||
|
||||
|
@ -275,8 +274,7 @@ void WiimoteDarwin::DisablePowerAssertionInternal()
|
|||
@implementation ConnectBT
|
||||
- (void)l2capChannelData:(IOBluetoothL2CAPChannel*)l2capChannel
|
||||
data:(unsigned char*)data
|
||||
length:(NSUInteger)length
|
||||
{
|
||||
length:(NSUInteger)length {
|
||||
IOBluetoothDevice* device = [l2capChannel device];
|
||||
WiimoteReal::WiimoteDarwin* wm = nullptr;
|
||||
|
||||
|
@ -316,8 +314,7 @@ void WiimoteDarwin::DisablePowerAssertionInternal()
|
|||
CFRunLoopStop(CFRunLoopGetCurrent());
|
||||
}
|
||||
|
||||
- (void)l2capChannelClosed:(IOBluetoothL2CAPChannel*)l2capChannel
|
||||
{
|
||||
- (void)l2capChannelClosed:(IOBluetoothL2CAPChannel*)l2capChannel {
|
||||
IOBluetoothDevice* device = [l2capChannel device];
|
||||
WiimoteReal::WiimoteDarwin* wm = nullptr;
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ public:
|
|||
void FindWiimotes(std::vector<Wiimote*>&, Wiimote*&) override;
|
||||
void Update() override {} // not needed for hidapi
|
||||
};
|
||||
}
|
||||
} // namespace WiimoteReal
|
||||
|
||||
#else
|
||||
#include "Core/HW/WiimoteReal/IODummy.h"
|
||||
|
|
|
@ -32,7 +32,7 @@ namespace Device
|
|||
{
|
||||
class Device;
|
||||
class ES;
|
||||
}
|
||||
} // namespace Device
|
||||
|
||||
struct Request;
|
||||
struct OpenRequest;
|
||||
|
|
|
@ -642,16 +642,16 @@ void WiimoteDevice::SendConfigurationRequest(u16 scid, u16 mtu, u16 flush_time_o
|
|||
SendCommandToACL(L2CAP_CONFIG_REQ, L2CAP_CONFIG_REQ, offset, buffer);
|
||||
}
|
||||
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
// --- SDP
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
// --- SDP
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
#define SDP_UINT8 0x08
|
||||
#define SDP_UINT16 0x09
|
||||
|
@ -935,4 +935,4 @@ void Callback_WiimoteInterruptChannel(int number, u16 channel_id, const u8* data
|
|||
if (bt)
|
||||
bt->AccessWiimoteByIndex(number)->ReceiveL2capData(channel_id, data, size);
|
||||
}
|
||||
}
|
||||
} // namespace Core
|
||||
|
|
|
@ -2530,11 +2530,11 @@ static __inline int hci_filter_test(uint8_t bit, const struct hci_filter* filter
|
|||
return (filter->mask[off] & (1 << ((bit - 1) & 0x1f)));
|
||||
}
|
||||
|
||||
/*
|
||||
* HCI socket ioctl's
|
||||
*
|
||||
* Apart from GBTINFOA, these are all indexed on the unit name
|
||||
*/
|
||||
/*
|
||||
* HCI socket ioctl's
|
||||
*
|
||||
* Apart from GBTINFOA, these are all indexed on the unit name
|
||||
*/
|
||||
|
||||
#define SIOCGBTINFO _IOWR('b', 5, struct btreq) /* get unit info */
|
||||
#define SIOCGBTINFOA _IOWR('b', 6, struct btreq) /* get info by address */
|
||||
|
|
|
@ -76,7 +76,7 @@ struct DeviceEntry
|
|||
u8 num_altsettings;
|
||||
};
|
||||
#pragma pack(pop)
|
||||
}
|
||||
} // namespace
|
||||
|
||||
USBV5ResourceManager::~USBV5ResourceManager()
|
||||
{
|
||||
|
|
|
@ -349,4 +349,4 @@ void UninstallExceptionHandler()
|
|||
|
||||
#endif
|
||||
|
||||
} // namespace
|
||||
} // namespace EMM
|
||||
|
|
|
@ -8,4 +8,4 @@ namespace EMM
|
|||
{
|
||||
void InstallExceptionHandler();
|
||||
void UninstallExceptionHandler();
|
||||
}
|
||||
} // namespace EMM
|
||||
|
|
|
@ -272,4 +272,4 @@ void Reload()
|
|||
LoadPatches();
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace PatchEngine
|
||||
|
|
|
@ -12,12 +12,14 @@
|
|||
#define MSG_WAITALL (8)
|
||||
#endif
|
||||
|
||||
typedef enum {
|
||||
typedef enum
|
||||
{
|
||||
GDB_SIGTRAP = 5,
|
||||
GDB_SIGTERM = 15,
|
||||
} gdb_signals;
|
||||
|
||||
typedef enum {
|
||||
typedef enum
|
||||
{
|
||||
GDB_BP_TYPE_NONE = 0,
|
||||
GDB_BP_TYPE_X,
|
||||
GDB_BP_TYPE_R,
|
||||
|
|
|
@ -16,7 +16,7 @@ struct GekkoOPTemplate
|
|||
Interpreter::Instruction Inst;
|
||||
GekkoOPInfo opinfo;
|
||||
};
|
||||
}
|
||||
} // namespace
|
||||
|
||||
// clang-format off
|
||||
static GekkoOPInfo unknownopinfo = { "unknown_instruction", OpType::Unknown, FL_ENDBLOCK, 0, 0, 0, 0 };
|
||||
|
|
|
@ -39,7 +39,7 @@ struct GekkoOPTemplate
|
|||
int opcode;
|
||||
Jit64::Instruction Inst;
|
||||
};
|
||||
}
|
||||
} // namespace
|
||||
|
||||
const GekkoOPTemplate primarytable[] = {
|
||||
{4, &Jit64::DynaRunTable4}, // RunTable4
|
||||
|
|
|
@ -226,7 +226,7 @@ void RCX64Reg::Realize()
|
|||
}
|
||||
}
|
||||
|
||||
RCX64Reg::operator X64Reg() const &
|
||||
RCX64Reg::operator X64Reg() const&
|
||||
{
|
||||
if (const preg_t* preg = std::get_if<preg_t>(&contents))
|
||||
{
|
||||
|
@ -241,7 +241,7 @@ RCX64Reg::operator X64Reg() const &
|
|||
return {};
|
||||
}
|
||||
|
||||
RCX64Reg::operator OpArg() const &
|
||||
RCX64Reg::operator OpArg() const&
|
||||
{
|
||||
return Gen::R(RCX64Reg::operator X64Reg());
|
||||
}
|
||||
|
|
|
@ -42,8 +42,8 @@ public:
|
|||
|
||||
void Realize();
|
||||
Gen::OpArg Location() const;
|
||||
operator Gen::OpArg() const & { return Location(); }
|
||||
operator Gen::OpArg() const && = delete;
|
||||
operator Gen::OpArg() const& { return Location(); }
|
||||
operator Gen::OpArg() const&& = delete;
|
||||
bool IsSimpleReg() const { return Location().IsSimpleReg(); }
|
||||
bool IsSimpleReg(Gen::X64Reg reg) const { return Location().IsSimpleReg(reg); }
|
||||
Gen::X64Reg GetSimpleReg() const { return Location().GetSimpleReg(); }
|
||||
|
@ -81,10 +81,10 @@ public:
|
|||
RCX64Reg& operator=(const RCX64Reg&) = delete;
|
||||
|
||||
void Realize();
|
||||
operator Gen::OpArg() const &;
|
||||
operator Gen::X64Reg() const &;
|
||||
operator Gen::OpArg() const && = delete;
|
||||
operator Gen::X64Reg() const && = delete;
|
||||
operator Gen::OpArg() const&;
|
||||
operator Gen::X64Reg() const&;
|
||||
operator Gen::OpArg() const&& = delete;
|
||||
operator Gen::X64Reg() const&& = delete;
|
||||
|
||||
void Unlock();
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ struct GekkoOPTemplate
|
|||
_Instruction Inst;
|
||||
// GekkoOPInfo opinfo; // Doesn't need opinfo, Interpreter fills it out
|
||||
};
|
||||
}
|
||||
} // namespace
|
||||
|
||||
constexpr GekkoOPTemplate primarytable[] = {
|
||||
{4, &JitArm64::DynaRunTable4}, // RunTable4
|
||||
|
|
|
@ -272,4 +272,4 @@ void Shutdown()
|
|||
g_jit = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
} // namespace JitInterface
|
||||
|
|
|
@ -70,4 +70,4 @@ void CompileExceptionCheck(ExceptionType type);
|
|||
void SetJit(JitBase* jit);
|
||||
|
||||
void Shutdown();
|
||||
}
|
||||
} // namespace JitInterface
|
||||
|
|
|
@ -845,35 +845,35 @@ TranslateResult JitCache_TranslateAddress(u32 address)
|
|||
return TranslateResult{true, from_bat, tlb_addr.address};
|
||||
}
|
||||
|
||||
// *********************************************************************************
|
||||
// Warning: Test Area
|
||||
//
|
||||
// This code is for TESTING and it works in interpreter mode ONLY. Some games (like
|
||||
// COD iirc) work thanks to this basic TLB emulation.
|
||||
// It is just a small hack and we have never spend enough time to finalize it.
|
||||
// Cheers PearPC!
|
||||
//
|
||||
// *********************************************************************************
|
||||
// *********************************************************************************
|
||||
// Warning: Test Area
|
||||
//
|
||||
// This code is for TESTING and it works in interpreter mode ONLY. Some games (like
|
||||
// COD iirc) work thanks to this basic TLB emulation.
|
||||
// It is just a small hack and we have never spend enough time to finalize it.
|
||||
// Cheers PearPC!
|
||||
//
|
||||
// *********************************************************************************
|
||||
|
||||
/*
|
||||
* PearPC
|
||||
* ppc_mmu.cc
|
||||
*
|
||||
* Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
/*
|
||||
* PearPC
|
||||
* ppc_mmu.cc
|
||||
*
|
||||
* Copyright (C) 2003, 2004 Sebastian Biallas (sb@biallas.net)
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#define PPC_EXC_DSISR_PAGE (1 << 30)
|
||||
#define PPC_EXC_DSISR_PROT (1 << 27)
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue