feedc0de/dolphin
1
0
Fork 0
forked from dolphin-emu/dolphin
Code Pull Requests Activity

clang-format'ed

Browse Source
This commit is contained in:
Daniel Brunner
2019-05-11 12:38:06 +02:00
committed by Daniel Brunner
parent be72157399
commit 8678653095
3 changed files with 37 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/Core/HW/EXI/EXI_DeviceEthernetBase.h
View File

@@ -213,10 +213,7 @@ protected:
return ((u16)m_bba_mem.raw[index + 1] << 8) | m_bba_mem.raw[index]; return ((u16)m_bba_mem.raw[index + 1] << 8) | m_bba_mem.raw[index];
} }
inline u8* PtrFromPagePtr(int const index) inline u8* PtrFromPagePtr(int const index) { return &m_bba_mem.raw[page_ptr(index) << 8]; }
{
return &m_bba_mem.raw[page_ptr(index) << 8];
}
inline const u8* PtrFromPagePtr(int const index) const inline const u8* PtrFromPagePtr(int const index) const
{ {
@@ -237,10 +234,12 @@ protected:
void inc_rwp(); void inc_rwp();
bool RecvHandlePacket(); bool RecvHandlePacket();
union { union
{
std::array<u8, BBA_MEM_SIZE> raw; std::array<u8, BBA_MEM_SIZE> raw;
#pragma pack(push, 1) #pragma pack(push, 1)
struct { struct
{
u8 ncra; // 0x00 u8 ncra; // 0x00
u8 ncrb; // 0x01 u8 ncrb; // 0x01
u16 : 16; u16 : 16;

3
Source/Core/Core/HW/EXI/EXI_DeviceEthernetTAP_Unix.cpp
View File

@@ -25,8 +25,7 @@
namespace ExpansionInterface namespace ExpansionInterface
{ {
#define NOTIMPLEMENTED \ #define NOTIMPLEMENTED NOTICE_LOG(SP1, "%s not implemented for your UNIX", __PRETTY_FUNCTION__);
NOTICE_LOG(SP1, "%s not implemented for your UNIX", __PRETTY_FUNCTION__);
CEXIEthernetTAP::~CEXIEthernetTAP() CEXIEthernetTAP::~CEXIEthernetTAP()
{ {

6
Source/Core/DolphinQt/Settings/GameCubePane.cpp
View File

@@ -101,10 +101,10 @@ void GameCubePane::CreateWidgets()
// Add SP1 devices // Add SP1 devices
for (const auto& entry : for (const auto& entry : {std::make_pair(tr("<Nothing>"), ExpansionInterface::EXIDEVICE_NONE),
{std::make_pair(tr("<Nothing>"), ExpansionInterface::EXIDEVICE_NONE),
std::make_pair(tr("Dummy"), ExpansionInterface::EXIDEVICE_DUMMY), std::make_pair(tr("Dummy"), ExpansionInterface::EXIDEVICE_DUMMY),
std::make_pair(tr("Broadband Adapter (TAP)", "virtual network device"), ExpansionInterface::EXIDEVICE_ETH_TAP)}) std::make_pair(tr("Broadband Adapter (TAP)", "virtual network device"),
ExpansionInterface::EXIDEVICE_ETH_TAP)})
{ {
m_slot_combos[2]->addItem(entry.first, entry.second); m_slot_combos[2]->addItem(entry.first, entry.second);
} }