[ros-diffs] [tkreuzer] 35685: Make kdcom x86 code 64bit compatible and use it for amd64, too. Add a DriverEntry to make ld happy.

Author: tkreuzer
Date: Tue Aug 26 16:29:31 2008
New Revision: 35685

URL: http://svn.reactos.org/svn/reactos?rev=35685&view=rev
Log:
Make kdcom x86 code 64bit compatible and use it for amd64, too. Add a DriverEntry to make ld happy.

Removed:
    branches/ros-amd64-bringup/reactos/drivers/base/kdcom/amd64/
Modified:
    branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c
    branches/ros-amd64-bringup/reactos/drivers/base/kdcom/kdcom.rbuild

Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver...
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Tue Aug 26 16:29:31 2008
@@ -24,7 +24,7 @@
 {
     ULONG ComPort;
     ULONG BaudRate;
-    ULONG BaseAddress;
+    ULONG_PTR BaseAddress;
 } KD_PORT_INFORMATION, *PKD_PORT_INFORMATION;

BOOLEAN
@@ -62,6 +62,8 @@
 const ULONG BaseArray[3] = {0, 0x80006000, 0x80007000};
 #elif defined(_M_ARM)
 const ULONG BaseArray[2] = {0, 0xF1012000};
+#elif defined(_M_AMD64)
+const ULONG BaseArray[5] = {0, 0x3F8, 0x2F8, 0x3E8, 0x2E8};
 #else
 #error Unknown architecture
 #endif
@@ -126,7 +128,7 @@

static BOOLEAN
 KdpDoesComPortExist(
-    IN ULONG BaseAddress)
+    IN ULONG_PTR BaseAddress)
 {
     BOOLEAN found;
     UCHAR mcr;
@@ -185,6 +187,14 @@

/* FUNCTIONS ****************************************************************/
+
+NTSTATUS
+DriverEntry(
+    IN PDRIVER_OBJECT  DriverObject,
+    IN PUNICODE_STRING  RegistryPath)
+{
+    return STATUS_SUCCESS;
+}

/* HAL.KdPortInitialize */
 BOOLEAN
@@ -245,7 +255,7 @@
     IN ULONG Unknown1,
     IN ULONG Unknown2)
 {
-    ULONG ComPortBase;
+    ULONG_PTR ComPortBase;
     CHAR buffer[80];
     ULONG divisor;
     UCHAR lcr;

Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/kdcom.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/driver...
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/kdcom.rbuild [iso-8859-1] Tue Aug 26 16:29:31 2008
@@ -17,7 +17,7 @@
    	</directory>
    </if>
    <if property="ARCH" value="amd64">
-		<directory name="amd64">
+		<directory name="i386">
    			<file>kdbg.c</file>
    	</directory>
    </if>