diff options
author | Daniel Hellstrom <daniel@gaisler.com> | 2012-04-17 16:25:42 +0200 |
---|---|---|
committer | Gedare Bloom <gedare@rtems.org> | 2012-04-17 22:01:47 -0400 |
commit | 7a01a888a72e5e4d65beb781ef12b093cfec10e8 (patch) | |
tree | 303b4eb0f7d683bcab42ebeb95e146a2a4d98eb4 /c/src/lib/libbsp/sparc/shared/i2c | |
parent | LEON3: Network initialization code updated to new AMBAPP layer (diff) | |
download | rtems-7a01a888a72e5e4d65beb781ef12b093cfec10e8.tar.bz2 |
LEON: updated drivers to use new AMBAPP Layer
The drivers are updated to use the new AMBA layer, however the
backwards-compatibility interface (ambapp_old) is used.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Diffstat (limited to 'c/src/lib/libbsp/sparc/shared/i2c')
-rw-r--r-- | c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c b/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c index fb6a573763..7ba7208622 100644 --- a/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c +++ b/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c @@ -285,7 +285,7 @@ static gr_i2cmst_desc_t gr_i2cmst_desc = { }; /* Scans for I2CMST core and initalizes i2c library */ -rtems_status_code leon_register_i2c(amba_confarea_type *abus) +rtems_status_code leon_register_i2c(struct ambapp_bus *abus) { #if defined(DEBUG) printk("leon_register_i2c called..."); @@ -293,11 +293,11 @@ rtems_status_code leon_register_i2c(amba_confarea_type *abus) int rc; int device_found = 0; - amba_apb_device apbi2cmst; + struct ambapp_apb_info apbi2cmst; /* Scan AMBA bus for I2CMST core */ - device_found = amba_find_apbslv(abus, VENDOR_GAISLER, GAISLER_I2CMST, - &apbi2cmst); + device_found = ambapp_find_apbslv(abus, VENDOR_GAISLER, GAISLER_I2CMST, + &apbi2cmst); if (device_found == 1) { @@ -317,11 +317,11 @@ rtems_status_code leon_register_i2c(amba_confarea_type *abus) #if defined(LEON3) /* LEON3: find timer address via AMBA Plug&Play info */ { - amba_apb_device gptimer; + struct ambapp_apb_info gptimer; LEON3_Timer_Regs_Map *tregs; - if (amba_find_apbslv(abus,VENDOR_GAISLER, - GAISLER_GPTIMER,&gptimer) == 1 ) { + if (ambapp_find_apbslv(abus, VENDOR_GAISLER, + GAISLER_GPTIMER, &gptimer) == 1 ) { tregs = (LEON3_Timer_Regs_Map *)gptimer.start; gr_i2cmst_desc.prv.sysfreq = (tregs->scaler_reload+1)*1000; } else { |