summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Dong <eric.dong@intel.com>2014-06-25 06:49:53 +0000
committerydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>2014-06-25 06:49:53 +0000
commit79ecd2dbfa41c6e121eaf320689caf01d331a91c (patch)
tree4165b99dcf628f9395f320f276fe1ca9d5f1740f
parent1fee5304db562db9f0757af077da100336566cd9 (diff)
downloadedk2-platforms-79ecd2dbfa41c6e121eaf320689caf01d331a91c.tar.xz
Refine code to make it more safely.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong <eric.dong@intel.com> Reviewed-by: Jeff Fan <jeff.fan@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15591 6f19259b-4bc3-4df7-8a09-765794883524
-rw-r--r--SourceLevelDebugPkg/DebugAgentDxe/DebugAgentDxe.c4
-rw-r--r--SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.c3
-rw-r--r--SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c5
3 files changed, 8 insertions, 4 deletions
diff --git a/SourceLevelDebugPkg/DebugAgentDxe/DebugAgentDxe.c b/SourceLevelDebugPkg/DebugAgentDxe/DebugAgentDxe.c
index 99bb2fdedb..80d997bc95 100644
--- a/SourceLevelDebugPkg/DebugAgentDxe/DebugAgentDxe.c
+++ b/SourceLevelDebugPkg/DebugAgentDxe/DebugAgentDxe.c
@@ -1,7 +1,7 @@
/** @file
Initialize Debug Agent in DXE by invoking Debug Agent Library.
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -58,6 +58,7 @@ DebugAgentDxeInitialize(
{
EFI_STATUS Status;
+ Status = EFI_UNSUPPORTED;
InitializeDebugAgent (DEBUG_AGENT_INIT_DXE_LOAD, &Status, NULL);
if (EFI_ERROR (Status)) {
return Status;
@@ -95,6 +96,7 @@ DebugAgentDxeUnload (
{
EFI_STATUS Status;
+ Status = EFI_UNSUPPORTED;
InitializeDebugAgent (DEBUG_AGENT_INIT_DXE_UNLOAD, &Status, NULL);
return Status;
diff --git a/SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.c b/SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.c
index df0ac87b42..2dcc7a78d1 100644
--- a/SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.c
+++ b/SourceLevelDebugPkg/DebugAgentPei/DebugAgentPei.c
@@ -1,7 +1,7 @@
/** @file
Initialize Debug Agent in PEI by invoking Debug Agent Library.
-Copyright (c) 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -39,6 +39,7 @@ DebugAgentPeiInitialize (
{
EFI_STATUS Status;
+ Status = EFI_UNSUPPORTED;
InitializeDebugAgent (DEBUG_AGENT_INIT_PEI, &Status, NULL);
return Status;
diff --git a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
index 95306e5759..48bc38ca54 100644
--- a/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
+++ b/SourceLevelDebugPkg/Library/DebugAgent/DebugAgentCommon/DebugAgent.c
@@ -587,7 +587,7 @@ ReadRemainingBreakPacket (
//
// Has received start symbol, try to read the rest part
//
- if (DebugPortReadBuffer (Handle, &DebugHeader->Command, sizeof (DEBUG_PACKET_HEADER) - 1, READ_PACKET_TIMEOUT) == 0) {
+ if (DebugPortReadBuffer (Handle, (UINT8 *)DebugHeader + OFFSET_OF (DEBUG_PACKET_HEADER, Command), sizeof (DEBUG_PACKET_HEADER) - OFFSET_OF (DEBUG_PACKET_HEADER, Command), READ_PACKET_TIMEOUT) == 0) {
//
// Timeout occur, exit
//
@@ -1014,7 +1014,7 @@ ReceivePacket (
//
Received = DebugPortReadBuffer (
Handle,
- &DebugHeader->Command,
+ (UINT8 *)DebugHeader + OFFSET_OF (DEBUG_PACKET_HEADER, Command),
OFFSET_OF (DEBUG_PACKET_HEADER, Length) + sizeof (DebugHeader->Length) - sizeof (DebugHeader->StartSymbol),
Timeout
);
@@ -2104,6 +2104,7 @@ InterruptProcess (
UINT32 IssuedViewPoint;
DEBUG_AGENT_EXCEPTION_BUFFER *ExceptionBuffer;
+ InputCharacter = 0;
ProcessorIndex = 0;
IssuedViewPoint = 0;
BreakReceived = FALSE;