From 4889abaf25ffc6c628472378a2ce3ea568465c33 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Tue, 27 Jan 2009 16:26:30 +0000 Subject: [PATCH] kd64: Move KdpSysGetVersion into arch-specific file svn path=/branches/ros-amd64-bringup/; revision=39136 --- reactos/ntoskrnl/kd64/amd64/kd-amd64.c | 16 +++++++++++++++- reactos/ntoskrnl/kd64/i386/kd-i386.c | 8 ++++++++ reactos/ntoskrnl/kd64/kdapi.c | 10 ---------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/reactos/ntoskrnl/kd64/amd64/kd-amd64.c b/reactos/ntoskrnl/kd64/amd64/kd-amd64.c index 0f7e74669f4..13e8161b4f4 100644 --- a/reactos/ntoskrnl/kd64/amd64/kd-amd64.c +++ b/reactos/ntoskrnl/kd64/amd64/kd-amd64.c @@ -14,6 +14,20 @@ /* PRIVATE FUNCTIONS *********************************************************/ +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + /* Copy the version block */ + RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); + +Version->PsLoadedModuleList = &KeLoaderBlock->LoadOrderListHead; + + Version->Flags = DBGKD_VERS_FLAG_PTR64 | DBGKD_VERS_FLAG_DATA; + Version->KdSecondaryVersion = KD_SECONDARY_VERSION_AMD64_CONTEXT; + +} + VOID NTAPI KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, @@ -149,7 +163,7 @@ KdpTrap(IN PKTRAP_FRAME TrapFrame, PreviousMode, SecondChanceException); } - +FrLdrDbgPrint("leave KdpTrap\n"); /* Return TRUE or FALSE to caller */ return Status; } diff --git a/reactos/ntoskrnl/kd64/i386/kd-i386.c b/reactos/ntoskrnl/kd64/i386/kd-i386.c index 696ee625acf..b81af0711c8 100644 --- a/reactos/ntoskrnl/kd64/i386/kd-i386.c +++ b/reactos/ntoskrnl/kd64/i386/kd-i386.c @@ -14,6 +14,14 @@ /* PRIVATE FUNCTIONS *********************************************************/ +VOID +NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + /* Copy the version block */ + RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); +} + VOID NTAPI KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, diff --git a/reactos/ntoskrnl/kd64/kdapi.c b/reactos/ntoskrnl/kd64/kdapi.c index 06a74ed9592..ca7cffbc33e 100644 --- a/reactos/ntoskrnl/kd64/kdapi.c +++ b/reactos/ntoskrnl/kd64/kdapi.c @@ -206,14 +206,6 @@ KdpSetCommonState(IN ULONG NewState, } } -VOID -NTAPI -KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) -{ - /* Copy the version block */ - RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); -} - VOID NTAPI KdpGetVersion(IN PDBGKD_MANIPULATE_STATE64 State) @@ -227,8 +219,6 @@ KdpGetVersion(IN PDBGKD_MANIPULATE_STATE64 State) /* Get the version block */ KdpSysGetVersion(&State->u.GetVersion64); -//State->u.GetVersion64.PsLoadedModuleList = &KeLoaderBlock->LoadOrderListHead; - /* Fill out the state */ State->ApiNumber = DbgKdGetVersionApi; State->ReturnStatus = STATUS_SUCCESS;