X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Fmp.h;h=0dd5a1e73b2b299315bc5623444fc96f12fa6409;hb=7d881c2e5fef91a6570e46ef69a5d4a5cf0e8b4d;hp=45d24727d2c1e3121813d8d2b0dd1025938a2b82;hpb=d52a53f035af92941c0cafe5f81888fed16d2462;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/mp.h b/Kernel/arch/x86/include/mp.h
index 45d24727..0dd5a1e7 100644
--- a/Kernel/arch/x86/include/mp.h
+++ b/Kernel/arch/x86/include/mp.h
@@ -80,13 +80,61 @@ typedef struct sMPTable {
 } tMPTable;
 
 typedef volatile struct {
-	Uint8	Addr;
-	Uint8	Resvd[3];
-	Uint32	Resvd2[3];
+	Uint32	Addr;
+	Uint32	Resvd1[3];
 	union {
 		Uint8	Byte;
+		Uint16	Word;
 		Uint32	DWord;
 	}	Value;
+	Uint32	Resvd2[3];
 }	tIOAPIC;
 
+typedef struct {
+	Uint32	Val;
+	Uint32	Padding[3];
+} volatile	tReg;
+
+typedef volatile struct {
+	tReg	_unused1[2];
+	tReg	ID;
+	tReg	Version;
+	tReg	_unused2[4];
+	tReg	TPR;	// Task Priority Register
+	tReg	APR;	// Arbitration Priority Register (RO)
+	tReg	PPR;	// Processor Priority Register (RO)
+	tReg	EOI;	// EOI Register (Write Only)
+	tReg	_unused3[1];
+	tReg	LogDest;	// Logical Destination Register
+	tReg	DestFmt;	// Destination Format Register (0-27: RO, 28-31: RW)
+	tReg	SIV;	// Spurious Interrupt Vector Register (0-8: RW, 9-31: RO)
+	tReg	ISR[8];	// In-Service Register - Total 256 Bits (RO)
+	tReg	TMR[8];	// Trigger Mode Register - Total 256 Bits (RO)
+	tReg	IRR[8];	// Interrupt Request Register - Total 256 Bits (RO)
+	tReg	ErrorStatus;	// Error Status Register (RO)
+	tReg	_unused4[6];
+	tReg	LVTCMI;	// LVT CMI Registers
+	// 0x300
+	tReg	ICR[2];	// Interrupt Command Register (RW)
+	// LVT Registers (Controls Local Vector Table)
+	// Structure:
+	// 0-7:   Vector - IDT Vector for the interrupt
+	// 12:    Delivery Status (0: Idle, 1: Send Pending)
+	// 16:    Mask (0: Enabled, 1: Disabled)
+	// 0x320
+	tReg	LVTTimer;	// LVT Timer Register (RW)
+	tReg	LVTThermalSensor;	// LVT Thermal Sensor Register (RW)
+	tReg	LVTPerfMonCounters;	// LVT Performance Monitor Counters Register (RW)
+	tReg	LVTLInt0;	// LVT Local Interrupt (LINT) #0 Register (RW);
+	tReg	LVTLInt1;	// LVT Local Interrupt (LINT) #1 Register (RW);
+	tReg	LVTError;	// LVT Error Register (RW);
+	// 0x380
+	tReg	InitialCount;	// Initial Count Register (Used for the timer) (RW)
+	tReg	CurrentCount;	// Current Count Register (Used for the timer) (RW)
+	tReg	_unused5[4];
+	// 0x3E0
+	tReg	DivideConifg;	// Divide Configuration Register (RW)
+	tReg	_unused6[1];
+} volatile	tAPIC;
+
 #endif