tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a potential issue in calling Cpu->GetTimerValue (Cpu, 0, &CurrentTick, (UINT64 *) &TimerPeriod); 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11076 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
tye1 2010-11-18 08:09:09 +00:00
parent 255a3f33bd
commit cda10fe42c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NetworkPkg/Application/Ping6/Ping6.c
View File

@ -59,7 +59,7 @@ EFI_HII_HANDLE mHiiHandle;
CONST CHAR16 *mIp6DstString; CONST CHAR16 *mIp6DstString;
CONST CHAR16 *mIp6SrcString; CONST CHAR16 *mIp6SrcString;
EFI_GUID mEfiPing6Guid = EFI_PING6_GUID; EFI_GUID mEfiPing6Guid = EFI_PING6_GUID;
UINT32 mFrequency = 0; UINT64 mFrequency = 0;
/** /**
Get and caculate the frequency in tick/ms. Get and caculate the frequency in tick/ms.
The result is saved in the globle variable mFrequency The result is saved in the globle variable mFrequency
@ -76,7 +76,7 @@ Ping6GetFrequency (
EFI_STATUS Status; EFI_STATUS Status;
EFI_CPU_ARCH_PROTOCOL *Cpu; EFI_CPU_ARCH_PROTOCOL *Cpu;
UINT64 CurrentTick; UINT64 CurrentTick;
UINT32 TimerPeriod; UINT64 TimerPeriod;
Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **) &Cpu); Status = gBS->LocateProtocol (&gEfiCpuArchProtocolGuid, NULL, (VOID **) &Cpu);
@ -84,20 +84,20 @@ Ping6GetFrequency (
return Status; return Status;
} }
Status = Cpu->GetTimerValue (Cpu, 0, &CurrentTick, (UINT64 *) &TimerPeriod); Status = Cpu->GetTimerValue (Cpu, 0, &CurrentTick, &TimerPeriod);
if (EFI_ERROR (Status)) { if (EFI_ERROR (Status)) {
// //
// For NT32 Simulator only. 358049 is a similar value to keep timer granularity. // For NT32 Simulator only. 358049 is a similar value to keep timer granularity.
// Set the timer period by ourselves. // Set the timer period by ourselves.
// //
TimerPeriod = NTTIMERPERIOD; TimerPeriod = (UINT64) NTTIMERPERIOD;
} }
// //
// The timer period is in femtosecond (1 femtosecond is 1e-15 second). // The timer period is in femtosecond (1 femtosecond is 1e-15 second).
// So 1e+12 is divided by timer period to produce the freq in tick/ms. // So 1e+12 is divided by timer period to produce the freq in tick/ms.
// //
mFrequency = (UINT32) DivU64x32 (1000000000000ULL, TimerPeriod); mFrequency = DivU64x64Remainder (1000000000000ULL, TimerPeriod, NULL);
return EFI_SUCCESS; return EFI_SUCCESS;
} }
@ -111,14 +111,14 @@ Ping6GetFrequency (
@return The duration in ms. @return The duration in ms.
**/ **/
UINT32 UINT64
Ping6CalculateTick ( Ping6CalculateTick (
IN UINT64 Begin, IN UINT64 Begin,
IN UINT64 End IN UINT64 End
) )
{ {
ASSERT (End > Begin); ASSERT (End > Begin);
return (UINT32) DivU64x32 (End - Begin, mFrequency); return DivU64x64Remainder (End - Begin, mFrequency, NULL);
} }
/** /**
@ -242,7 +242,7 @@ Ping6OnEchoReplyReceived (
EFI_IP6_RECEIVE_DATA *RxData; EFI_IP6_RECEIVE_DATA *RxData;
ICMP6_ECHO_REQUEST_REPLY *Reply; ICMP6_ECHO_REQUEST_REPLY *Reply;
UINT32 PayLoad; UINT32 PayLoad;
UINT32 Rtt; UINT64 Rtt;
CHAR8 Near; CHAR8 Near;
Private = (PING6_PRIVATE_DATA *) Context; Private = (PING6_PRIVATE_DATA *) Context;
@ -524,7 +524,7 @@ Ping6OnTimerRoutine (
PING6_ICMP6_TX_INFO *TxInfo; PING6_ICMP6_TX_INFO *TxInfo;
LIST_ENTRY *Entry; LIST_ENTRY *Entry;
LIST_ENTRY *NextEntry; LIST_ENTRY *NextEntry;
UINT32 Time; UINT64 Time;
Private = (PING6_PRIVATE_DATA *) Context; Private = (PING6_PRIVATE_DATA *) Context;
@ -870,7 +870,7 @@ Ping6 (
Private->ImageHandle = ImageHandle; Private->ImageHandle = ImageHandle;
Private->SendNum = SendNumber; Private->SendNum = SendNumber;
Private->BufferSize = BufferSize; Private->BufferSize = BufferSize;
Private->RttMin = 0xFFFF; Private->RttMin = ~((UINT64 )(0x0));
Private->Status = EFI_NOT_READY; Private->Status = EFI_NOT_READY;
InitializeListHead (&Private->TxList); InitializeListHead (&Private->TxList);
@ -989,7 +989,7 @@ ON_STAT:
mHiiHandle, mHiiHandle,
Private->RttMin, Private->RttMin,
Private->RttMax, Private->RttMax,
Private->RttSum / Private->RxCount DivU64x64Remainder (Private->RttSum, Private->RxCount, NULL)
); );
} }

6
NetworkPkg/Application/Ping6/Ping6.h
View File

@ -65,9 +65,9 @@ typedef struct _PING6_PRIVATE_DATA {
EFI_IP6_COMPLETION_TOKEN RxToken; EFI_IP6_COMPLETION_TOKEN RxToken;
UINT16 RxCount; UINT16 RxCount;
UINT16 TxCount; UINT16 TxCount;
UINT32 RttSum; UINT64 RttSum;
UINT32 RttMin; UINT64 RttMin;
UINT32 RttMax; UINT64 RttMax;
UINT32 SequenceNum; UINT32 SequenceNum;
EFI_IPv6_ADDRESS SrcAddress; EFI_IPv6_ADDRESS SrcAddress;