From 7a01a888a72e5e4d65beb781ef12b093cfec10e8 Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Tue, 17 Apr 2012 16:25:42 +0200 Subject: 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 --- c/src/lib/libbsp/sparc/shared/1553/b1553brm.c | 15 ++++++++------- c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c | 2 +- c/src/lib/libbsp/sparc/shared/1553/b1553brm_rasta.c | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'c/src/lib/libbsp/sparc/shared/1553') diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c index e447df26d5..deec9084bc 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c +++ b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c @@ -279,7 +279,7 @@ typedef struct { static int brm_cores; static unsigned int allbrm_memarea; static brm_priv *brms; -static amba_confarea_type *amba_bus; +static struct ambapp_bus *amba_bus; static unsigned int allbrm_cfg_clksel; static unsigned int allbrm_cfg_clkdiv; static unsigned int allbrm_cfg_freq; @@ -325,7 +325,7 @@ int brm_register_leon3_ramon_fpga(void){ * The BRM is always clocked with 24MHz. * 3 in BRM enhanced register will select 24MHz */ - return b1553brm_register(&amba_conf,0,0,3); + return b1553brm_register(&ambapp_plb, 0, 0, 3); } int brm_register_leon3_ramon_asic(void){ @@ -335,12 +335,12 @@ int brm_register_leon3_ramon_asic(void){ * * 3 in BRM enhanced register will select 24MHz */ - return b1553brm_register(&amba_conf,2,0,3); + return b1553brm_register(&ambapp_plb, 2, 0, 3); } #endif #endif -int B1553BRM_PREFIX(_register)(amba_confarea_type *bus, unsigned int clksel, unsigned int clkdiv, unsigned int brm_freq) +int B1553BRM_PREFIX(_register)(struct ambapp_bus *bus, unsigned int clksel, unsigned int clkdiv, unsigned int brm_freq) { rtems_status_code r; rtems_device_major_number m; @@ -568,7 +568,7 @@ static rtems_device_driver brm_initialize(rtems_device_major_number major, rtems int dev_cnt; char fs_name[20]; brm_priv *brm; - amba_ahb_device ambadev; + struct ambapp_ahb_info ambadev; char *mem; FUNCDBG("brm_initialize\n"); @@ -577,7 +577,7 @@ static rtems_device_driver brm_initialize(rtems_device_major_number major, rtems strcpy(fs_name,B1553BRM_DEVNAME); /* Find all BRM devices */ - dev_cnt = amba_get_number_ahbslv_devices(amba_bus,VENDOR_GAISLER,GAISLER_BRM); + dev_cnt = ambapp_get_number_ahbslv_devices(amba_bus, VENDOR_GAISLER, GAISLER_B1553BRM); if ( dev_cnt < 1 ){ /* Failed to find any CAN cores! */ printk("BRM: Failed to find any BRM cores\n\r"); @@ -619,7 +619,8 @@ static rtems_device_driver brm_initialize(rtems_device_major_number major, rtems brm = &brms[minor]; /* Get AMBA AHB device info from Plug&Play */ - amba_find_next_ahbslv(amba_bus,VENDOR_GAISLER,GAISLER_BRM,&ambadev,minor); + ambapp_find_ahbslv_next(amba_bus, VENDOR_GAISLER, + GAISLER_B1553BRM, &ambadev, minor); /* Copy Basic HW info */ brm->regs = (void *)ambadev.start[0]; diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c b/c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c index 76c9f2e56a..3be26b1b74 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c +++ b/c/src/lib/libbsp/sparc/shared/1553/b1553brm_pci.c @@ -82,7 +82,7 @@ static void b1553brmpci_interrupt_handler(int irq, void *arg); */ int b1553brm_pci_register( - amba_confarea_type *bus, + struct ambapp_bus *bus, unsigned int clksel, unsigned int clkdiv, unsigned int brm_freq, diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553brm_rasta.c b/c/src/lib/libbsp/sparc/shared/1553/b1553brm_rasta.c index 10adb0aec5..d1fa4d64e0 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/b1553brm_rasta.c +++ b/c/src/lib/libbsp/sparc/shared/1553/b1553brm_rasta.c @@ -82,7 +82,7 @@ static void b1553brmrasta_interrupt_handler(int irq, void *arg); */ int b1553brm_rasta_register( - amba_confarea_type *bus, + struct ambapp_bus *bus, unsigned int clksel, unsigned int clkdiv, unsigned int brm_freq, -- cgit v1.2.3