- Get bus drivers to compile and link on MSVC.
authorAlex Ionescu <aionescu@gmail.com>
Sat, 7 Jan 2006 01:39:56 +0000 (01:39 +0000)
committerAlex Ionescu <aionescu@gmail.com>
Sat, 7 Jan 2006 01:39:56 +0000 (01:39 +0000)
svn path=/trunk/; revision=20641

reactos/drivers/bus/acpi/include/actypes.h
reactos/drivers/bus/acpi/ospm/acpisys.c
reactos/drivers/bus/isapnp/isapnp.c
reactos/drivers/bus/serenum/serenum.h

index 67a4537..c2cc112 100644 (file)
@@ -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 */
index a5d50cc..6a6a9d8 100644 (file)
 #define NDEBUG
 #include <debug.h>
 
+NTSTATUS
+STDCALL
+DriverEntry(
+  IN PDRIVER_OBJECT DriverObject,
+  IN PUNICODE_STRING RegistryPath
+);
+
 #ifdef  ALLOC_PRAGMA
 
 // Make the initialization routines discardable, so that they
index eb493bd..a11e04a 100644 (file)
 
 #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);
index cbe762e..c742701 100644 (file)
@@ -7,8 +7,8 @@
  * PROGRAMMERS:     HervĂ© Poussineau (hpoussin@reactos.com)
  */
 
-#include <ntddk.h>
 #include <ntifs.h>
+#include <ntddk.h>
 #include <ntddser.h>
 #include <stdio.h>