From cacf8615a8cb2c5c51c06144b1137b923ea82082 Mon Sep 17 00:00:00 2001 From: fincs Date: Mon, 16 Mar 2020 12:51:07 +0100 Subject: [PATCH] Remove arm/atomics.h (use C or C++ instead) --- nx/include/switch.h | 1 - nx/include/switch/arm/atomics.h | 28 ---------------------------- nx/source/audio/driver_internal.h | 1 - nx/source/nvidia/address_space.c | 1 - nx/source/nvidia/channel.c | 1 - nx/source/nvidia/gpu_channel.c | 1 - 6 files changed, 33 deletions(-) delete mode 100644 nx/include/switch/arm/atomics.h diff --git a/nx/include/switch.h b/nx/include/switch.h index d1089ab2..5d263d8b 100644 --- a/nx/include/switch.h +++ b/nx/include/switch.h @@ -17,7 +17,6 @@ extern "C" { #include "switch/arm/tls.h" #include "switch/arm/cache.h" -#include "switch/arm/atomics.h" #include "switch/arm/counter.h" #include "switch/kernel/svc.h" diff --git a/nx/include/switch/arm/atomics.h b/nx/include/switch/arm/atomics.h deleted file mode 100644 index b60b9dd1..00000000 --- a/nx/include/switch/arm/atomics.h +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @file atomics.h - * @brief AArch64 atomic operations. - * @author plutoo - * @copyright libnx Authors - */ -#pragma once -#include "../types.h" - -/// Atomically increments a 32-bit value. -static inline u32 atomicIncrement32(u32* p) { - return __atomic_fetch_add(p, 1, __ATOMIC_SEQ_CST); -} - -/// Atomically decrements a 32-bit value. -static inline u32 atomicDecrement32(u32* p) { - return __atomic_sub_fetch(p, 1, __ATOMIC_SEQ_CST); -} - -/// Atomically increments a 64-bit value. -static inline u64 atomicIncrement64(u64* p) { - return __atomic_fetch_add(p, 1, __ATOMIC_SEQ_CST); -} - -/// Atomically decrements a 64-bit value. -static inline u64 atomicDecrement64(u64* p) { - return __atomic_sub_fetch(p, 1, __ATOMIC_SEQ_CST); -} diff --git a/nx/source/audio/driver_internal.h b/nx/source/audio/driver_internal.h index b6435ca7..116fe1a4 100644 --- a/nx/source/audio/driver_internal.h +++ b/nx/source/audio/driver_internal.h @@ -3,7 +3,6 @@ #include #include "types.h" #include "result.h" -#include "arm/atomics.h" #include "services/audren.h" #include "audio/driver.h" diff --git a/nx/source/nvidia/address_space.c b/nx/source/nvidia/address_space.c index 7ae8fde2..051c9aaa 100644 --- a/nx/source/nvidia/address_space.c +++ b/nx/source/nvidia/address_space.c @@ -1,7 +1,6 @@ #include #include "types.h" #include "result.h" -#include "arm/atomics.h" #include "kernel/svc.h" #include "services/nv.h" #include "nvidia/ioctl.h" diff --git a/nx/source/nvidia/channel.c b/nx/source/nvidia/channel.c index c8099c41..9485a8e5 100644 --- a/nx/source/nvidia/channel.c +++ b/nx/source/nvidia/channel.c @@ -1,7 +1,6 @@ #include #include "types.h" #include "result.h" -#include "arm/atomics.h" #include "kernel/svc.h" #include "services/nv.h" #include "nvidia/ioctl.h" diff --git a/nx/source/nvidia/gpu_channel.c b/nx/source/nvidia/gpu_channel.c index 31f3d9fd..d180ba85 100644 --- a/nx/source/nvidia/gpu_channel.c +++ b/nx/source/nvidia/gpu_channel.c @@ -1,7 +1,6 @@ #include #include "types.h" #include "result.h" -#include "arm/atomics.h" #include "kernel/svc.h" #include "runtime/hosversion.h" #include "services/nv.h"