Author: gadamopoulos Date: Tue Feb 15 17:12:36 2011 New Revision: 50713
URL: http://svn.reactos.org/svn/reactos?rev=50713&view=rev Log: [acpi] -Fix compilation with msc
Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c branches/cmake-bringup/drivers/bus/acpi/main.c branches/cmake-bringup/drivers/bus/acpi/osl.c branches/cmake-bringup/drivers/bus/acpi/pnp.c
Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/b... ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/button.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -42,13 +42,13 @@ static int acpi_button_remove (struct acpi_device *device, int type);
static struct acpi_driver acpi_button_driver = { - .name = ACPI_BUTTON_DRIVER_NAME, - .class = ACPI_BUTTON_CLASS, - .ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", - .ops = { - .add = acpi_button_add, - .remove = acpi_button_remove, - }, + {0,0}, + ACPI_BUTTON_DRIVER_NAME, + ACPI_BUTTON_CLASS, + 0, + 0, + "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E", + {acpi_button_add,acpi_button_remove} };
struct acpi_button {
Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/b... ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/power.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -64,14 +64,13 @@ static int acpi_power_resume(struct acpi_device *device, int state);
static struct acpi_driver acpi_power_driver = { - .name = ACPI_POWER_DRIVER_NAME, - .class = ACPI_POWER_CLASS, - .ids = ACPI_POWER_HID, - .ops = { - .add = acpi_power_add, - .remove = acpi_power_remove, - .resume = acpi_power_resume, - }, + {0,0}, + ACPI_POWER_DRIVER_NAME, + ACPI_POWER_CLASS, + 0, + 0, + ACPI_POWER_HID, + {acpi_power_add, acpi_power_remove, NULL, NULL, acpi_power_resume} };
struct acpi_power_reference {
Modified: branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/b... ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/busmgr/system.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -48,13 +48,13 @@ ACPI_STATUS acpi_suspend (UINT32 state);
static struct acpi_driver acpi_system_driver = { - .name = ACPI_SYSTEM_DRIVER_NAME, - .class = ACPI_SYSTEM_CLASS, - .ids = ACPI_SYSTEM_HID, - .ops = { - .add = acpi_system_add, - .remove = acpi_system_remove - }, + {0,0}, + ACPI_SYSTEM_DRIVER_NAME, + ACPI_SYSTEM_CLASS, + 0, + 0, + ACPI_SYSTEM_HID, + {acpi_system_add, acpi_system_remove} };
struct acpi_system
Modified: branches/cmake-bringup/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/m... ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/main.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -11,6 +11,13 @@
#define NDEBUG #include <debug.h> + +NTSTATUS +NTAPI +DriverEntry ( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath + );
#ifdef ALLOC_PRAGMA #pragma alloc_text (INIT, DriverEntry)
Modified: branches/cmake-bringup/drivers/bus/acpi/osl.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/o... ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/osl.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/osl.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -67,6 +67,8 @@ ACPI_STATUS AcpiOsInitialize (void) { + UINT32 i; + DPRINT("AcpiOsInitialize called\n");
#ifndef NDEBUG @@ -74,8 +76,6 @@ AcpiDbgLevel = 0x00FFFFFF; AcpiDbgLayer = 0xFFFFFFFF; #endif - - UINT32 i;
for (i = 0; i < NUM_SEMAPHORES; i++) { @@ -209,10 +209,11 @@ AcpiOsAcquireObject ( ACPI_CACHE_T *Cache) { + void* ptr; PNPAGED_LOOKASIDE_LIST List = (PNPAGED_LOOKASIDE_LIST)Cache; + DPRINT("AcpiOsAcquireObject from %p\n", Cache); - void* ptr = - ExAllocateFromNPagedLookasideList(List); + ptr = ExAllocateFromNPagedLookasideList(List); ASSERT(ptr);
RtlZeroMemory(ptr,List->L.Size); @@ -692,8 +693,10 @@ UINT64 AcpiOsGetTimer (void) { + LARGE_INTEGER Timer; + DPRINT("AcpiOsGetTimer\n"); - LARGE_INTEGER Timer; + KeQueryTickCount(&Timer);
return Timer.QuadPart; @@ -758,9 +761,10 @@ AcpiOsGetRootPointer ( void) { + ACPI_PHYSICAL_ADDRESS pa = 0; + DPRINT("AcpiOsGetRootPointer\n"); - ACPI_PHYSICAL_ADDRESS pa = 0; - + AcpiFindRootPointer(&pa); return pa; }
Modified: branches/cmake-bringup/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/p... ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/pnp.c [iso-8859-1] Tue Feb 15 17:12:36 2011 @@ -9,12 +9,17 @@ #include <wdmguid.h> #define NDEBUG #include <debug.h> + +NTSTATUS +Bus_PlugInDevice ( + struct acpi_device *Device, + PFDO_DEVICE_DATA FdoData + );
#ifdef ALLOC_PRAGMA #pragma alloc_text (PAGE, Bus_PnP) #pragma alloc_text (PAGE, Bus_PlugInDevice) #pragma alloc_text (PAGE, Bus_InitializePdo) -#pragma alloc_text (PAGE, Bus_UnPlugDevice) #pragma alloc_text (PAGE, Bus_DestroyPdo) #pragma alloc_text (PAGE, Bus_FDO_PnP) #pragma alloc_text (PAGE, Bus_StartFdo)
-
gadamopoulos＠svn.reactos.org