git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull acpica into release branch
[pandora-kernel.git]
/
include
/
acpi
/
acpiosxf.h
diff --git
a/include/acpi/acpiosxf.h
b/include/acpi/acpiosxf.h
index
58473f6
..
8f473c8
100644
(file)
--- a/
include/acpi/acpiosxf.h
+++ b/
include/acpi/acpiosxf.h
@@
-8,7
+8,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 200
5
, R. Byron Moore
+ * Copyright (C) 2000 - 200
6
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-50,12
+50,16
@@
#include "platform/acenv.h"
#include "actypes.h"
#include "platform/acenv.h"
#include "actypes.h"
-/*
Priorities for acpi_os_queue_for_execution
*/
+/*
Types for acpi_os_execute
*/
-#define OSD_PRIORITY_GPE 1
-#define OSD_PRIORITY_HIGH 2
-#define OSD_PRIORITY_MED 3
-#define OSD_PRIORITY_LO 4
+typedef enum {
+ OSL_GLOBAL_LOCK_HANDLER,
+ OSL_NOTIFY_HANDLER,
+ OSL_GPE_HANDLER,
+ OSL_DEBUGGER_THREAD,
+ OSL_EC_POLL_HANDLER,
+ OSL_EC_BURST_HANDLER
+} acpi_execute_type;
#define ACPI_NO_UNIT_LIMIT ((u32) -1)
#define ACPI_MUTEX_SEM 1
#define ACPI_NO_UNIT_LIMIT ((u32) -1)
#define ACPI_MUTEX_SEM 1
@@
-108,9
+112,9
@@
acpi_status acpi_os_create_lock(acpi_handle * out_handle);
void acpi_os_delete_lock(acpi_handle handle);
void acpi_os_delete_lock(acpi_handle handle);
-acpi_
native_uint
acpi_os_acquire_lock(acpi_handle handle);
+acpi_
cpu_flags
acpi_os_acquire_lock(acpi_handle handle);
-void acpi_os_release_lock(acpi_handle handle, acpi_
native_uint
flags);
+void acpi_os_release_lock(acpi_handle handle, acpi_
cpu_flags
flags);
/*
* Memory allocation and mapping
/*
* Memory allocation and mapping
@@
-161,13
+165,11
@@
acpi_os_remove_interrupt_handler(u32 gsi, acpi_osd_handler service_routine);
/*
* Threads and Scheduling
*/
/*
* Threads and Scheduling
*/
-
u32
acpi_os_get_thread_id(void);
+
acpi_thread_id
acpi_os_get_thread_id(void);
acpi_status
acpi_status
-acpi_os_queue_for_execution(u32 priority,
- acpi_osd_exec_callback function, void *context);
-
-void acpi_os_wait_events_complete(void *context);
+acpi_os_execute(acpi_execute_type type,
+ acpi_osd_exec_callback function, void *context);
void acpi_os_wait_events_complete(void *context);
void acpi_os_wait_events_complete(void *context);
@@
-214,6
+216,12
@@
acpi_os_derive_pci_id(acpi_handle rhandle,
/*
* Miscellaneous
*/
/*
* Miscellaneous
*/
+acpi_status acpi_os_validate_interface(char *interface);
+
+acpi_status
+acpi_os_validate_address(u8 space_id,
+ acpi_physical_address address, acpi_size length);
+
u8 acpi_os_readable(void *pointer, acpi_size length);
#ifdef ACPI_FUTURE_USAGE
u8 acpi_os_readable(void *pointer, acpi_size length);
#ifdef ACPI_FUTURE_USAGE
@@
-255,11
+263,4
@@
char *acpi_os_get_next_filename(void *dir_handle);
void acpi_os_close_directory(void *dir_handle);
void acpi_os_close_directory(void *dir_handle);
-/*
- * Debug
- */
-void
-acpi_os_dbg_assert(void *failed_assertion,
- void *file_name, u32 line_number, char *message);
-
#endif /* __ACPIOSXF_H__ */
#endif /* __ACPIOSXF_H__ */