X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Tools%2Fnativelib%2Finclude%2Facess.h;h=b8bd4df29fa84703e63b587dc64bc487363d8b5b;hb=f99f0ec855b82620c45b4c539ef7d3832680db0d;hp=71988653c0d519922ca1dd54122cc0f04d386684;hpb=7ba570fe3cc5418f42decf5b72ac2295cce9e60f;p=tpg%2Facess2.git

diff --git a/Tools/nativelib/include/acess.h b/Tools/nativelib/include/acess.h
index 71988653..b8bd4df2 100644
--- a/Tools/nativelib/include/acess.h
+++ b/Tools/nativelib/include/acess.h
@@ -50,15 +50,13 @@ typedef uint32_t	tUID;
 typedef uint32_t	tGID;
 typedef uint32_t	tTID;
 
-// NOTE: Since this is single-threaded (for now) mutexes can be implimented as simple locks
-typedef char	tShortSpinlock;
-
 typedef int64_t	tTime;
 extern tTime	now(void);
 extern int64_t	timestamp(int sec, int min, int hr, int day, int month, int year);
 extern void	format_date(tTime TS, int *year, int *month, int *day, int *hrs, int *mins, int *sec, int *ms);
 
 #define PACKED	__attribute__((packed))
+#define NORETURN	__attribute__((noreturn))
 #define DEPRECATED
 #define EXPORT(s)
 #define EXPORTV(s)
@@ -147,16 +145,7 @@ extern uint64_t	DivMod64U(uint64_t Num, uint64_t Den, uint64_t *Rem);
 static inline int MIN(int a, int b) { return a < b ? a : b; }
 static inline int MAX(int a, int b) { return a > b ? a : b; }
 
-#if USE_MULTITHREADING
-#error "TODO: Impliment multithreaded SHORTLOCK"
-#else
-static inline void SHORTLOCK(tShortSpinlock *Lock) {
-	if(*Lock)	Log_KernelPanic("---", "Double short lock");
-	*Lock = 1;
-}
-static inline void SHORTREL(tShortSpinlock *m) { *m = 0; }
-static inline int  CPU_HAS_LOCK(tShortSpinlock *m) { return *m; }
-#endif
+#include <shortlock.h>
 
 static inline intptr_t MM_GetPhysAddr(void *Ptr) { return 1; }
 static inline int	MM_IsUser(const void *Ptr) { return 1; }