git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
acpi
/
acpiosxf.h
diff --git
a/include/acpi/acpiosxf.h
b/include/acpi/acpiosxf.h
index
ab44151
..
a76c952
100644
(file)
--- a/
include/acpi/acpiosxf.h
+++ b/
include/acpi/acpiosxf.h
@@
-169,11
+169,11
@@
acpi_status
acpi_os_map_memory (
acpi_physical_address physical_address,
acpi_size size,
acpi_os_map_memory (
acpi_physical_address physical_address,
acpi_size size,
- void
**logical_address);
+ void
__iomem
**logical_address);
void
acpi_os_unmap_memory (
void
acpi_os_unmap_memory (
- void
*logical_address,
+ void
__iomem
*logical_address,
acpi_size size);
acpi_status
acpi_size size);
acpi_status
@@
-189,13
+189,13
@@
acpi_os_get_physical_address (
acpi_status
acpi_os_install_interrupt_handler (
u32 gsi,
acpi_status
acpi_os_install_interrupt_handler (
u32 gsi,
-
OSD_HANDLER
service_routine,
+
acpi_osd_handler
service_routine,
void *context);
acpi_status
acpi_os_remove_interrupt_handler (
void *context);
acpi_status
acpi_os_remove_interrupt_handler (
- u32
interrupt_number
,
-
OSD_HANDLER
service_routine);
+ u32
gsi
,
+
acpi_osd_handler
service_routine);
/*
/*
@@
-209,9
+209,13
@@
acpi_os_get_thread_id (
acpi_status
acpi_os_queue_for_execution (
u32 priority,
acpi_status
acpi_os_queue_for_execution (
u32 priority,
-
OSD_EXECUTION_CALLBACK
function,
+
acpi_osd_exec_callback
function,
void *context);
void *context);
+void
+acpi_os_wait_events_complete(
+ void * context);
+
void
acpi_os_sleep (
u32 seconds,
void
acpi_os_sleep (
u32 seconds,
@@
-258,25
+262,28
@@
acpi_os_write_memory (
/*
* Platform and hardware-independent PCI configuration space access
/*
* Platform and hardware-independent PCI configuration space access
+ * Note: Can't use "Register" as a parameter, changed to "Reg" --
+ * certain compilers complain.
*/
acpi_status
acpi_os_read_pci_configuration (
struct acpi_pci_id *pci_id,
*/
acpi_status
acpi_os_read_pci_configuration (
struct acpi_pci_id *pci_id,
- u32 reg
ister
,
+ u32 reg,
void *value,
u32 width);
acpi_status
acpi_os_write_pci_configuration (
struct acpi_pci_id *pci_id,
void *value,
u32 width);
acpi_status
acpi_os_write_pci_configuration (
struct acpi_pci_id *pci_id,
- u32 reg
ister
,
+ u32 reg,
acpi_integer value,
u32 width);
/*
* Interim function needed for PCI IRQ routing
*/
acpi_integer value,
u32 width);
/*
* Interim function needed for PCI IRQ routing
*/
+
void
acpi_os_derive_pci_id(
acpi_handle rhandle,
void
acpi_os_derive_pci_id(
acpi_handle rhandle,