aboutsummaryrefslogtreecommitdiffstats
path: root/include/acpi/acpixf.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/acpi/acpixf.h')
-rw-r--r--include/acpi/acpixf.h39
1 files changed, 13 insertions, 26 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 4278aba96503..d2f16f14b419 100644
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -46,7 +46,7 @@
46 46
47/* Current ACPICA subsystem version in YYYYMMDD format */ 47/* Current ACPICA subsystem version in YYYYMMDD format */
48 48
49#define ACPI_CA_VERSION 0x20131115 49#define ACPI_CA_VERSION 0x20131218
50 50
51#include <acpi/acconfig.h> 51#include <acpi/acconfig.h>
52#include <acpi/actypes.h> 52#include <acpi/actypes.h>
@@ -54,7 +54,6 @@
54#include <acpi/acbuffer.h> 54#include <acpi/acbuffer.h>
55 55
56extern u8 acpi_gbl_permanent_mmap; 56extern u8 acpi_gbl_permanent_mmap;
57extern u32 acpi_rsdt_forced;
58 57
59/* 58/*
60 * Globals that are publically available 59 * Globals that are publically available
@@ -72,17 +71,19 @@ extern u32 acpi_dbg_layer;
72 71
73/* ACPICA runtime options */ 72/* ACPICA runtime options */
74 73
75extern u8 acpi_gbl_enable_interpreter_slack;
76extern u8 acpi_gbl_all_methods_serialized; 74extern u8 acpi_gbl_all_methods_serialized;
77extern u8 acpi_gbl_create_osi_method;
78extern u8 acpi_gbl_use_default_register_widths;
79extern acpi_name acpi_gbl_trace_method_name;
80extern u32 acpi_gbl_trace_flags;
81extern bool acpi_gbl_enable_aml_debug_object;
82extern u8 acpi_gbl_copy_dsdt_locally; 75extern u8 acpi_gbl_copy_dsdt_locally;
83extern u8 acpi_gbl_truncate_io_addresses; 76extern u8 acpi_gbl_create_osi_method;
84extern u8 acpi_gbl_disable_auto_repair; 77extern u8 acpi_gbl_disable_auto_repair;
85extern u8 acpi_gbl_disable_ssdt_table_load; 78extern u8 acpi_gbl_disable_ssdt_table_load;
79extern u8 acpi_gbl_do_not_use_xsdt;
80extern bool acpi_gbl_enable_aml_debug_object;
81extern u8 acpi_gbl_enable_interpreter_slack;
82extern u32 acpi_gbl_trace_flags;
83extern acpi_name acpi_gbl_trace_method_name;
84extern u8 acpi_gbl_truncate_io_addresses;
85extern u8 acpi_gbl_use32_bit_fadt_addresses;
86extern u8 acpi_gbl_use_default_register_widths;
86 87
87/* 88/*
88 * Hardware-reduced prototypes. All interfaces that use these macros will 89 * Hardware-reduced prototypes. All interfaces that use these macros will
@@ -130,10 +131,9 @@ acpi_status __init acpi_terminate(void);
130 * Miscellaneous global interfaces 131 * Miscellaneous global interfaces
131 */ 132 */
132ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable(void)) 133ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable(void))
133
134ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable(void)) 134ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable(void))
135#ifdef ACPI_FUTURE_USAGE 135#ifdef ACPI_FUTURE_USAGE
136 acpi_status acpi_subsystem_status(void); 136acpi_status acpi_subsystem_status(void);
137#endif 137#endif
138 138
139#ifdef ACPI_FUTURE_USAGE 139#ifdef ACPI_FUTURE_USAGE
@@ -278,16 +278,13 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
278 acpi_install_sci_handler(acpi_sci_handler 278 acpi_install_sci_handler(acpi_sci_handler
279 address, 279 address,
280 void *context)) 280 void *context))
281
282ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 281ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
283 acpi_remove_sci_handler(acpi_sci_handler 282 acpi_remove_sci_handler(acpi_sci_handler
284 address)) 283 address))
285
286ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 284ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
287 acpi_install_global_event_handler 285 acpi_install_global_event_handler
288 (acpi_gbl_event_handler handler, 286 (acpi_gbl_event_handler handler,
289 void *context)) 287 void *context))
290
291ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 288ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
292 acpi_install_fixed_event_handler(u32 289 acpi_install_fixed_event_handler(u32
293 acpi_event, 290 acpi_event,
@@ -295,12 +292,10 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
295 handler, 292 handler,
296 void 293 void
297 *context)) 294 *context))
298
299ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 295ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
300 acpi_remove_fixed_event_handler(u32 acpi_event, 296 acpi_remove_fixed_event_handler(u32 acpi_event,
301 acpi_event_handler 297 acpi_event_handler
302 handler)) 298 handler))
303
304ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 299ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
305 acpi_install_gpe_handler(acpi_handle 300 acpi_install_gpe_handler(acpi_handle
306 gpe_device, 301 gpe_device,
@@ -309,15 +304,14 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
309 acpi_gpe_handler 304 acpi_gpe_handler
310 address, 305 address,
311 void *context)) 306 void *context))
312
313ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 307ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
314 acpi_remove_gpe_handler(acpi_handle gpe_device, 308 acpi_remove_gpe_handler(acpi_handle gpe_device,
315 u32 gpe_number, 309 u32 gpe_number,
316 acpi_gpe_handler 310 acpi_gpe_handler
317 address)) 311 address))
318acpi_status acpi_install_notify_handler(acpi_handle device, u32 handler_type, 312acpi_status acpi_install_notify_handler(acpi_handle device, u32 handler_type,
319 acpi_notify_handler handler, 313 acpi_notify_handler handler,
320 void *context); 314 void *context);
321 315
322acpi_status 316acpi_status
323acpi_remove_notify_handler(acpi_handle device, 317acpi_remove_notify_handler(acpi_handle device,
@@ -366,7 +360,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
366 360
367ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 361ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
368 acpi_disable_event(u32 event, u32 flags)) 362 acpi_disable_event(u32 event, u32 flags))
369
370ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_clear_event(u32 event)) 363ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_clear_event(u32 event))
371 364
372ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 365ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
@@ -404,20 +397,16 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
404 parent_device, 397 parent_device,
405 acpi_handle gpe_device, 398 acpi_handle gpe_device,
406 u32 gpe_number)) 399 u32 gpe_number))
407
408ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 400ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
409 acpi_set_gpe_wake_mask(acpi_handle gpe_device, 401 acpi_set_gpe_wake_mask(acpi_handle gpe_device,
410 u32 gpe_number, 402 u32 gpe_number,
411 u8 action)) 403 u8 action))
412
413ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 404ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
414 acpi_get_gpe_status(acpi_handle gpe_device, 405 acpi_get_gpe_status(acpi_handle gpe_device,
415 u32 gpe_number, 406 u32 gpe_number,
416 acpi_event_status 407 acpi_event_status
417 *event_status)) 408 *event_status))
418
419ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void)) 409ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void))
420
421ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void)) 410ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void))
422 411
423ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 412ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
@@ -431,7 +420,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
431 *gpe_block_address, 420 *gpe_block_address,
432 u32 register_count, 421 u32 register_count,
433 u32 interrupt_number)) 422 u32 interrupt_number))
434
435ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 423ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
436 acpi_remove_gpe_block(acpi_handle gpe_device)) 424 acpi_remove_gpe_block(acpi_handle gpe_device))
437 425
@@ -532,7 +520,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
532#ifdef ACPI_FUTURE_USAGE 520#ifdef ACPI_FUTURE_USAGE
533ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 521ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status
534 acpi_get_timer_resolution(u32 *resolution)) 522 acpi_get_timer_resolution(u32 *resolution))
535
536ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_get_timer(u32 *ticks)) 523ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_get_timer(u32 *ticks))
537 524
538ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status 525ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status