---

yaml
---
r: 298006
b: refs/heads/master
c: f2d4753
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aa3c16c6b196857ea24ec1c589e3db3c4c64c96
+refs/heads/master: f2d4753fbd4d15c65d6ba48167aa83916ddbe518

trunk/drivers/acpi/acpica/Makefile

@@ -68,14 +68,12 @@ acpi-y +=		\
 
 acpi-y +=		\
 	hwacpi.o	\
-	hwesleep.o	\
 	hwgpe.o		\
 	hwpci.o		\
 	hwregs.o	\
 	hwsleep.o	\
 	hwvalid.o	\
-	hwxface.o	\
-	hwxfsleep.o
+	hwxface.o
 
 acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o
 

trunk/drivers/acpi/acpica/accommon.h

@@ -51,6 +51,7 @@
  *
  * Note: The order of these include files is important.
  */
+#include "acconfig.h"		/* Global configuration constants */
 #include "acmacros.h"		/* C macros */
 #include "aclocal.h"		/* Internal data types */
 #include "acobject.h"		/* ACPI internal object */

trunk/include/acpi/acconfig.h → trunk/drivers/acpi/acpica/acconfig.h

@@ -85,23 +85,6 @@
  */
 #define ACPI_CHECKSUM_ABORT             FALSE
 
-/*
- * Generate a version of ACPICA that only supports "reduced hardware"
- * platforms (as defined in ACPI 5.0). Set to TRUE to generate a specialized
- * version of ACPICA that ONLY supports the ACPI 5.0 "reduced hardware"
- * model. In other words, no ACPI hardware is supported.
- *
- * If TRUE, this means no support for the following:
- *      PM Event and Control registers
- *      SCI interrupt (and handler)
- *      Fixed Events
- *      General Purpose Events (GPEs)
- *      Global Lock
- *      ACPI PM timer
- *      FACS table (Waking vectors and Global Lock)
- */
-#define ACPI_REDUCED_HARDWARE           FALSE
-
 /******************************************************************************
  *
  * Subsystem Constants
@@ -110,7 +93,7 @@
 
 /* Version of ACPI supported */
 
-#define ACPI_CA_SUPPORT_LEVEL           5
+#define ACPI_CA_SUPPORT_LEVEL           3
 
 /* Maximum count for a semaphore object */
 

trunk/drivers/acpi/acpica/acdebug.h

@@ -111,21 +111,19 @@ acpi_status acpi_db_find_name_in_namespace(char *name_arg);
 
 void acpi_db_set_scope(char *name);
 
-ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_db_sleep(char *object_arg))
+acpi_status acpi_db_sleep(char *object_arg);
 
 void acpi_db_find_references(char *object_arg);
 
 void acpi_db_display_locks(void);
 
 void acpi_db_display_resources(char *object_arg);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_db_display_gpes(void))
+void acpi_db_display_gpes(void);
 
 void acpi_db_check_integrity(void);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void
-			      acpi_db_generate_gpe(char *gpe_arg,
-						   char *block_arg))
+void acpi_db_generate_gpe(char *gpe_arg, char *block_arg);
 
 void acpi_db_check_predefined_names(void);
 

trunk/drivers/acpi/acpica/acevents.h

@@ -69,10 +69,11 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node *node,
  */
 acpi_status acpi_ev_init_global_lock_handler(void);
 
-ACPI_HW_DEPENDENT_RETURN_OK(acpi_status
-			    acpi_ev_acquire_global_lock(u16 timeout))
- ACPI_HW_DEPENDENT_RETURN_OK(acpi_status acpi_ev_release_global_lock(void))
- acpi_status acpi_ev_remove_global_lock_handler(void);
+acpi_status acpi_ev_acquire_global_lock(u16 timeout);
+
+acpi_status acpi_ev_release_global_lock(void);
+
+acpi_status acpi_ev_remove_global_lock_handler(void);
 
 /*
  * evgpe - Low-level GPE support
@@ -113,9 +114,7 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 			     struct acpi_gpe_block_info *gpe_block,
 			     void *context);
 
-ACPI_HW_DEPENDENT_RETURN_OK(acpi_status
-			    acpi_ev_delete_gpe_block(struct acpi_gpe_block_info
-						     *gpe_block))
+acpi_status acpi_ev_delete_gpe_block(struct acpi_gpe_block_info *gpe_block);
 
 u32
 acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
@@ -127,10 +126,9 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
  */
 acpi_status acpi_ev_gpe_initialize(void);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void
-			      acpi_ev_update_gpes(acpi_owner_id table_owner_id))
+void acpi_ev_update_gpes(acpi_owner_id table_owner_id);
 
