From 582876f616e1142a0d7ef75a29e133f4d4ced785 Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 8 Jul 2020 20:06:18 +0200
Subject: [PATCH] Stop using obsolete AbsoluteToNanoseconds()

---
 src/osx/core/hidjoystick.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/osx/core/hidjoystick.cpp b/src/osx/core/hidjoystick.cpp
index dfb6950997..fb0a3ca7c3 100644
--- a/src/osx/core/hidjoystick.cpp
+++ b/src/osx/core/hidjoystick.cpp
@@ -808,6 +808,21 @@ void* wxJoystickThread::Entry()
 // 5) Sends the event to the polling window (if any)
 // 6) Gets the next event and goes back to (1)
 //---------------------------------------------------------------------------
+
+// from https://developer.apple.com/documentation/apple_silicon/addressing_architectural_differences_in_your_macos_code
+
+uint64_t MachTimeToNanoseconds(uint64_t machTime)
+{
+    uint64_t nanoseconds = 0;
+    static mach_timebase_info_data_t sTimebase;
+    if (sTimebase.denom == 0)
+        (void)mach_timebase_info(&sTimebase);
+
+    nanoseconds = ((machTime * sTimebase.numer) / sTimebase.denom);
+
+    return nanoseconds;
+}
+
 /*static*/ void wxJoystickThread::HIDCallback(void* WXUNUSED(target),
                                               IOReturn WXUNUSED(res),
                                               void* context,
@@ -894,9 +909,9 @@ void* wxJoystickThread::Entry()
         else
             wxevent.SetEventType(wxEVT_JOY_MOVE);
 
-        Nanoseconds timestamp = AbsoluteToNanoseconds(hidevent.timestamp);
+        uint64_t timestamp = MachTimeToNanoseconds(*((uint64_t*) &hidevent.timestamp));
 
-        wxULongLong llTime(timestamp.hi, timestamp.lo);
+        wxULongLong llTime(timestamp);
 
         llTime /= 1000000;