diff --git a/reactos/drivers/bus/acpi/include/actypes.h b/reactos/drivers/bus/acpi/include/actypes.h index 67a45370214..c2cc1125ebc 100644 --- a/reactos/drivers/bus/acpi/include/actypes.h +++ b/reactos/drivers/bus/acpi/include/actypes.h @@ -191,6 +191,16 @@ typedef UINT64 u64; /* * Local datatypes */ +#ifdef _MSC_VER +typedef ULONGLONG u64; +typedef ULONG u32; +typedef USHORT u16; +typedef UCHAR u8; +typedef LONGLONG s64; +typedef LONG s32; +typedef SHORT s16; +typedef CHAR s8; +#endif typedef u32 ACPI_STATUS; /* All ACPI Exceptions */ typedef u32 ACPI_NAME; /* 4-s8 ACPI name */ diff --git a/reactos/drivers/bus/acpi/ospm/acpisys.c b/reactos/drivers/bus/acpi/ospm/acpisys.c index a5d50ccae58..6a6a9d83d60 100644 --- a/reactos/drivers/bus/acpi/ospm/acpisys.c +++ b/reactos/drivers/bus/acpi/ospm/acpisys.c @@ -14,6 +14,13 @@ #define NDEBUG #include +NTSTATUS +STDCALL +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath +); + #ifdef ALLOC_PRAGMA // Make the initialization routines discardable, so that they diff --git a/reactos/drivers/bus/isapnp/isapnp.c b/reactos/drivers/bus/isapnp/isapnp.c index eb493bde3a1..a11e04a56ed 100644 --- a/reactos/drivers/bus/isapnp/isapnp.c +++ b/reactos/drivers/bus/isapnp/isapnp.c @@ -22,12 +22,6 @@ #pragma alloc_text(init, DriverEntry) -// Make the PASSIVE_LEVEL routines pageable, so that they don't -// waste nonpaged memory - -#pragma alloc_text(page, ACPIDispatchOpenClose) -#pragma alloc_text(page, ACPIDispatchRead) -#pragma alloc_text(page, ACPIDispatchWrite) #endif /* ALLOC_PRAGMA */ @@ -92,18 +86,18 @@ PCSZ TagName(ULONG Tag, BOOLEAN Small) #endif -static inline VOID WriteData(UCHAR Value) +static __inline VOID WriteData(UCHAR Value) { WRITE_PORT_UCHAR((PUCHAR)ISAPNP_WRITE_PORT, Value); } -static inline VOID WriteAddress(UCHAR Value) +static __inline VOID WriteAddress(UCHAR Value) { WRITE_PORT_UCHAR((PUCHAR)ISAPNP_ADDRESS_PORT, Value); KeStallExecutionProcessor(20); } -static inline UCHAR ReadData(VOID) +static __inline UCHAR ReadData(VOID) { return READ_PORT_UCHAR(IsaPnPReadPort); } @@ -158,7 +152,7 @@ static VOID WriteUlong(UCHAR Index, ULONG Value) } #endif -static inline VOID SetReadDataPort(ULONG Port) +static __inline VOID SetReadDataPort(ULONG Port) { IsaPnPReadPort = (PUCHAR)Port; WriteUchar(0x00, Port >> 2); diff --git a/reactos/drivers/bus/serenum/serenum.h b/reactos/drivers/bus/serenum/serenum.h index cbe762e8070..c7427018c71 100644 --- a/reactos/drivers/bus/serenum/serenum.h +++ b/reactos/drivers/bus/serenum/serenum.h @@ -7,8 +7,8 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin@reactos.com) */ -#include #include +#include #include #include