- acpi_status
+acpi_status
 acpi_ev_match_gpe_method(acpi_handle obj_handle,
 			 u32 level, void *context, void **return_value);
 
@@ -239,5 +237,6 @@ acpi_status acpi_ev_remove_sci_handler(void);
 
 u32 acpi_ev_initialize_sCI(u32 program_sCI);
 
-ACPI_HW_DEPENDENT_RETURN_VOID(void acpi_ev_terminate(void))
+void acpi_ev_terminate(void);
+
 #endif				/* __ACEVENTS_H__  */

trunk/drivers/acpi/acpica/acglobal.h

@@ -147,7 +147,7 @@ u8 acpi_gbl_system_awake_and_running;
  */
 u8 acpi_gbl_reduced_hardware;
 
-#endif				/* DEFINE_ACPI_GLOBALS */
+#endif
 
 /* Do not disassemble buffers to resource descriptors */
 
@@ -184,12 +184,8 @@ ACPI_EXTERN u32 acpi_gbl_trace_dbg_layer;
  * found in the RSDT/XSDT.
  */
 ACPI_EXTERN struct acpi_table_list acpi_gbl_root_table_list;
-
-#if (!ACPI_REDUCED_HARDWARE)
 ACPI_EXTERN struct acpi_table_facs *acpi_gbl_FACS;
 
-#endif				/* !ACPI_REDUCED_HARDWARE */
-
 /* These addresses are calculated from the FADT Event Block addresses */
 
 ACPI_EXTERN struct acpi_generic_address acpi_gbl_xpm1a_status;
@@ -401,15 +397,10 @@ ACPI_EXTERN struct acpi_fixed_event_handler
 ACPI_EXTERN struct acpi_gpe_xrupt_info *acpi_gbl_gpe_xrupt_list_head;
 ACPI_EXTERN struct acpi_gpe_block_info
 *acpi_gbl_gpe_fadt_blocks[ACPI_MAX_GPE_BLOCKS];
-
-#if (!ACPI_REDUCED_HARDWARE)
-
 ACPI_EXTERN u8 acpi_gbl_all_gpes_initialized;
 ACPI_EXTERN ACPI_GBL_EVENT_HANDLER acpi_gbl_global_event_handler;
 ACPI_EXTERN void *acpi_gbl_global_event_handler_context;
 
-#endif				/* !ACPI_REDUCED_HARDWARE */
-
 /*****************************************************************************
  *
  * Debugger globals

trunk/drivers/acpi/acpica/achware.h

@@ -80,26 +80,6 @@ acpi_status acpi_hw_register_write(u32 register_id, u32 value);
 
 acpi_status acpi_hw_clear_acpi_status(void);
 
-/*
- * hwsleep - sleep/wake support (Legacy sleep registers)
- */
-acpi_status acpi_hw_legacy_sleep(u8 sleep_state, u8 flags);
-
-acpi_status acpi_hw_legacy_wake_prep(u8 sleep_state, u8 flags);
-
-acpi_status acpi_hw_legacy_wake(u8 sleep_state, u8 flags);
-
-/*
- * hwesleep - sleep/wake support (Extended FADT-V5 sleep registers)
- */
-void acpi_hw_execute_sleep_method(char *method_name, u32 integer_argument);
-
-acpi_status acpi_hw_extended_sleep(u8 sleep_state, u8 flags);
-
-acpi_status acpi_hw_extended_wake_prep(u8 sleep_state, u8 flags);
-
-acpi_status acpi_hw_extended_wake(u8 sleep_state, u8 flags);
-
 /*
  * hwvalid - Port I/O with validation
  */
@@ -148,4 +128,16 @@ acpi_status
 acpi_hw_derive_pci_id(struct acpi_pci_id *pci_id,
 		      acpi_handle root_pci_device, acpi_handle pci_region);
 
+#ifdef	ACPI_FUTURE_USAGE
+/*
+ * hwtimer - ACPI Timer prototypes
+ */
+acpi_status acpi_get_timer_resolution(u32 * resolution);
+
+acpi_status acpi_get_timer(u32 * ticks);
+
+acpi_status
+acpi_get_timer_duration(u32 start_ticks, u32 end_ticks, u32 * time_elapsed);
+#endif				/* ACPI_FUTURE_USAGE */
+
 #endif				/* __ACHWARE_H__ */

trunk/drivers/acpi/acpica/aclocal.h

