diff options
author | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-05-18 00:54:24 +0000 |
---|---|---|
committer | andrewfish <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524> | 2010-05-18 00:54:24 +0000 |
commit | 23d3998ad5c8216a99cfcf599a36e4db4e716323 (patch) | |
tree | 242a8f2c164016b9e7e01d8c9bf1894ff234338d /Omap35xxPkg | |
parent | 5f4dc6dd9e175958d57d81303e09e617cef0502a (diff) | |
download | edk2-23d3998ad5c8216a99cfcf599a36e4db4e716323.zip edk2-23d3998ad5c8216a99cfcf599a36e4db4e716323.tar.gz edk2-23d3998ad5c8216a99cfcf599a36e4db4e716323.tar.bz2 |
Remove DebugSupport driver for ARM and DebugSupportProtocol. In edk2 you can link debugger into DXE core directly so you don't need a debug support. Also we are going to FIQ for debugger ctrl-c break in, so no need to hook the timer infrastructure.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10495 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Omap35xxPkg')
-rw-r--r-- | Omap35xxPkg/TimerDxe/Timer.c | 53 | ||||
-rw-r--r-- | Omap35xxPkg/TimerDxe/TimerDxe.inf | 1 |
2 files changed, 11 insertions, 43 deletions
diff --git a/Omap35xxPkg/TimerDxe/Timer.c b/Omap35xxPkg/TimerDxe/Timer.c index b5fc6e1..1919618 100644 --- a/Omap35xxPkg/TimerDxe/Timer.c +++ b/Omap35xxPkg/TimerDxe/Timer.c @@ -27,14 +27,12 @@ #include <Protocol/Timer.h> #include <Protocol/HardwareInterrupt.h> -#include <Protocol/TimerDebugSupport.h> #include <Omap3530/Omap3530.h> // The notification function to call on every timer interrupt. volatile EFI_TIMER_NOTIFY mTimerNotifyFunction = (EFI_TIMER_NOTIFY)NULL; -volatile EFI_PERIODIC_CALLBACK mTimerPeriodicCallback = (EFI_PERIODIC_CALLBACK)NULL; // The current period of the timer interrupt @@ -85,11 +83,6 @@ TimerInterruptHandler ( // OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL); - - if (mTimerPeriodicCallback) { - mTimerPeriodicCallback(SystemContext); - } - if (mTimerNotifyFunction) { mTimerNotifyFunction(mTimerPeriod); } @@ -276,27 +269,6 @@ TimerDriverGenerateSoftInterrupt ( } -EFI_STATUS -EFIAPI -TimerDriverRegisterPeriodicCallback ( - IN TIMER_DEBUG_SUPPORT_PROTOCOL *This, - IN EFI_PERIODIC_CALLBACK PeriodicCallback - ) -{ - if ((PeriodicCallback == NULL) && (mTimerPeriodicCallback == NULL)) { - return EFI_INVALID_PARAMETER; - } - - if ((PeriodicCallback != NULL) && (mTimerPeriodicCallback != NULL)) { - return EFI_ALREADY_STARTED; - } - - mTimerPeriodicCallback = PeriodicCallback; - - return EFI_SUCCESS; -} - - /** Interface stucture for the Timer Architectural Protocol. @@ -338,10 +310,6 @@ EFI_TIMER_ARCH_PROTOCOL gTimer = { TimerDriverGenerateSoftInterrupt }; -TIMER_DEBUG_SUPPORT_PROTOCOL gTimerDebugSupport = { - TimerDriverRegisterPeriodicCallback -}; - /** Initialize the state information for the Timer Architectural Protocol and @@ -368,11 +336,11 @@ TimerInitialize ( UINT32 TimerBaseAddress; // Find the interrupt controller protocol. ASSERT if not found. - Status = gBS->LocateProtocol(&gHardwareInterruptProtocolGuid, NULL, (VOID **)&gInterrupt); + Status = gBS->LocateProtocol (&gHardwareInterruptProtocolGuid, NULL, (VOID **)&gInterrupt); ASSERT_EFI_ERROR (Status); // Set up the timer registers - TimerBaseAddress = TimerBase(FixedPcdGet32(PcdOmap35xxArchTimer)); + TimerBaseAddress = TimerBase (FixedPcdGet32(PcdOmap35xxArchTimer)); TISR = TimerBaseAddress + GPTIMER_TISR; TCLR = TimerBaseAddress + GPTIMER_TCLR; TLDR = TimerBaseAddress + GPTIMER_TLDR; @@ -380,23 +348,24 @@ TimerInitialize ( TIER = TimerBaseAddress + GPTIMER_TIER; // Disable the timer - Status = TimerDriverSetTimerPeriod(&gTimer, 0); + Status = TimerDriverSetTimerPeriod (&gTimer, 0); ASSERT_EFI_ERROR (Status); // Install interrupt handler - gVector = InterruptVectorForTimer(FixedPcdGet32(PcdOmap35xxArchTimer)); - Status = gInterrupt->RegisterInterruptSource(gInterrupt, gVector, TimerInterruptHandler); + gVector = InterruptVectorForTimer (FixedPcdGet32(PcdOmap35xxArchTimer)); + Status = gInterrupt->RegisterInterruptSource (gInterrupt, gVector, TimerInterruptHandler); ASSERT_EFI_ERROR (Status); // Set up default timer - Status = TimerDriverSetTimerPeriod(&gTimer, FixedPcdGet32(PcdTimerPeriod)); + Status = TimerDriverSetTimerPeriod (&gTimer, FixedPcdGet32(PcdTimerPeriod)); ASSERT_EFI_ERROR (Status); // Install the Timer Architectural Protocol onto a new handle - Status = gBS->InstallMultipleProtocolInterfaces(&Handle, - &gEfiTimerArchProtocolGuid, &gTimer, - &gTimerDebugSupportProtocolGuid, &gTimerDebugSupport, - NULL); + Status = gBS->InstallMultipleProtocolInterfaces ( + &Handle, + &gEfiTimerArchProtocolGuid, &gTimer, + NULL + ); ASSERT_EFI_ERROR(Status); return Status; diff --git a/Omap35xxPkg/TimerDxe/TimerDxe.inf b/Omap35xxPkg/TimerDxe/TimerDxe.inf index b2b6d75..eefcc49 100644 --- a/Omap35xxPkg/TimerDxe/TimerDxe.inf +++ b/Omap35xxPkg/TimerDxe/TimerDxe.inf @@ -47,7 +47,6 @@ [Protocols] gEfiTimerArchProtocolGuid gHardwareInterruptProtocolGuid - gTimerDebugSupportProtocolGuid [Pcd.common] gEmbeddedTokenSpaceGuid.PcdTimerPeriod |