From: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Date: Sun, 21 Apr 2013 23:56:15 +0000 (+0000)
Subject: [KDCOM]
X-Git-Tag: backups/vs_jc@59301^2~399
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=5159da237d212d0ce7153d1a1e710e6cfc1d4aab

[KDCOM]
- Use the UCHAR type directly instead of using a typedef for defining BYTE.
- A little bit of header reorganization.

svn path=/trunk/; revision=58824
---

diff --git a/reactos/drivers/base/kddll/kdcom.c b/reactos/drivers/base/kddll/kdcom.c
index 3a87ab10be7..30743a14f6a 100644
--- a/reactos/drivers/base/kddll/kdcom.c
+++ b/reactos/drivers/base/kddll/kdcom.c
@@ -9,6 +9,9 @@
 #include "kddll.h"
 #include <cportlib/cportlib.h>
 
+long atol(const char *str);
+
+
 /* Serial debug connection */
 #define DEFAULT_DEBUG_PORT      2 /* COM2 */
 #define DEFAULT_DEBUG_COM1_IRQ  4 /* COM1 IRQ */
@@ -166,7 +169,7 @@ KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
 
 VOID
 NTAPI
-KdpSendByte(IN BYTE Byte)
+KdpSendByte(IN UCHAR Byte)
 {
     /* Send the byte */
     CpPutByte(&KdDebugComPort, Byte);
@@ -174,7 +177,7 @@ KdpSendByte(IN BYTE Byte)
 
 KDP_STATUS
 NTAPI
-KdpPollByte(OUT PBYTE OutByte)
+KdpPollByte(OUT PUCHAR OutByte)
 {
     /* Poll the byte */
     return (CpGetByte(&KdDebugComPort, OutByte, FALSE) == CP_GET_SUCCESS
@@ -184,7 +187,7 @@ KdpPollByte(OUT PBYTE OutByte)
 
 KDP_STATUS
 NTAPI
-KdpReceiveByte(OUT PBYTE OutByte)
+KdpReceiveByte(OUT PUCHAR OutByte)
 {
     /* Get the byte */
     return (CpGetByte(&KdDebugComPort, OutByte, TRUE) == CP_GET_SUCCESS
diff --git a/reactos/drivers/base/kddll/kddll.c b/reactos/drivers/base/kddll/kddll.c
index 4ab5fa3a32d..819696bd827 100644
--- a/reactos/drivers/base/kddll/kddll.c
+++ b/reactos/drivers/base/kddll/kddll.c
@@ -415,3 +415,4 @@ KdSendPacket(
     CurrentPacketId &= ~SYNC_PACKET_ID;
 }
 
+/* EOF */
diff --git a/reactos/drivers/base/kddll/kddll.h b/reactos/drivers/base/kddll/kddll.h
index 6d7e6e4a758..e672a90c661 100644
--- a/reactos/drivers/base/kddll/kddll.h
+++ b/reactos/drivers/base/kddll/kddll.h
@@ -8,27 +8,28 @@
 
 #pragma once
 
-//#define KDDEBUG /* uncomment to enable debugging this dll */
-
 #define NOEXTAPI
 #include <ntifs.h>
+#include <arc/arc.h>
 #include <halfuncs.h>
-#include "arc/arc.h"
-#include "windbgkd.h"
-
+#include <windbgkd.h>
 #include <wdbgexts.h>
 #include <ioaccess.h> /* port intrinsics */
 
 #define NDEBUG
 #include <debug.h>
 
-long atol(const char *str);
-
-typedef UCHAR BYTE, *PBYTE;
+//#define KDDEBUG /* uncomment to enable debugging this dll */
 
 typedef ULONG (*PFNDBGPRNT)(const char *Format, ...);
 extern PFNDBGPRNT KdpDbgPrint;
 
+#ifndef KDDEBUG
+#define KDDBGPRINT(...)
+#else
+#define KDDBGPRINT KdpDbgPrint
+#endif
+
 typedef enum
 {
     KDP_PACKET_RECEIVED = 0,
@@ -36,12 +37,6 @@ typedef enum
     KDP_PACKET_RESEND = 2
 } KDP_STATUS;
 
-#ifndef KDDEBUG
-#define KDDBGPRINT(...)
-#else
-#define KDDBGPRINT KdpDbgPrint
-#endif
-
 VOID
 NTAPI
 KdpSendBuffer(
@@ -61,24 +56,18 @@ KdpReceivePacketLeader(
 
 VOID
 NTAPI
-KdpSendByte(IN BYTE Byte);
+KdpSendByte(IN UCHAR Byte);
 
 KDP_STATUS
 NTAPI
-KdpPollByte(OUT PBYTE OutByte);
+KdpPollByte(OUT PUCHAR OutByte);
 
 KDP_STATUS
 NTAPI
-KdpReceiveByte(OUT PBYTE OutByte);
+KdpReceiveByte(OUT PUCHAR OutByte);
 
 KDP_STATUS
 NTAPI
 KdpPollBreakIn(VOID);
 
-
-#if 0
-NTSTATUS
-NTAPI
-KdDebuggerInitialize0(
-    IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL);
-#endif
+/* EOF */
diff --git a/reactos/drivers/base/kddll/kdserial.c b/reactos/drivers/base/kddll/kdserial.c
index b41904bc06a..c7228e923d9 100644
--- a/reactos/drivers/base/kddll/kdserial.c
+++ b/reactos/drivers/base/kddll/kdserial.c
@@ -143,3 +143,4 @@ KdpReceivePacketLeader(
     return KDP_PACKET_RECEIVED;
 }
 
+/* EOF */