[ACPI]

- Add some missing NTAPI
- Fix AcpiInterfaceConnectVector and AcpiInterfaceDisconnectVector parameters (ACPI_INTERFACE_STANDARD version 1 not version 2)
- Patch by Amine Khaldi

svn path=/trunk/; revision=47489

diff --git a/reactos/drivers/bus/acpi/busmgr/bus.c b/reactos/drivers/bus/acpi/busmgr/bus.c
index ae04c2c..9860055 100644 (file)
--- a/reactos/drivers/bus/acpi/busmgr/bus.c
+++ b/reactos/drivers/bus/acpi/busmgr/bus.c
@@ -457,6 +457,7 @@ acpi_bus_get_perf_flags (
    -------------------------------------------------------------------------- */
 
 void
    -------------------------------------------------------------------------- */
 
 void

+NTAPI

 acpi_bus_generate_event_dpc(PKDPC Dpc,
                             PVOID DeferredContext,
                             PVOID SystemArgument1,
 acpi_bus_generate_event_dpc(PKDPC Dpc,
                             PVOID DeferredContext,
                             PVOID SystemArgument1,

diff --git a/reactos/drivers/bus/acpi/include/acpisys.h b/reactos/drivers/bus/acpi/include/acpisys.h
index adf2a0c..eb171f1 100644 (file)
--- a/reactos/drivers/bus/acpi/include/acpisys.h
+++ b/reactos/drivers/bus/acpi/include/acpisys.h
@@ -130,6 +130,7 @@ Bus_PnP (
     );
 
 NTSTATUS
     );
 
 NTSTATUS

+NTAPI

 Bus_CompletionRoutine(
      PDEVICE_OBJECT   DeviceObject,
      PIRP             Irp,
 Bus_CompletionRoutine(
      PDEVICE_OBJECT   DeviceObject,
      PIRP             Irp,

diff --git a/reactos/drivers/bus/acpi/interface.c b/reactos/drivers/bus/acpi/interface.c
index 5971705..4e54115 100644 (file)
--- a/reactos/drivers/bus/acpi/interface.c
+++ b/reactos/drivers/bus/acpi/interface.c
@@ -25,13 +25,14 @@ AcpiInterfaceDereference(PVOID Context)
 }
 
 NTSTATUS
 }
 
 NTSTATUS

+NTAPI

 AcpiInterfaceConnectVector(PDEVICE_OBJECT Context,
                            ULONG GpeNumber,
                            KINTERRUPT_MODE Mode,
                            BOOLEAN Shareable,
                            PGPE_SERVICE_ROUTINE ServiceRoutine,
                            PVOID ServiceContext,
 AcpiInterfaceConnectVector(PDEVICE_OBJECT Context,
                            ULONG GpeNumber,
                            KINTERRUPT_MODE Mode,
                            BOOLEAN Shareable,
                            PGPE_SERVICE_ROUTINE ServiceRoutine,
                            PVOID ServiceContext,

-                           PVOID *ObjectContext)
+                           PVOID ObjectContext)

 {
   UNIMPLEMENTED
 
 {
   UNIMPLEMENTED
 


@@ -39,8 +40,8 @@ AcpiInterfaceConnectVector(PDEVICE_OBJECT Context,
 }
 
 NTSTATUS
 }
 
 NTSTATUS

-AcpiInterfaceDisconnectVector(PDEVICE_OBJECT Context,
-                              PVOID ObjectContext)
+NTAPI
+AcpiInterfaceDisconnectVector(PVOID ObjectContext)

 {
   UNIMPLEMENTED
 
 {
   UNIMPLEMENTED
 


@@ -48,6 +49,7 @@ AcpiInterfaceDisconnectVector(PDEVICE_OBJECT Context,
 }
 
 NTSTATUS
 }
 
 NTSTATUS

+NTAPI

 AcpiInterfaceEnableEvent(PDEVICE_OBJECT Context,
                          PVOID ObjectContext)
 {
 AcpiInterfaceEnableEvent(PDEVICE_OBJECT Context,
                          PVOID ObjectContext)
 {


@@ -57,6 +59,7 @@ AcpiInterfaceEnableEvent(PDEVICE_OBJECT Context,
 }
 
 NTSTATUS
 }
 
 NTSTATUS

+NTAPI

 AcpiInterfaceDisableEvent(PDEVICE_OBJECT Context,
                           PVOID ObjectContext)
 {
 AcpiInterfaceDisableEvent(PDEVICE_OBJECT Context,
                           PVOID ObjectContext)
 {


@@ -66,6 +69,7 @@ AcpiInterfaceDisableEvent(PDEVICE_OBJECT Context,
 }
 
 NTSTATUS
 }
 
 NTSTATUS

+NTAPI

 AcpiInterfaceClearStatus(PDEVICE_OBJECT Context,
                          PVOID ObjectContext)
 {
 AcpiInterfaceClearStatus(PDEVICE_OBJECT Context,
                          PVOID ObjectContext)
 {


@@ -75,6 +79,7 @@ AcpiInterfaceClearStatus(PDEVICE_OBJECT Context,
 }
 
 NTSTATUS
 }
 
 NTSTATUS

+NTAPI

 AcpiInterfaceNotificationsRegister(PDEVICE_OBJECT Context,
                                    PDEVICE_NOTIFY_CALLBACK NotificationHandler,
                                    PVOID NotificationContext)
 AcpiInterfaceNotificationsRegister(PDEVICE_OBJECT Context,
                                    PDEVICE_NOTIFY_CALLBACK NotificationHandler,
                                    PVOID NotificationContext)


@@ -85,6 +90,7 @@ AcpiInterfaceNotificationsRegister(PDEVICE_OBJECT Context,
 }
 
 VOID
 }
 
 VOID

+NTAPI

 AcpiInterfaceNotificationsUnregister(PDEVICE_OBJECT Context,
                                      PDEVICE_NOTIFY_CALLBACK NotificationHandler)
 {
 AcpiInterfaceNotificationsUnregister(PDEVICE_OBJECT Context,
                                      PDEVICE_NOTIFY_CALLBACK NotificationHandler)
 {

diff --git a/reactos/drivers/bus/acpi/pnp.c b/reactos/drivers/bus/acpi/pnp.c
index c82a390..9259fb9 100644 (file)
--- a/reactos/drivers/bus/acpi/pnp.c
+++ b/reactos/drivers/bus/acpi/pnp.c
@@ -363,6 +363,7 @@ Bus_SendIrpSynchronously (
 }
 
 NTSTATUS
 }
 
 NTSTATUS

+NTAPI

 Bus_CompletionRoutine(
     PDEVICE_OBJECT   DeviceObject,
     PIRP             Irp,
 Bus_CompletionRoutine(
     PDEVICE_OBJECT   DeviceObject,
     PIRP             Irp,