[ros-diffs] [ion] 20641: - Get bus drivers to compile and link on MSVC.

[ion at svn.reactos.org]

- Get bus drivers to compile and link on MSVC.
Modified: trunk/reactos/drivers/bus/acpi/include/actypes.h
Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c
Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c
Modified: trunk/reactos/drivers/bus/serenum/serenum.h
  _____  

Modified: trunk/reactos/drivers/bus/acpi/include/actypes.h
--- trunk/reactos/drivers/bus/acpi/include/actypes.h	2006-01-07
01:37:37 UTC (rev 20640)
+++ trunk/reactos/drivers/bus/acpi/include/actypes.h	2006-01-07
01:39:56 UTC (rev 20641)
@@ -191,6 +191,16 @@

 /*
  * 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 */
  _____  

Modified: trunk/reactos/drivers/bus/acpi/ospm/acpisys.c
--- trunk/reactos/drivers/bus/acpi/ospm/acpisys.c	2006-01-07
01:37:37 UTC (rev 20640)
+++ trunk/reactos/drivers/bus/acpi/ospm/acpisys.c	2006-01-07
01:39:56 UTC (rev 20641)
@@ -14,6 +14,13 @@

 #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
  _____  

Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c
--- trunk/reactos/drivers/bus/isapnp/isapnp.c	2006-01-07 01:37:37 UTC
(rev 20640)
+++ trunk/reactos/drivers/bus/isapnp/isapnp.c	2006-01-07 01:39:56 UTC
(rev 20641)
@@ -22,13 +22,7 @@

 
 #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 @@
 
 #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 @@
 }
 #endif
 
-static inline VOID SetReadDataPort(ULONG Port)
+static __inline VOID SetReadDataPort(ULONG Port)
 {
   IsaPnPReadPort = (PUCHAR)Port;
 	WriteUchar(0x00, Port >> 2);
  _____  

Modified: trunk/reactos/drivers/bus/serenum/serenum.h
--- trunk/reactos/drivers/bus/serenum/serenum.h	2006-01-07 01:37:37 UTC
(rev 20640)
+++ trunk/reactos/drivers/bus/serenum/serenum.h	2006-01-07 01:39:56 UTC
(rev 20641)
@@ -7,8 +7,8 @@

  * PROGRAMMERS:     HervÚ Poussineau (hpoussin at reactos.com)
  */
 
+#include <ntifs.h>
 #include <ntddk.h>
-#include <ntifs.h>
 #include <ntddser.h>
 #include <stdio.h>
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20060107/fb044559/attachment.html