ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 38960 from trunk

Browse Source 
svn path=/branches/ros-amd64-bringup/; revision=39071
This commit is contained in:
Timo Kreuzer
2009-01-24 22:34:39 +00:00
parent 4fd7607a1b
commit 3210df5936
13 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/drivers/base/kdcom/i386/kdbg.c
+1 -1
View File
@@ -257,7 +257,7 @@ KdPortInitialize(
return FALSE;
/* set global info */
*KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
return TRUE;
}
reactos/drivers/bus/acpi/ospm/fdo.c
+1 -1
View File
@@ -402,7 +402,7 @@ AcpiCheckIfIsSerialDebugPort(
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;
reactos/drivers/serial/serial/pnp.c
+2 -1
View File
@@ -223,7 +223,8 @@ SerialPnpStartDevice(
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;
reactos/hal/hal/hal.c
+1 -1
View File
@@ -27,7 +27,7 @@
/* DATA **********************************************************************/
ULONG _KdComPortInUse = 0;
PUCHAR KdComPortInUse;
/* FUNCTIONS *****************************************************************/
reactos/hal/hal/hal.pspec
+1 -1
View File
@@ -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)
reactos/hal/hal/hal_amd64.def
+1 -1
View File
@@ -75,7 +75,7 @@ IoMapTransfer
IoReadPartitionTable
IoSetPartitionInformation
IoWritePartitionTable
KdComPortInUse=_KdComPortInUse DATA
KdComPortInUse DATA
KeFlushWriteBuffer
KeQueryPerformanceCounter
KeStallExecutionProcessor
reactos/hal/halarm/generic/hal.c
+1 -1
View File
@@ -27,7 +27,7 @@
/* DATA **********************************************************************/
ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount;
ULONG _KdComPortInUse = 0;
PUCHAR KdComPortInUse;
ULONG HalpIrqlTable[HIGH_LEVEL + 1] =
{
reactos/hal/halarm/include/halp.h
-5
View File
@@ -14,9 +14,4 @@
#include <peripherals/pl190.h>
#include <peripherals/sp804.h>
//
// WDK Hack
//
#define KdComPortInUse _KdComPortInUse
#endif /* __INTERNAL_HAL_HAL_H */
reactos/hal/halppc/generic/sysinfo.c
+1 -2
View File
@@ -12,8 +12,7 @@
#define NDEBUG
#include <debug.h>
#define KdComPortInUse _KdComPortInUse
ULONG KdComPortInUse = 0;
PUCHAR KdComPortInUse;
/* FUNCTIONS *****************************************************************/
reactos/hal/halppc/include/halp.h
-3
View File
@@ -8,9 +8,6 @@
/* Temporary hack */
#define KPCR_BASE 0xFF000000
/* WDK Hack */
#define KdComPortInUse _KdComPortInUse
#define HAL_APC_REQUEST 0
#define HAL_DPC_REQUEST 1
reactos/hal/halx86/generic/sysinfo.c
+1 -6
View File
@@ -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 *****************************************************************/
reactos/include/ndk/haltypes.h
+1 -3
View File
@@ -223,9 +223,7 @@ extern NTSYSAPI HAL_PRIVATE_DISPATCH HalPrivateDispatchTable;
//
// HAL Exports
//
#ifndef _NTHAL_
extern NTHALAPI PUCHAR *KdComPortInUse;
#endif
extern PUCHAR NTHALAPI KdComPortInUse;
#endif
#endif
reactos/ntoskrnl/kd/kdio.c
+2 -2
View File
@@ -97,7 +97,7 @@ KdpInitDebugLog(PKD_DISPATCH_TABLE DispatchTable,
if (BootPhase == 0)
{
*KdComPortInUse = NULL;
KdComPortInUse = NULL;
/* Write out the functions that we support for now */
DispatchTable->KdpInitRoutine = KdpInitDebugLog;
@@ -182,7 +182,7 @@ KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable,
KdpDebugMode.Serial = FALSE;
return;
}
*KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress;
KdComPortInUse = (PUCHAR)(ULONG_PTR)SerialPortInfo.BaseAddress;
/* Register as a Provider */
InsertTailList(&KdProviders, &DispatchTable->KdProvidersList);