diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h index 975c8e1f33..79c8828d4f 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceEthernet.h @@ -281,7 +281,7 @@ private: { u32 word; - inline void set(u32 const next_page, u32 const packet_length, u32 const status) + void set(u32 const next_page, u32 const packet_length, u32 const status) { word = 0; word |= (status & 0xff) << 24; @@ -290,10 +290,7 @@ private: } }; - inline u16 page_ptr(int const index) const - { - return ((u16)mBbaMem[index + 1] << 8) | mBbaMem[index]; - } + u16 page_ptr(int const index) const { return ((u16)mBbaMem[index + 1] << 8) | mBbaMem[index]; } bool IsMXCommand(u32 const data); bool IsWriteCommand(u32 const data); diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceModem.h b/Source/Core/Core/HW/EXI/EXI_DeviceModem.h index 786d8db119..535bbc3638 100644 --- a/Source/Core/Core/HW/EXI/EXI_DeviceModem.h +++ b/Source/Core/Core/HW/EXI/EXI_DeviceModem.h @@ -93,27 +93,21 @@ private: void RunAllPendingATCommands(); void AddATReply(const std::string& data); - static inline bool TransferIsResetCommand(u32 transfer_descriptor) + static bool TransferIsResetCommand(u32 transfer_descriptor) { return transfer_descriptor == 0x80000000; } - static inline bool IsWriteTransfer(u32 transfer_descriptor) - { - return transfer_descriptor & 0x40000000; - } + static bool IsWriteTransfer(u32 transfer_descriptor) { return transfer_descriptor & 0x40000000; } - static inline bool IsModemTransfer(u32 transfer_descriptor) - { - return transfer_descriptor & 0x20000000; - } + static bool IsModemTransfer(u32 transfer_descriptor) { return transfer_descriptor & 0x20000000; } - static inline u16 GetModemTransferSize(u32 transfer_descriptor) + static u16 GetModemTransferSize(u32 transfer_descriptor) { return (transfer_descriptor >> 8) & 0xFFFF; } - static inline u32 SetModemTransferSize(u32 transfer_descriptor, u16 new_size) + static u32 SetModemTransferSize(u32 transfer_descriptor, u16 new_size) { return (transfer_descriptor & 0xFF000000) | (new_size << 8); }