From f5e22351fbcd807d5dd850428d59ddd2ae0b3eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 5 May 2013 19:21:03 +0000 Subject: [PATCH] [KDROSDBG] Remove some unneeded legacy. svn path=/branches/kd++/; revision=58948 --- drivers/base/kdrosdbg/CMakeLists.txt | 2 +- drivers/base/kdrosdbg/arm/kdbg.c | 48 +++++------------ drivers/base/kdrosdbg/i386/kdbg.c | 78 +++++----------------------- drivers/base/kdrosdbg/kdrosdbg.spec | 10 ++-- 4 files changed, 33 insertions(+), 105 deletions(-) diff --git a/drivers/base/kdrosdbg/CMakeLists.txt b/drivers/base/kdrosdbg/CMakeLists.txt index 468293d3a0c..4f6e8f29249 100644 --- a/drivers/base/kdrosdbg/CMakeLists.txt +++ b/drivers/base/kdrosdbg/CMakeLists.txt @@ -10,7 +10,7 @@ elseif(ARCH STREQUAL "arm") endif(ARCH STREQUAL "i386") list(APPEND SOURCE kdrosdbg.rc - ${CMAKE_CURRENT_BINARY_DIR}/kdrosdbg.def) + ${CMAKE_CURRENT_BINARY_DIR}/kdcom.def) add_library(kdcom SHARED ${SOURCE}) diff --git a/drivers/base/kdrosdbg/arm/kdbg.c b/drivers/base/kdrosdbg/arm/kdbg.c index 1768d03683a..6acb493ac92 100644 --- a/drivers/base/kdrosdbg/arm/kdbg.c +++ b/drivers/base/kdrosdbg/arm/kdbg.c @@ -169,40 +169,6 @@ KdPortPutByte(IN UCHAR ByteToSend) KdPortPutByteEx(&DefaultPort, ByteToSend); } -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; - while (TRUE); -} - -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; - while (TRUE); -} - -BOOLEAN -NTAPI -KdPortDisableInterrupts(VOID) -{ - UNIMPLEMENTED; - while (TRUE); - return TRUE; -} - -BOOLEAN -NTAPI -KdPortEnableInterrupts(VOID) -{ - UNIMPLEMENTED; - while (TRUE); - return TRUE; -} - /* WINDOWS FUNCTIONS **********************************************************/ NTSTATUS @@ -221,6 +187,20 @@ KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + return STATUS_SUCCESS; +} + NTSTATUS NTAPI KdSave(IN BOOLEAN SleepTransition) diff --git a/drivers/base/kdrosdbg/i386/kdbg.c b/drivers/base/kdrosdbg/i386/kdbg.c index 45a736de954..a58989edd4e 100644 --- a/drivers/base/kdrosdbg/i386/kdbg.c +++ b/drivers/base/kdrosdbg/i386/kdbg.c @@ -355,70 +355,6 @@ KdPortPutByteEx( WRITE_PORT_UCHAR(SER_THR(ComPortBase), ByteToSend); } - -/* HAL.KdPortRestore */ -VOID -NTAPI -KdPortRestore(VOID) -{ - UNIMPLEMENTED; -} - - -/* HAL.KdPortSave */ -VOID -NTAPI -KdPortSave(VOID) -{ - UNIMPLEMENTED; -} - - -/* HAL.KdPortDisableInterrupts */ -BOOLEAN -NTAPI -KdPortDisableInterrupts(VOID) -{ - UCHAR ch; - - if (!PortInitialized) - return FALSE; - - ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); - ch &= (~(SR_MCR_OUT1 | SR_MCR_OUT2)); - WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); - - ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); - ch &= (~SR_IER_ALL); - WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); - - return TRUE; -} - - -/* HAL.KdPortEnableInterrupts */ -BOOLEAN -NTAPI -KdPortEnableInterrupts(VOID) -{ - UCHAR ch; - - if (PortInitialized == FALSE) - return FALSE; - - ch = READ_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress)); - ch &= (~SR_IER_ALL); - ch |= SR_IER_ERDA; - WRITE_PORT_UCHAR(SER_IER(DefaultPort.BaseAddress), ch); - - ch = READ_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress)); - ch &= (~SR_MCR_LOOP); - ch |= (SR_MCR_OUT1 | SR_MCR_OUT2); - WRITE_PORT_UCHAR(SER_MCR(DefaultPort.BaseAddress), ch); - - return TRUE; -} - /* * @unimplemented */ @@ -441,6 +377,20 @@ KdDebuggerInitialize1( return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + return STATUS_SUCCESS; +} + /* * @implemented */ diff --git a/drivers/base/kdrosdbg/kdrosdbg.spec b/drivers/base/kdrosdbg/kdrosdbg.spec index 64f642e2ae4..c893a5ebf24 100644 --- a/drivers/base/kdrosdbg/kdrosdbg.spec +++ b/drivers/base/kdrosdbg/kdrosdbg.spec @@ -7,15 +7,13 @@ @ stdcall KdPortPollByteEx(ptr ptr) @ stdcall KdPortPutByte(long) @ stdcall KdPortPutByteEx(ptr long) -@ stdcall KdPortRestore() -@ stdcall KdPortSave() -@ stdcall KdPortDisableInterrupts() -@ stdcall KdPortEnableInterrupts() ; New KD +@ stdcall KdD0Transition() +@ stdcall KdD3Transition() @ stdcall KdDebuggerInitialize0(ptr) @ stdcall KdDebuggerInitialize1(ptr) -@ stdcall KdSave(long) -@ stdcall KdRestore(long) @ stdcall KdReceivePacket(long ptr ptr ptr ptr) +@ stdcall KdRestore(long) +@ stdcall KdSave(long) @ stdcall KdSendPacket(long ptr ptr ptr)