armsx/ARMSX2
0
0
Fork 0
mirror of https://github.com/ARMSX2/ARMSX2.git synced 2026-08-24 16:50:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

iOS: gate macOS-only APIs behind TARGET_OS_IPHONE and add frontend link stubs

Browse Source 
Gate all macOS-only system APIs behind TARGET_OS_IPHONE checks across the shared core: ApplicationServices, IOKit, mouse APIs, AppKit, MetalFX, CDVD Darwin sources, USB, discord-rpc, cubeb CoreAudio HAL, and BSD networking headers in DEV9. Port TARGET_OS_IPHONE guards for DEV9 AdapterUtils with iOS fallbacks for sockaddr_dl, rt_msghdr, and sysctl. Add ARMSX2_ROOT to the include path for the frontend's common include style. Drop the global _M_ARM64 define that triggered fast_float MSVC intrin.h inclusion since __aarch64__ covers the core paths. Gate MTLFeatureSet_macOS_GPUFamily1_v1 behind !TARGET_OS_IPHONE. Fix missing unistd.h and gate pthread_jit_write_protect_np which is unavailable on iOS. Add stubs for DarwinMisc JIT diagnostics, Achievements stats and info APIs, Discord_Register, Host capture callbacks, and the host hotkeys map so the frontend links cleanly. Merge upstream master.
This commit is contained in:
Jeen
2026-07-12 16:38:59 +02:00
parent b5e581b1f3
commit 14fc29c0cd
49 changed files with 1475 additions and 10651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcsx2/DEV9/AdapterUtils.cpp
+38 -4
View File
@@ -21,7 +21,8 @@
#include <sys/ioctl.h>
#include <string.h>
#if defined(__FreeBSD__) || (__APPLE__)
#include <TargetConditionals.h>
#if (defined(__FreeBSD__) || (__APPLE__)) && !TARGET_OS_IPHONE
#include <sys/types.h>
#include <net/if_dl.h>
#include <sys/param.h>
@@ -225,27 +226,46 @@ bool AdapterUtils::GetAdapterAuto(Adapter* adapter, AdapterBuffer* buffer)
do
{
if ((pAdapter->ifa_flags & IFF_LOOPBACK) == 0 &&
(pAdapter->ifa_flags & IFF_UP) != 0)
(pAdapter->ifa_flags & IFF_UP) != 0 &&
pAdapter->ifa_addr != nullptr &&
ReadAddressFamily(pAdapter->ifa_addr) == AF_INET)
{
// Search for an adapter with;
// IPv4 Address,
// Gateway.
bool hasIPv4 = false;
#if !defined(__APPLE__) || !TARGET_OS_IPHONE
bool hasGateway = false;
#endif
if (GetAdapterIP(pAdapter).has_value())
hasIPv4 = true;
#if !defined(__APPLE__) || !TARGET_OS_IPHONE
if (GetGateways(pAdapter).size() > 0)
hasGateway = true;
#endif
#if defined(__APPLE__) && TARGET_OS_IPHONE
// iOS does not expose the desktop/macOS route sysctl path used by
// GetGateways(), but sockets mode only needs a usable IPv4
// interface here. The internal DHCP gateway is injected later.
if (hasIPv4)
{
Console.WriteLn("DEV9: Socket: iOS Auto selected adapter '%s' without gateway probe", pAdapter->ifa_name);
*adapter = *pAdapter;
buffer->swap(adapterInfo);
return true;
}
#else
if (hasIPv4 && hasGateway)
{
*adapter = *pAdapter;
buffer->swap(adapterInfo);
return true;
}
#endif
}
pAdapter = pAdapter->ifa_next;
@@ -268,6 +288,11 @@ std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(const Adapter* adapter)
return std::nullopt;
}
#elif defined(__APPLE__) && TARGET_OS_IPHONE
std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(const Adapter* adapter)
{
return std::nullopt;
}
#else
std::optional<MAC_Address> AdapterUtils::GetAdapterMAC(const Adapter* adapter)
{
@@ -436,7 +461,7 @@ std::vector<IP_Address> AdapterUtils::GetGateways(const Adapter* adapter)
}
return collection;
}
#elif defined(__FreeBSD__) || defined(__APPLE__)
#elif (defined(__FreeBSD__) || defined(__APPLE__)) && !TARGET_OS_IPHONE
std::vector<IP_Address> AdapterUtils::GetGateways(const Adapter* adapter)
{
if (adapter == nullptr)
@@ -518,7 +543,7 @@ std::vector<IP_Address> AdapterUtils::GetGateways(const Adapter* adapter)
return collection;
}
#else
std::vector<IP_Address> AdapterUtils::GetGateways(Adapter* adapter)
std::vector<IP_Address> AdapterUtils::GetGateways(const Adapter* adapter)
{
Console.Error("DEV9: Unsupported OS, can't find Gateway");
return {};
@@ -567,8 +592,17 @@ std::vector<IP_Address> AdapterUtils::GetDNS(const Adapter* adapter)
if (servers.fail())
{
servers.close();
#if defined(__APPLE__) && TARGET_OS_IPHONE
// iOS app sandbox has no /etc/resolv.conf; fall back to public resolvers so the
// emulated PS2 gets a working DNS list. Overrideable via Network settings.
Console.WriteLn("DEV9: no /etc/resolv.conf on iOS; using public DNS fallback 1.1.1.1 / 8.8.8.8");
collection.push_back(IP_Address{{{1, 1, 1, 1}}});
collection.push_back(IP_Address{{{8, 8, 8, 8}}});
return collection;
#else
Console.Error("DEV9: Failed to open /etc/resolv.conf");
return collection;
#endif
}
std::string line;
pcsx2/DEV9/InternalServers/DHCP_Server.cpp
+1 -1
View File
@@ -9,7 +9,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#if defined(__FreeBSD__) || (__APPLE__)
#if (defined(__FreeBSD__) || (__APPLE__)) && !TARGET_OS_IPHONE
#include <sys/param.h>
#include <sys/sysctl.h>
#include <sys/socket.h>