@@ -370,7 +370,6 @@ struct acpi_predefined_data {
 /* Defines for Flags field above */
 
 #define ACPI_OBJECT_REPAIRED    1
-#define ACPI_OBJECT_WRAPPED     2
 
 /*
  * Bitmapped return value types

trunk/drivers/acpi/acpica/acmacros.h

@@ -516,12 +516,6 @@
 
 #endif				/* ACPI_DEBUG_OUTPUT */
 
-#if (!ACPI_REDUCED_HARDWARE)
-#define ACPI_HW_OPTIONAL_FUNCTION(addr)     addr
-#else
-#define ACPI_HW_OPTIONAL_FUNCTION(addr)     NULL
-#endif
-
 /*
  * Some code only gets executed when the debugger is built in.
  * Note that this is entirely independent of whether the

trunk/drivers/acpi/acpica/acnamesp.h

@@ -283,9 +283,8 @@ acpi_ns_repair_object(struct acpi_predefined_data *data,
 		      union acpi_operand_object **return_object_ptr);
 
 acpi_status
-acpi_ns_wrap_with_package(struct acpi_predefined_data *data,
-			  union acpi_operand_object *original_object,
-			  union acpi_operand_object **obj_desc_ptr);
+acpi_ns_repair_package_list(struct acpi_predefined_data *data,
+			    union acpi_operand_object **obj_desc_ptr);
 
 acpi_status
 acpi_ns_repair_null_element(struct acpi_predefined_data *data,

trunk/drivers/acpi/acpica/actables.h

@@ -67,11 +67,6 @@ acpi_status acpi_tb_resize_root_table_list(void);
 
 acpi_status acpi_tb_verify_table(struct acpi_table_desc *table_desc);
 
-struct acpi_table_header *acpi_tb_table_override(struct acpi_table_header
-						 *table_header,
-						 struct acpi_table_desc
-						 *table_desc);
-
 acpi_status
 acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index);
 

trunk/drivers/acpi/acpica/evevent.c

@@ -47,7 +47,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evevent")
-#if (!ACPI_REDUCED_HARDWARE)	/* Entire module */
+
 /* Local prototypes */
 static acpi_status acpi_ev_fixed_event_initialize(void);
 
@@ -291,5 +291,3 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
 	return ((acpi_gbl_fixed_event_handlers[event].
 		 handler) (acpi_gbl_fixed_event_handlers[event].context));
 }
-
-#endif				/* !ACPI_REDUCED_HARDWARE */

trunk/drivers/acpi/acpica/evglock.c

@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evglock")
-#if (!ACPI_REDUCED_HARDWARE)	/* Entire module */
+
 /* Local prototypes */
 static u32 acpi_ev_global_lock_handler(void *context);
 
@@ -339,5 +339,3 @@ acpi_status acpi_ev_release_global_lock(void)
 	acpi_os_release_mutex(acpi_gbl_global_lock_mutex->mutex.os_mutex);
 	return_ACPI_STATUS(status);
 }
-
-#endif				/* !ACPI_REDUCED_HARDWARE */

trunk/drivers/acpi/acpica/evgpe.c

@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpe")
-#if (!ACPI_REDUCED_HARDWARE)	/* Entire module */
+
 /* Local prototypes */
 static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context);
 
@@ -766,5 +766,3 @@ acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device,
 
 	return_UINT32(ACPI_INTERRUPT_HANDLED);
 }
-
-#endif				/* !ACPI_REDUCED_HARDWARE */

trunk/drivers/acpi/acpica/evgpeblk.c

@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeblk")
-#if (!ACPI_REDUCED_HARDWARE)	/* Entire module */
+
 /* Local prototypes */
 static acpi_status
 acpi_ev_install_gpe_block(struct acpi_gpe_block_info *gpe_block,
@@ -504,5 +504,3 @@ acpi_ev_initialize_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
 	return_ACPI_STATUS(AE_OK);
 }
-
-#endif				/* !ACPI_REDUCED_HARDWARE */

trunk/drivers/acpi/acpica/evgpeinit.c

@@ -48,7 +48,7 @@
 
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeinit")
-#if (!ACPI_REDUCED_HARDWARE)	/* Entire module */
+
 /*
  * Note: History of _PRW support in ACPICA
  *
@@ -440,5 +440,3 @@ acpi_ev_match_gpe_method(acpi_handle obj_handle,
 			  name, gpe_number));
 	return_ACPI_STATUS(AE_OK);
 }
-
-#endif				/* !ACPI_REDUCED_HARDWARE */

trunk/drivers/acpi/acpica/evgpeutil.c

@@ -48,7 +48,6 @@
 #define _COMPONENT          ACPI_EVENTS
 ACPI_MODULE_NAME("evgpeutil")
 
-#if (!ACPI_REDUCED_HARDWARE)	/* Entire module */
 /*******************************************************************************
  *
  * FUNCTION:    acpi_ev_walk_gpe_list
@@ -375,5 +374,3 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
 	return_ACPI_STATUS(AE_OK);
 }
-
-#endif				/* !ACPI_REDUCED_HARDWARE */