[ros-diffs] [tkreuzer] 39071: Merge 38960 from trunk
tkreuzer at svn.reactos.org
tkreuzer at svn.reactos.org
Sat Jan 24 23:34:39 CET 2009
Author: tkreuzer
Date: Sat Jan 24 16:34:39 2009
New Revision: 39071
URL: http://svn.reactos.org/svn/reactos?rev=39071&view=rev
Log:
Merge 38960 from trunk
Modified:
branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c
branches/ros-amd64-bringup/reactos/drivers/bus/acpi/ospm/fdo.c
branches/ros-amd64-bringup/reactos/drivers/serial/serial/pnp.c
branches/ros-amd64-bringup/reactos/hal/hal/hal.c
branches/ros-amd64-bringup/reactos/hal/hal/hal.pspec
branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def
branches/ros-amd64-bringup/reactos/hal/halarm/generic/hal.c
branches/ros-amd64-bringup/reactos/hal/halarm/include/halp.h
branches/ros-amd64-bringup/reactos/hal/halppc/generic/sysinfo.c
branches/ros-amd64-bringup/reactos/hal/halppc/include/halp.h
branches/ros-amd64-bringup/reactos/hal/halx86/generic/sysinfo.c
branches/ros-amd64-bringup/reactos/include/ndk/haltypes.h
branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdio.c
Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- 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] Sat Jan 24 16:34:39 2009
@@ -257,7 +257,7 @@
return FALSE;
/* set global info */
- *KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
+ KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
return TRUE;
}
Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/ospm/fdo.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/bus/acpi/ospm/fdo.c?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/bus/acpi/ospm/fdo.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/bus/acpi/ospm/fdo.c [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -402,7 +402,7 @@
case io:
{
IO_RESOURCE *io_data = (IO_RESOURCE*) &resource->data;
- if (*KdComPortInUse == ULongToPtr(io_data->min_base_address))
+ if (KdComPortInUse == (PUCHAR)io_data->min_base_address)
{
ExFreePool(Buffer.pointer);
return TRUE;
Modified: branches/ros-amd64-bringup/reactos/drivers/serial/serial/pnp.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drivers/serial/serial/pnp.c?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/drivers/serial/serial/pnp.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/drivers/serial/serial/pnp.c [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -223,7 +223,8 @@
ComPortBase = ULongToPtr(DeviceExtension->BaseAddress);
/* Test if we are trying to start the serial port used for debugging */
- if (*KdComPortInUse == ULongToPtr(DeviceExtension->BaseAddress))
+ DPRINT1("Comparing addresses: KdComPortInUse: %p, ComPortBase: %p\n", KdComPortInUse, ComPortBase);
+ if (KdComPortInUse == ComPortBase)
{
INFO_(SERIAL, "Failing IRP_MN_START_DEVICE as this serial port is used for debugging\n");
return STATUS_INSUFFICIENT_RESOURCES;
Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/hal/hal.c?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -27,7 +27,7 @@
/* DATA **********************************************************************/
-ULONG _KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
/* FUNCTIONS *****************************************************************/
Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.pspec
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/hal/hal.pspec?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/hal/hal.pspec [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/hal/hal.pspec [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -78,7 +78,7 @@
@ stdcall IoSetPartitionInformation(ptr long long long) HalpSetPartitionInformation
@ stdcall IoWritePartitionTable(ptr long long long ptr) HalpWritePartitionTable
@ stdcall KeAcquireSpinLock(ptr ptr)
-@ extern KdComPortInUse _KdComPortInUse
+@ extern KdComPortInUse
@ stdcall KeFlushWriteBuffer()
@ stdcall KeGetCurrentIrql()
@ stdcall KeLowerIrql(long)
Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/hal/hal_amd64.def [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -75,7 +75,7 @@
IoReadPartitionTable
IoSetPartitionInformation
IoWritePartitionTable
-KdComPortInUse=_KdComPortInUse DATA
+KdComPortInUse DATA
KeFlushWriteBuffer
KeQueryPerformanceCounter
KeStallExecutionProcessor
Modified: branches/ros-amd64-bringup/reactos/hal/halarm/generic/hal.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halarm/generic/hal.c?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halarm/generic/hal.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halarm/generic/hal.c [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -27,7 +27,7 @@
/* DATA **********************************************************************/
ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount;
-ULONG _KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
ULONG HalpIrqlTable[HIGH_LEVEL + 1] =
{
Modified: branches/ros-amd64-bringup/reactos/hal/halarm/include/halp.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halarm/include/halp.h?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halarm/include/halp.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halarm/include/halp.h [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -14,9 +14,4 @@
#include <peripherals/pl190.h>
#include <peripherals/sp804.h>
-//
-// WDK Hack
-//
-#define KdComPortInUse _KdComPortInUse
-
#endif /* __INTERNAL_HAL_HAL_H */
Modified: branches/ros-amd64-bringup/reactos/hal/halppc/generic/sysinfo.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halppc/generic/sysinfo.c?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halppc/generic/sysinfo.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halppc/generic/sysinfo.c [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -12,8 +12,7 @@
#define NDEBUG
#include <debug.h>
-#define KdComPortInUse _KdComPortInUse
-ULONG KdComPortInUse = 0;
+PUCHAR KdComPortInUse;
/* FUNCTIONS *****************************************************************/
Modified: branches/ros-amd64-bringup/reactos/hal/halppc/include/halp.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halppc/include/halp.h?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halppc/include/halp.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halppc/include/halp.h [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -7,9 +7,6 @@
/* Temporary hack */
#define KPCR_BASE 0xFF000000
-
-/* WDK Hack */
-#define KdComPortInUse _KdComPortInUse
#define HAL_APC_REQUEST 0
#define HAL_DPC_REQUEST 1
Modified: branches/ros-amd64-bringup/reactos/hal/halx86/generic/sysinfo.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/halx86/generic/sysinfo.c?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/hal/halx86/generic/sysinfo.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/hal/halx86/generic/sysinfo.c [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -12,12 +12,7 @@
#define NDEBUG
#include <debug.h>
-#ifdef __GNUC__
-static PUCHAR realKdComPortInUse = 0;
-PUCHAR *_KdComPortInUse = &realKdComPortInUse;
-#else
-PUCHAR _KdComPortInUse = 0;
-#endif
+PUCHAR KdComPortInUse;
/* FUNCTIONS *****************************************************************/
Modified: branches/ros-amd64-bringup/reactos/include/ndk/haltypes.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/include/ndk/haltypes.h?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ndk/haltypes.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ndk/haltypes.h [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -223,12 +223,10 @@
//
// HAL Exports
//
-#ifndef _NTHAL_
-extern NTHALAPI PUCHAR *KdComPortInUse;
-#endif
-
-#endif
-#endif
-
-
-
+extern PUCHAR NTHALAPI KdComPortInUse;
+
+#endif
+#endif
+
+
+
Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdio.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdio.c?rev=39071&r1=39070&r2=39071&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Sat Jan 24 16:34:39 2009
@@ -97,7 +97,7 @@
if (BootPhase == 0)
{
- *KdComPortInUse = NULL;
+ KdComPortInUse = NULL;
/* Write out the functions that we support for now */
DispatchTable->KdpInitRoutine = KdpInitDebugLog;
@@ -182,7 +182,7 @@
KdpDebugMode.Serial = FALSE;
return;
}
- *KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress;
+ KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress;
/* Register as a Provider */
InsertTailList(&KdProviders, &DispatchTable->KdProvidersList);
More information about the Ros-diffs
mailing list