Merge 5ac6d438fa into 08901a9a4b

Merge branch 'JacksonZ03-main' into dev
Merge branch 'main' of https://github.com/JacksonZ03/xmrig into JacksonZ03-main
2026-06-28 05:37:39 -04:00 · 2023-10-11 14:29:39 -06:00 · 2023-10-09 15:15:32 +07:00 · 2023-10-09 15:14:50 +07:00 · 2023-10-08 23:29:52 +01:00 · 2023-10-08 23:12:58 +01:00
3 changed files with 8 additions and 0 deletions
@@ -169,6 +169,12 @@ bool xmrig::Platform::isOnBatteryPower()
            return (status == "Discharging");
        }
    }
+    std::ifstream f("/sys/class/power_supply/macsmc-battery/status");
+    if (f.is_open()) {
+        std::string status;
+        f >> status;
+        return (status == "Discharging");
+    }
    return false;
 }

@@ -8,6 +8,7 @@ PUBLIC cnv2_mainloop_bulldozer_asm
 PUBLIC cnv2_double_mainloop_sandybridge_asm
 PUBLIC cnv2_rwz_mainloop_asm
 PUBLIC cnv2_rwz_double_mainloop_asm
+PUBLIC cnv2_upx_double_mainloop_zen3_asm

 ALIGN(64)
 cnv1_single_mainloop_asm PROC
@@ -8,6 +8,7 @@ PUBLIC cnv2_mainloop_bulldozer_asm
 PUBLIC cnv2_double_mainloop_sandybridge_asm
 PUBLIC cnv2_rwz_mainloop_asm
 PUBLIC cnv2_rwz_double_mainloop_asm
+PUBLIC cnv2_upx_double_mainloop_zen3_asm

 ALIGN(64)
 cnv1_single_mainloop_asm PROC
Author	SHA1	Message	Date
Tony Butler	e3d5710a95	Merge `5ac6d438fa` into `08901a9a4b`	2023-10-11 14:29:39 -06:00
XMRig	08901a9a4b	Merge branch 'JacksonZ03-main' into dev	2023-10-09 15:15:32 +07:00
XMRig	a19f590ee6	Merge branch 'main' of https://github.com/JacksonZ03/xmrig into JacksonZ03-main	2023-10-09 15:14:50 +07:00
Jackson Zheng	2fa754825d	Update cn_main_loop.asm Found this line to be missing. I looked through the history and seemed like the original author of the commit missed it out.	2023-10-08 23:29:52 +01:00
Jackson Zheng	f3446c0a94	Update cn_main_loop.asm I was scanning the code and found this line to be missing. Not sure if this was a mistake or if it was intentionally left out?	2023-10-08 23:12:58 +01:00
Tony Butler	5ac6d438fa	pause-on-battery: Support macsmc-battery driver and sysfs node	2023-07-12 02:06:54 -06:00