Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Kernel / arch / x86 / include / arch.h

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index 755ecdf..8a98705 100644 (file)
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -1,7 +1,7 @@
 /*
  * Acess2
  * - x86 Architecture
- * arch/i386/include/arch.h
+ * arch/x86/include/arch.h
  */
 #ifndef _ARCH_H_
 #define _ARCH_H_
@@ -14,11 +14,10 @@
 #define INVLPTR        ((void*)-1)
 
 // Allow nested spinlocks?
-#define STACKED_LOCKS  2       // 0: No, 1: Per-CPU, 2: Per-Thread
 #define LOCK_DISABLE_INTS      1
 
 // - Processor/Machine Specific Features
-#if ARCH != i386 && ARCH != i486 && ARCH != i586
+#if ARCH != x86 && ARCH != x86_smp
 # error "Unknown architecture '" #ARCH "'"
 #endif
 
@@ -41,18 +40,11 @@
  * \brief Short Spinlock structure
  */
 struct sShortSpinlock {
-       #if STACKED_LOCKS == 2
-       volatile void   *Lock;  //!< Lock value
-       #else
        volatile int    Lock;   //!< Lock value
-       #endif
        
        #if LOCK_DISABLE_INTS
         int    IF;     //!< Interrupt state on call to SHORTLOCK
        #endif
-       #if STACKED_LOCKS
-        int    Depth;
-       #endif
 };
 
 // === MACROS ===
@@ -123,19 +115,6 @@ typedef struct {
        Uint    Resvd4[1];      // SS
 } tSyscallRegs;
 
-typedef struct {
-       #if USE_PAE
-       Uint    PDPT[4];
-       #else
-       Uint    CR3;
-       #endif
-} tMemoryState;
-
-typedef struct {
-       Uint    EIP, ESP, EBP;
-       Uint32  UserCS, UserEIP;
-} tTaskState;
-
 // === FUNCTIONS ===
 extern void    Debug_PutCharDebug(char ch);
 extern void    Debug_PutStringDebug(const char *String);