patch-2.4.0-prerelease linux/include/linux/acpi.h

• Lines: 228
• Date: Fri Dec 29 14:07:24 2000
• Orig file: v2.4.0-test12/linux/include/linux/acpi.h
• Orig date: Sun Nov 19 18:44:21 2000

diff -u --recursive --new-file v2.4.0-test12/linux/include/linux/acpi.h linux/include/linux/acpi.h
@@ -28,6 +28,8 @@
 #include <linux/wait.h>
 #endif /* __KERNEL__ */
 
+u64 acpi_get_rsdp_ptr(void);
+
 /*
  * System sleep states
  */
@@ -64,10 +66,13 @@
 #define ACPI_RSDP1_SIG 0x20445352 /* 'RSD ' */
 #define ACPI_RSDP2_SIG 0x20525450 /* 'PTR ' */
 #define ACPI_RSDT_SIG  0x54445352 /* 'RSDT' */
-#define ACPI_FACP_SIG  0x50434146 /* 'FACP' */
+#define ACPI_FADT_SIG  0x50434146 /* 'FACP' */
 #define ACPI_DSDT_SIG  0x54445344 /* 'DSDT' */
 #define ACPI_FACS_SIG  0x53434146 /* 'FACS' */
 
+#define ACPI_SIG_LEN		4
+#define ACPI_FADT_SIGNATURE	"FACP"
+
 /* PM1_STS/EN flags */
 #define ACPI_TMR    0x0001
 #define ACPI_BM	    0x0010
@@ -90,19 +95,20 @@
 #define ACPI_SLP_TYP_SHIFT 10
 
 /* PM_TMR masks */
-#define ACPI_TMR_MASK	0x00ffffff
-#define ACPI_TMR_HZ	3580000 /* 3.58 MHz */
+#define ACPI_TMR_VAL_EXT 0x00000100
+#define ACPI_TMR_MASK	 0x00ffffff
+#define ACPI_TMR_HZ	 3580000 /* 3.58 MHz */
 
 /* strangess to avoid integer overflow */
-#define ACPI_uS_TO_TMR_TICKS(val) \
+#define ACPI_MICROSEC_TO_TMR_TICKS(val) \
   (((val) * (ACPI_TMR_HZ / 10000)) / 100)
-#define ACPI_TMR_TICKS_TO_uS(ticks) \
+#define ACPI_TMR_TICKS_TO_MICROSEC(ticks) \
   (((ticks) * 100) / (ACPI_TMR_HZ / 10000))
 
 /* PM2_CNT flags */
 #define ACPI_ARB_DIS 0x01
 
-/* FACP flags */
+/* FADT flags */
 #define ACPI_WBINVD	  0x00000001
 #define ACPI_WBINVD_FLUSH 0x00000002
 #define ACPI_PROC_C1	  0x00000004
@@ -114,9 +120,9 @@
 #define ACPI_TMR_VAL_EXT  0x00000100
 #define ACPI_DCK_CAP	  0x00000200
 
-/* FACP BOOT_ARCH flags */
-#define FACP_BOOT_ARCH_LEGACY_DEVICES	0x0001
-#define FACP_BOOT_ARCH_KBD_CONTROLLER	0x0002
+/* FADT BOOT_ARCH flags */
+#define FADT_BOOT_ARCH_LEGACY_DEVICES	0x0001
+#define FADT_BOOT_ARCH_KBD_CONTROLLER	0x0002
 
 /* FACS flags */
 #define ACPI_S4BIOS	  0x00000001
@@ -131,77 +137,6 @@
 #define ACPI_MAX_P_LVL3_LAT 1000
 #define ACPI_INFINITE_LAT   (~0UL)
 
-struct acpi_rsdp {
-	__u32 signature[2];
-	__u8 checksum;
-	__u8 oem[6];
-	__u8 reserved;
-	__u32 rsdt;
-} __attribute__ ((packed));
-
-struct acpi_table {
-	__u32 signature;
-	__u32 length;
-	__u8 rev;
-	__u8 checksum;
-	__u8 oem[6];
-	__u8 oem_table[8];
-	__u32 oem_rev;
-	__u32 creator;
-	__u32 creator_rev;
-} __attribute__ ((packed));
-
-struct acpi_facp {
-	struct acpi_table hdr;
-	__u32 facs;
-	__u32 dsdt;
-	__u8 int_model;
-	__u8 reserved;
-	__u16 sci_int;
-	__u32 smi_cmd;
-	__u8 acpi_enable;
-	__u8 acpi_disable;
-	__u8 s4bios_req;
-	__u8 reserved2;
-	__u32 pm1a_evt;
-	__u32 pm1b_evt;
-	__u32 pm1a_cnt;
-	__u32 pm1b_cnt;
-	__u32 pm2_cnt;
-	__u32 pm_tmr;
-	__u32 gpe0;
-	__u32 gpe1;
-	__u8 pm1_evt_len;
-	__u8 pm1_cnt_len;
-	__u8 pm2_cnt_len;
-	__u8 pm_tm_len;
-	__u8 gpe0_len;
-	__u8 gpe1_len;
-	__u8 gpe1_base;
-	__u8 reserved3;
-	__u16 p_lvl2_lat;
-	__u16 p_lvl3_lat;
-	__u16 flush_size;
-	__u16 flush_stride;
-	__u8 duty_offset;
-	__u8 duty_width;
-	__u8 day_alarm;
-	__u8 mon_alarm;
-	__u8 century;
-	__u16 boot_arch;
-	__u8 reserved6;
-	__u32 flags;
-} __attribute__ ((packed));
-
-struct acpi_facs {
-	__u32 signature;
-	__u32 length;
-	__u32 hw_signature;
-	__u32 fw_wake_vector;
-	__u32 global_lock;
-	__u32 flags;
-} __attribute__ ((packed));
-
 /*
  * Sysctl declarations
  */
