X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Fx86%2Finclude%2Fmp.h;h=30b2780f8d691be1f0e1fcd9d29db832fd9b6828;hb=7514bb8053931759b99f77d3f9ad70446b0625ac;hp=f64cd0bff2aa60f4e391620747ce6f4402fa2948;hpb=8bc40333b1401d7616b225945fee53d972c2f418;p=tpg%2Facess2.git

diff --git a/Kernel/arch/x86/include/mp.h b/Kernel/arch/x86/include/mp.h
index f64cd0bf..30b2780f 100644
--- a/Kernel/arch/x86/include/mp.h
+++ b/Kernel/arch/x86/include/mp.h
@@ -3,15 +3,103 @@
 #ifndef _MP_H
 #define _MP_H
 
-#define MPTABLE_IDENT	('_'|('M'<<8)|('P'<<16)|('_'<<24))
+#define MPPTR_IDENT	('_'|('M'<<8)|('P'<<16)|('_'<<24))
+#define MPTABLE_IDENT	('P'|('C'<<8)|('M'<<16)|('P'<<24))
 
 typedef struct sMPInfo {
-	Uint	Sig;	// '_MP_'
-	Uint	MPConfig;
+	Uint32	Sig;	// '_MP_'
+	Uint32	MPConfig;
 	Uint8	Length;
 	Uint8	Version;
 	Uint8	Checksum;
 	Uint8	Features[5];	// 2-4 are unused
 } tMPInfo;
 
+typedef union uMPTable_Ent {
+	Uint8	Type;
+	struct {
+		Uint8	Type;
+		Uint8	APICID;
+		Uint8	APICVer;
+		Uint8	CPUFlags;	// bit 0: Enabled, bit 1: Boot Processor
+		Uint32	CPUSignature;	// Stepping, Model, Family
+		Uint32	FeatureFlags;
+		Uint32	Reserved[2];
+	} __attribute__((packed))	Proc;	// 0x00
+	struct {
+		Uint8	Type;
+		Uint8	ID;
+		char	TypeString[6];
+	} __attribute__((packed))	Bus;	// 0x01
+	struct {
+		Uint8	Type;
+		Uint8	ID;
+		Uint8	Version;
+		Uint8	Flags;	// bit 0: Enabled
+		Uint32	Addr;
+	} __attribute__((packed))	IOAPIC;	// 0x02
+	struct {
+		Uint8	Type;
+		Uint8	IntType;
+		Uint16	Flags;	// 0,1: Polarity, 2,3: Trigger Mode
+		Uint8	SourceBusID;
+		Uint8	SourceBusIRQ;
+		Uint8	DestAPICID;
+		Uint8	DestAPICIRQ;
+	} __attribute__((packed))	IOInt;
+	struct {
+		Uint8	Type;
+		Uint8	IntType;
+		Uint16	Flags;	// 0,1: Polarity, 2,3: Trigger Mode
+		Uint8	SourceBusID;
+		Uint8	SourceBusIRQ;
+		Uint8	DestLocalAPICID;
+		Uint8	DestLocalAPICIRQ;
+	} __attribute__((packed))	LocalInt;
+} __attribute__((packed)) tMPTable_Ent;
+
+typedef struct sMPTable {
+	Uint32	Sig;
+	Uint16	BaseTableLength;
+	Uint8	SpecRev;
+	Uint8	Checksum;
+	
+	char	OemID[8];
+	char	ProductID[12];
+	
+	Uint32	OEMTablePtr;
+	Uint16	OEMTableSize;
+	Uint16	EntryCount;
+	
+	Uint32	LocalAPICMemMap;	//!< Address used to access the local APIC
+	Uint16	ExtendedTableLen;
+	Uint8	ExtendedTableChecksum;
+	Uint8	Reserved;
+	
+	tMPTable_Ent	Entries[];
+} tMPTable;
+
+typedef volatile struct {
+	Uint32	Addr;
+	Uint32	Resvd1[3];
+	union {
+		Uint8	Byte;
+		Uint16	Word;
+		Uint32	DWord;
+	}	Value;
+	Uint32	Resvd2[3];
+}	tIOAPIC;
+
+typedef struct {
+	Uint32	Val;
+	Uint32	Padding[3];
+}	tReg;
+
+typedef volatile struct {
+	tReg	_unused;
+	tReg	_unused2;
+	tReg	ID;
+	tReg	Version;
+}	tAPIC;
+
 #endif