From 1f7cfbe351d7f61960a836a45c116daa96fea866 Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Tue, 17 Apr 2012 16:25:39 +0200 Subject: LEON2: clock driver use new AMBAPP layer Signed-off-by: Daniel Hellstrom --- c/src/lib/libbsp/sparc/leon3/clock/ckinit.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'c/src/lib/libbsp') diff --git a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c index 3cdbb20a66..2a75a35a62 100644 --- a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c +++ b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c @@ -16,12 +16,11 @@ * The license and distribution terms for this file may be * found in the file LICENSE in this distribution or at * http://www.rtems.com/license/LICENSE. - * - * $Id$ */ #include #include +#include #if SIMSPARC_FAST_IDLE==1 #define CLOCK_DRIVER_USE_FAST_IDLE @@ -59,14 +58,15 @@ static int clkirq; #define Clock_driver_support_find_timer() \ do { \ - int cnt; \ - amba_apb_device dev; \ + struct ambapp_dev *adev; \ \ - /* Find LEON3 GP Timer */ \ - cnt = amba_find_apbslv(&amba_conf,VENDOR_GAISLER,GAISLER_GPTIMER,&dev); \ - if ( cnt > 0 ) { \ + /* Find first LEON3 GP Timer */ \ + adev = (void *)ambapp_for_each(&ambapp_plb, (OPTIONS_ALL|OPTIONS_APB_SLVS),\ + VENDOR_GAISLER, GAISLER_GPTIMER, ambapp_find_by_idx, NULL); \ + if (adev) { \ /* Found APB GPTIMER Timer */ \ - LEON3_Timer_Regs = (volatile LEON3_Timer_Regs_Map *) dev.start; \ + LEON3_Timer_Regs = (volatile LEON3_Timer_Regs_Map *) \ + DEV_TO_APB(adev)->start; \ clkirq = (LEON3_Timer_Regs->status & 0xf8) >> 3; \ \ Adjust_clkirq_for_node(); \ -- cgit v1.2.3