@@ -213,9 +148,8 @@
 
 enum
 {
-	ACPI_FACP = 1,
+	ACPI_FADT = 1,
 	ACPI_DSDT,
-	ACPI_FACS,
 	ACPI_PM1_ENABLE,
 	ACPI_GPE_ENABLE,
 	ACPI_GPE_LEVEL,
@@ -232,71 +166,12 @@
 	ACPI_S1_SLP_TYP,
 	ACPI_S5_SLP_TYP,
 	ACPI_SLEEP,
+	ACPI_FACS,
+	ACPI_XSDT,
+	ACPI_PMTIMER,
+	ACPI_BATTERY,
 };
 
 #define ACPI_SLP_TYP_DISABLED	(~0UL)
-
-/*
- * PIIX4-specific ACPI info (for systems with PIIX4 but no ACPI tables)
- */
-
-#define ACPI_PIIX4_INT_MODEL	0x00
-#define ACPI_PIIX4_SCI_INT	0x0009
-
-#define ACPI_PIIX4_SMI_CMD	0x00b2
-#define ACPI_PIIX4_ACPI_ENABLE	0xf0
-#define ACPI_PIIX4_ACPI_DISABLE 0xf1
-#define ACPI_PIIX4_S4BIOS_REQ	0xf2
-
-#define ACPI_PIIX4_PM1_EVT	0x0000
-#define ACPI_PIIX4_PM1_CNT	0x0004
-#define	  ACPI_PIIX4_S0_MASK	(0x0005 << 10)
-#define	  ACPI_PIIX4_S1_MASK	(0x0004 << 10)
-#define	  ACPI_PIIX4_S2_MASK	(0x0003 << 10)
-#define	  ACPI_PIIX4_S3_MASK	(0x0002 << 10)
-#define	  ACPI_PIIX4_S4_MASK	(0x0001 << 10)
-#define	  ACPI_PIIX4_S5_MASK	(0x0000 << 10)
-#define ACPI_PIIX4_PM_TMR	0x0008
-#define ACPI_PIIX4_GPE0		0x000c
-#define ACPI_PIIX4_P_BLK	0x0010
-
-#define ACPI_PIIX4_PM1_EVT_LEN	0x04
-#define ACPI_PIIX4_PM1_CNT_LEN	0x02
-#define ACPI_PIIX4_PM_TM_LEN	0x04
-#define ACPI_PIIX4_GPE0_LEN	0x04
-
-#define ACPI_PIIX4_PM2_CNT	0x0022
-#define ACPI_PIIX4_PM2_CNT_LEN	0x01
-
-#define ACPI_PIIX4_PMREGMISC	0x80
-#define	  ACPI_PIIX4_PMIOSE	0x01
-
-/*
- * VIA-specific ACPI info (for systems with VT82C586B but no ACPI tables)
- */
-
-#define ACPI_VIA_INT_MODEL     0x00
-
-#define ACPI_VIA_SMI_CMD       0x002f
-#define ACPI_VIA_ACPI_ENABLE   0xa1
-#define ACPI_VIA_ACPI_DISABLE  0xa0
-
-#define ACPI_VIA_PM1_EVT       0x0000
-#define ACPI_VIA_PM1_CNT       0x0004
-#define ACPI_VIA_PM_TMR	       0x0008
-#define ACPI_VIA_GPE0	       0x0020
-#define ACPI_VIA_P_BLK	       0x0010
-
-#define ACPI_VIA_PM1_EVT_LEN   0x04
-#define ACPI_VIA_PM1_CNT_LEN   0x02
-#define ACPI_VIA_PM_TM_LEN     0x04
-#define ACPI_VIA_GPE0_LEN      0x04
-
-#define ACPI_VIA_DUTY_OFFSET   1
-#define ACPI_VIA_DUTY_WIDTH    3
-
-#define ACPI_VIA_DAY_ALARM     0x7d
-#define ACPI_VIA_MON_ALARM     0x7e
-#define ACPI_VIA_CENTURY       0x7f
 
 #endif /* _LINUX_ACPI_H */