[rtems commit] LEON2: clock driver use new AMBAPP layer

[gedare at rtems.org]

Module:    rtems
Branch:    master
Commit:    1f7cfbe351d7f61960a836a45c116daa96fea866
Changeset: http://git.rtems.org/rtems/commit/?id=1f7cfbe351d7f61960a836a45c116daa96fea866

Author:    Daniel Hellstrom <daniel at gaisler.com>
Date:      Tue Apr 17 16:25:39 2012 +0200

LEON2: clock driver use new AMBAPP layer

Signed-off-by: Daniel Hellstrom <daniel at gaisler.com>

---

 c/src/lib/libbsp/sparc/leon3/clock/ckinit.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c b/c/src/lib/libbsp/sparc/leon3/clock/ckinit.c
index 3cdbb20..2a75a35 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 <bsp.h>
 #include <bspopts.h>
+#include <ambapp.h>
 
 #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(); \