Further remove legacy, now only 3 functions remain.

svn path=/branches/kd++/; revision=58952
This commit is contained in:
Hermès Bélusca-Maïto 2013-05-05 19:55:42 +00:00
parent dc9e82b3b4
commit 4908927d8f
4 changed files with 22 additions and 76 deletions

View file

@ -91,18 +91,6 @@ KdPortInitializeEx(IN PKD_PORT_INFORMATION PortInformation,
return TRUE;
}
BOOLEAN
NTAPI
KdPortInitialize(IN PKD_PORT_INFORMATION PortInformation,
IN ULONG Unknown1,
IN ULONG Unknown2)
{
//
// Call the extended version
//
return KdPortInitializeEx(PortInformation, Unknown1, Unknown2);
}
BOOLEAN
NTAPI
KdPortGetByteEx(IN PKD_PORT_INFORMATION PortInformation,
@ -129,16 +117,6 @@ KdPortPutByteEx(IN PKD_PORT_INFORMATION PortInformation,
WRITE_REGISTER_ULONG(UART_PL01x_DR, ByteToSend);
}
VOID
NTAPI
KdPortPutByte(IN UCHAR ByteToSend)
{
//
// Call the extended version
//
KdPortPutByteEx(&DefaultPort, ByteToSend);
}
/* WINDOWS FUNCTIONS **********************************************************/
NTSTATUS

View file

@ -127,16 +127,23 @@ static BOOLEAN PortInitialized = FALSE;
/* FUNCTIONS ****************************************************************/
/* HAL.KdPortInitialize */
/* ReactOS-specific */
BOOLEAN
NTAPI
KdPortInitialize(
KdPortInitializeEx(
IN PKD_PORT_INFORMATION PortInformation,
IN ULONG Unknown1,
IN ULONG Unknown2)
{
SIZE_T i;
ULONG ComPortBase;
CHAR buffer[80];
ULONG divisor;
UCHAR lcr;
/*
* Find the port if needed
*/
if (!PortInitialized)
{
@ -171,34 +178,9 @@ KdPortInitialize(
PortInitialized = TRUE;
}
/* initialize port */
if (!KdPortInitializeEx(&DefaultPort, Unknown1, Unknown2))
return FALSE;
/* set global info */
KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
return TRUE;
}
/* HAL.KdPortInitializeEx ; ReactOS-specific */
BOOLEAN
NTAPI
KdPortInitializeEx(
IN PKD_PORT_INFORMATION PortInformation,
IN ULONG Unknown1,
IN ULONG Unknown2)
{
ULONG ComPortBase;
CHAR buffer[80];
ULONG divisor;
UCHAR lcr;
#ifdef _ARM_
UNIMPLEMENTED;
return FALSE;
#endif
/*
* Initialize the port
*/
if (PortInformation->BaudRate == 0)
PortInformation->BaudRate = DEFAULT_BAUD_RATE;
@ -264,11 +246,14 @@ KdPortInitializeEx(
HalDisplayString(buffer);
#endif /* NDEBUG */
/* set global info */
KdComPortInUse = (PUCHAR)DefaultPort.BaseAddress;
return TRUE;
}
/* HAL.KdPortGetByteEx ; ReactOS-specific */
/* ReactOS-specific */
BOOLEAN
NTAPI
KdPortGetByteEx(
@ -297,7 +282,7 @@ KdPortPutByte(
KdPortPutByteEx(&DefaultPort, ByteToSend);
}
/* HAL.KdPortPutByteEx ; ReactOS-specific */
/* ReactOS-specific */
VOID
NTAPI
KdPortPutByteEx(

View file

@ -1,11 +1,3 @@
; Old KD
@ stdcall KdPortGetByteEx(ptr ptr)
@ stdcall KdPortInitialize(ptr long long)
@ stdcall KdPortInitializeEx(ptr long long)
@ stdcall KdPortPutByte(long)
@ stdcall KdPortPutByteEx(ptr long)
; New KD
@ stdcall KdD0Transition()
@ stdcall KdD3Transition()
@ stdcall KdDebuggerInitialize0(ptr)
@ -14,3 +6,8 @@
@ stdcall KdRestore(long)
@ stdcall KdSave(long)
@ stdcall KdSendPacket(long ptr ptr ptr)
; Legacy KD
@ stdcall KdPortGetByteEx(ptr ptr)
@ stdcall KdPortInitializeEx(ptr long long)
@ stdcall KdPortPutByteEx(ptr long)

View file

@ -23,14 +23,6 @@ extern BOOLEAN KdBreakAfterSymbolLoad;
extern BOOLEAN KdPitchDebugger;
extern BOOLEAN KdIgnoreUmExceptions;
BOOLEAN
NTAPI
KdPortInitialize(
PKD_PORT_INFORMATION PortInformation,
ULONG Unknown1,
ULONG Unknown2
);
BOOLEAN
NTAPI
KdPortInitializeEx(
@ -45,12 +37,6 @@ KdPortGetByteEx(
PKD_PORT_INFORMATION PortInformation,
PUCHAR ByteReceived);
VOID
NTAPI
KdPortPutByte(
UCHAR ByteToSend
);
VOID
NTAPI
KdPortPutByteEx(