X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Farch.h;h=9307ada3ce4cc0f17fe6d835bf1400ff653d82ab;hb=7aa331d83b8dd23d3ca7530fa582cec528df274a;hp=d82fc2c209c071cbee174286e0b9a8192316a977;hpb=6adbfe017566048fc15e152aa842bbe1cd6f430c;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/arch.h b/Kernel/arch/x86/include/arch.h
index d82fc2c2..9307ada3 100644
--- a/Kernel/arch/x86/include/arch.h
+++ b/Kernel/arch/x86/include/arch.h
@@ -9,15 +9,15 @@
 // - Base Defintions
 #define	KERNEL_BASE	0xC0000000
 #define BITS	32
+#define PAGE_SIZE	0x1000
 
 #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
 
@@ -40,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 ===
@@ -122,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);