Move threadmgr functions to common header

sceKernelGetTLSAddr has been removed for kernel because it does not
exist.

3 files changed, 21 insertions, 36 deletions

diff --git a/include/common/kernel/threadmgr.h b/include/common/kernel/threadmgr.h
index e7e8fb2..86255e8 100644
--- a/include/common/kernel/threadmgr.h
+++ b/include/common/kernel/threadmgr.h
@@ -20,6 +20,27 @@ typedef struct _SceKernelThreadOptParamInternal {
 	SceInt32              unk0x1C;
 } SceKernelThreadOptParamInternal;
 
+typedef enum _SceKernelTLS {
+	SCE_THREAD_TLS_UNK_0,
+	SCE_THREAD_TLS_ID,
+	SCE_THREAD_TLS_STACK_START_ADDRESS,
+	SCE_THREAD_TLS_STACK_END_ADDRESS,
+	SCE_THREAD_TLS_VFP_EXCEPTION,
+	SCE_THREAD_TLS_LWMUTEX_STATUS,
+	SCE_THREAD_TLS_UNK_6,
+	SCE_THREAD_TLS_UNK_7,
+	SCE_THREAD_TLS_PRIORITY,
+	SCE_THREAD_TLS_AFFINITY,
+} SceKernelTLS;
+
+/**
+ * @brief sceKernelGetThreadTLSAddr gets an address to a 4 bytes area of TLS memory for the specified thread
+ * @param thid - The UID of the thread to access TLS
+ * @param key - the TLS keyslot index
+ * @return pointer to TLS memory
+ */
+void *sceKernelGetThreadTLSAddr(SceUID thid, SceKernelTLS key);
+
 SCE_CDECL_END
 
 #endif
diff --git a/include/kernel/kernel/threadmgr.h b/include/kernel/kernel/threadmgr.h
index 9b4de5e..8c50270 100644
--- a/include/kernel/kernel/threadmgr.h
+++ b/include/kernel/kernel/threadmgr.h
@@ -105,21 +105,6 @@ SceInt32 sceKernelGetFastMutexInfoById(SceUID uid, SceKernelFastMutexInfo *pInfo
  */
 SceInt64 sceKernelGetSystemTimeWide(void);
 
-/**
- * @brief sceKernelGetThreadTLSAddr gets an address to a 4 bytes area of TLS memory for the specified thread
- * @param thid - The UID of the thread to access TLS
- * @param key - the TLS keyslot index
- * @return pointer to TLS memory
- */
-void *sceKernelGetThreadTLSAddr(SceUID thid, int key);
-
-/**
- * @brief sceKernelGetTLSAddr get pointer to TLS key area for current thread
- * @param key - the TLS keyslot index
- * @return pointer to TLS key value
- */
-void *sceKernelGetTLSAddr(int key);
-
 /** Type of function used with sceKernelExtendKernelStack */
 typedef SceInt32 (*SceKernelExtendKernelStackFunction)(void *pArg);
 
diff --git a/include/user/kernel/threadmgr.h b/include/user/kernel/threadmgr.h
index 5691fe0..25f16fb 100644
--- a/include/user/kernel/threadmgr.h
+++ b/include/user/kernel/threadmgr.h
@@ -63,27 +63,6 @@ int sceKernelSendSignal(SceUID thid);
  */
 SceInt64 sceKernelGetSystemTimeWide(void);
 
-typedef enum _SceKernelTLS {
-	SCE_THREAD_TLS_UNK_0,
-	SCE_THREAD_TLS_ID,
-	SCE_THREAD_TLS_STACK_START_ADDRESS,
-	SCE_THREAD_TLS_STACK_END_ADDRESS,
-	SCE_THREAD_TLS_VFP_EXCEPTION,
-	SCE_THREAD_TLS_LWMUTEX_STATUS,
-	SCE_THREAD_TLS_UNK_6,
-	SCE_THREAD_TLS_UNK_7,
-	SCE_THREAD_TLS_PRIORITY,
-	SCE_THREAD_TLS_AFFINITY,
-} SceKernelTLS;
-
-/**
- * @brief sceKernelGetThreadTLSAddr gets an address to a 4 bytes area of TLS memory for the specified thread
- * @param thid - The UID of the thread to access TLS
- * @param key - the TLS keyslot index
- * @return pointer to TLS memory
- */
-void *sceKernelGetThreadTLSAddr(SceUID thid, SceKernelTLS key);
-
 /**
  * @brief sceKernelGetTLSAddr get pointer to TLS key area for current thread
  * @param key - the TLS keyslot index