archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-20 11:21:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #12219 from AdmiralCurtiss/bba-name-conflict

Browse source 
Core/BBA/BuiltIn: Replace IP_PROTOCOL with IPV4_ETHERTYPE to avoid conflict with Linux headers.
This commit is contained in:
Pokechu22 2023-10-04 09:43:15 -07:00 committed by GitHub
commit 0291d2c45f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
View file

@ -13,6 +13,7 @@
#include "Common/BitUtils.h" #include "Common/BitUtils.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MsgHandler.h" #include "Common/MsgHandler.h"
#include "Common/Network.h"
#include "Common/ScopeGuard.h" #include "Common/ScopeGuard.h"
#include "Core/HW/EXI/EXI_Device.h" #include "Core/HW/EXI/EXI_Device.h"
#include "Core/HW/EXI/EXI_DeviceEthernet.h" #include "Core/HW/EXI/EXI_DeviceEthernet.h"
@ -746,7 +747,7 @@ void CEXIETHERNET::BuiltInBBAInterface::ReadThreadHandler(CEXIETHERNET::BuiltInB
u8* buffer = reinterpret_cast<u8*>(self->m_eth_ref->mRecvBuffer.get()); u8* buffer = reinterpret_cast<u8*>(self->m_eth_ref->mRecvBuffer.get());
Common::PacketView packet(buffer, datasize); Common::PacketView packet(buffer, datasize);
const auto packet_type = packet.GetEtherType(); const auto packet_type = packet.GetEtherType();
if (packet_type.has_value() && packet_type == IP_PROTOCOL) if (packet_type.has_value() && packet_type == Common::IPV4_ETHERTYPE)
{ {
SetIPIdentification(buffer, datasize, ++self->m_ip_frame_id); SetIPIdentification(buffer, datasize, ++self->m_ip_frame_id);
} }

3
Source/Core/Core/HW/EXI/BBA/BuiltIn.h
View file

@ -20,9 +20,6 @@ constexpr u16 TCP_FLAG_PSH = 0x8;
constexpr u16 TCP_FLAG_FIN = 0x1; constexpr u16 TCP_FLAG_FIN = 0x1;
constexpr u16 TCP_FLAG_RST = 0x4; constexpr u16 TCP_FLAG_RST = 0x4;
constexpr u16 IP_PROTOCOL = 0x800;
constexpr u16 ARP_PROTOCOL = 0x806;
constexpr u8 MAX_TCP_BUFFER = 4; constexpr u8 MAX_TCP_BUFFER = 4;
constexpr u16 MAX_UDP_LENGTH = 1500; constexpr u16 MAX_UDP_LENGTH = 1500;
constexpr u16 MAX_TCP_LENGTH = 440; constexpr u16 MAX_TCP_LENGTH = 440;