diff options
Diffstat (limited to 'c/src/lib/libbsp/sparc/shared/include')
15 files changed, 153 insertions, 160 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/c/src/lib/libbsp/sparc/shared/include/ambapp.h index 651b7bfeb2..5eb3f2ae0e 100644 --- a/c/src/lib/libbsp/sparc/shared/include/ambapp.h +++ b/c/src/lib/libbsp/sparc/shared/include/ambapp.h @@ -7,6 +7,8 @@ * 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$ */ #ifndef __AMBAPP_H__ @@ -28,21 +30,21 @@ struct ambapp_apb_info; struct ambapp_ahb_info; struct ambapp_dev { - struct ambapp_dev *next; /* Next */ - struct ambapp_dev *prev; /* Previous Device. If (this == - * rev->child) prev is bus bridge */ - struct ambapp_dev *children; /* Points to first device on sub-bus */ - void *owner; /* Owner of this AMBA device */ - unsigned char dev_type; /* AHB MST, AHB SLV or APB SLV*/ - unsigned char vendor; /* Vendor ID */ - unsigned short device; /* Device ID */ - int devinfo[0]; /* Device info (APB/AHB dep. on type) */ + struct ambapp_dev *next; /* Next */ + struct ambapp_dev *prev; /* Previous Device. If (this == + * rev->child) prev is bus bridge */ + struct ambapp_dev *children; /* Points to first device on sub-bus */ + void *owner; /* Owner of this AMBA device */ + unsigned char dev_type; /* AHB MST, AHB SLV or APB SLV*/ + unsigned char vendor; /* Vendor ID */ + unsigned short device; /* Device ID */ + int devinfo[0]; /* Device info (APB/AHB dep. on type) */ }; -#define AMBAPP_FLAG_FFACT_DIR 0x100 /* Frequency factor direction, 0=down, 1=up */ -#define AMBAPP_FLAG_FFACT 0x0f0 /* Frequency factor against top bus */ -#define AMBAPP_FLAG_MBUS 0x00c -#define AMBAPP_FLAG_SBUS 0x003 +#define AMBAPP_FLAG_FFACT_DIR 0x100 /* Frequency factor direction, 0=down, 1=up */ +#define AMBAPP_FLAG_FFACT 0x0f0 /* Frequency factor against top bus */ +#define AMBAPP_FLAG_MBUS 0x00c +#define AMBAPP_FLAG_SBUS 0x003 /* Get APB or AHB information from a AMBA device */ #define DEV_TO_APB(adev) ((struct ambapp_apb_info *)((adev)->devinfo)) @@ -50,70 +52,70 @@ struct ambapp_dev { #define DEV_TO_COMMON(adev) ((struct ambapp_common_info *)((adev)->devinfo)) /* Convert address of ambapp_apb_info/ambapp_ahb_info into ambapp_dev */ #define APB_TO_DEV(apb_info) ((struct ambapp_dev *)(unsigned int(apb_info) - \ - offsetof(struct ambapp_dev, devinfo))) + offsetof(struct ambapp_dev, devinfo))) #define AHB_TO_DEV(ahb_info) ((struct ambapp_dev *)(unsigned int(ahb_info) - \ - offsetof(struct ambapp_dev, devinfo))) + offsetof(struct ambapp_dev, devinfo))) struct ambapp_common_info { - unsigned char irq; - unsigned char ver; - unsigned char ahbidx; /* AHB Bus Index */ + unsigned char irq; + unsigned char ver; + unsigned char ahbidx; /* AHB Bus Index */ }; struct ambapp_apb_info { - /* COMMON */ - unsigned char irq; - unsigned char ver; - unsigned char ahbidx; /* AHB Bus Index */ - - /* APB SPECIFIC */ - unsigned int start; - unsigned int mask; + /* COMMON */ + unsigned char irq; + unsigned char ver; + unsigned char ahbidx; /* AHB Bus Index */ + + /* APB SPECIFIC */ + unsigned int start; + unsigned int mask; }; struct ambapp_ahb_info { - /* COMMON */ - unsigned char irq; - unsigned char ver; - unsigned char ahbidx; /* AHB Bus Index */ - - /* AHB SPECIFIC */ - unsigned int start[4]; - unsigned int mask[4]; - char type[4]; /* type[N] Determine type of start[N]-mask[N], - * 2=AHB Memory Space, 3=AHB I/O Space */ - unsigned int custom[3]; + /* COMMON */ + unsigned char irq; + unsigned char ver; + unsigned char ahbidx; /* AHB Bus Index */ + + /* AHB SPECIFIC */ + unsigned int start[4]; + unsigned int mask[4]; + char type[4]; /* type[N] Determine type of start[N]-mask[N], + * 2=AHB Memory Space, 3=AHB I/O Space */ + unsigned int custom[3]; }; /* Describes a complete AMBA Core. Each device may consist of 3 interfaces */ struct ambapp_core { - char irq; /* irq=-1 indicate no IRQ */ - unsigned char vendor; - unsigned short device; - int index; /* Core index */ - struct ambapp_ahb_info *ahb_mst; - struct ambapp_ahb_info *ahb_slv; - struct ambapp_apb_info *apb_slv; + char irq; /* irq=-1 indicate no IRQ */ + unsigned char vendor; + unsigned short device; + int index; /* Core index */ + struct ambapp_ahb_info *ahb_mst; + struct ambapp_ahb_info *ahb_slv; + struct ambapp_apb_info *apb_slv; }; struct ambapp_ahb_bus { - unsigned int ioarea; /* AHB Bus IOAREA */ - unsigned int freq_hz; /* Frequency of AHB Bus */ - struct ambapp_dev *bridge; /* Bridge Device on Parent AHB Bus */ - struct ambapp_dev *dev; /* First Device on AHB Bus */ + unsigned int ioarea; /* AHB Bus IOAREA */ + unsigned int freq_hz; /* Frequency of AHB Bus */ + struct ambapp_dev *bridge;/* Bridge Device on Parent AHB Bus */ + struct ambapp_dev *dev; /* First Device on AHB Bus */ }; struct ambapp_mmap { - unsigned int size; - unsigned int local_adr; - unsigned int remote_adr; + unsigned int size; + unsigned int local_adr; + unsigned int remote_adr; }; /* Complete AMBA PnP information */ struct ambapp_bus { - struct ambapp_dev *root; /* AHB/APB Device Tree*/ - struct ambapp_mmap *mmaps; /* Memory MAP Array */ - struct ambapp_ahb_bus ahbs[AHB_BUS_MAX]; /* AHB Buses */ + struct ambapp_dev *root; /* AHB/APB Device Tree*/ + struct ambapp_mmap *mmaps; /* Memory MAP Array */ + struct ambapp_ahb_bus ahbs[AHB_BUS_MAX]; /* AHB Buses */ }; /* @@ -127,17 +129,17 @@ typedef int (*ambapp_func_t)(struct ambapp_dev *dev, int index, void *arg); #define DEV_IS_ALLOCATED(dev) (dev->owner != NULL) /* Options to ambapp_for_each */ -#define OPTIONS_AHB_MSTS 0x00000001 -#define OPTIONS_AHB_SLVS 0x00000002 -#define OPTIONS_APB_SLVS 0x00000004 -#define OPTIONS_ALL_DEVS (OPTIONS_AHB_MSTS|OPTIONS_AHB_SLVS|OPTIONS_APB_SLVS) +#define OPTIONS_AHB_MSTS 0x00000001 +#define OPTIONS_AHB_SLVS 0x00000002 +#define OPTIONS_APB_SLVS 0x00000004 +#define OPTIONS_ALL_DEVS (OPTIONS_AHB_MSTS|OPTIONS_AHB_SLVS|OPTIONS_APB_SLVS) -#define OPTIONS_FREE 0x00000010 -#define OPTIONS_ALLOCATED 0x00000020 -#define OPTIONS_ALL (OPTIONS_FREE|OPTIONS_ALLOCATED) +#define OPTIONS_FREE 0x00000010 +#define OPTIONS_ALLOCATED 0x00000020 +#define OPTIONS_ALL (OPTIONS_FREE|OPTIONS_ALLOCATED) /* Depth first search, Defualt is breath first search. */ -#define OPTIONS_DEPTH_FIRST 0x00000100 +#define OPTIONS_DEPTH_FIRST 0x00000100 #define DEV_AHB_NONE 0 #define DEV_AHB_MST 1 @@ -146,14 +148,14 @@ typedef int (*ambapp_func_t)(struct ambapp_dev *dev, int index, void *arg); /* Structures used to access Plug&Play information directly */ struct ambapp_pnp_ahb { - const unsigned int id; /* VENDOR, DEVICE, VER, IRQ, */ - const unsigned int custom[3]; - const unsigned int mbar[4]; /* MASK, ADDRESS, TYPE, CACHABLE/PREFETCHABLE */ + const unsigned int id; /* VENDOR, DEVICE, VER, IRQ, */ + const unsigned int custom[3]; + const unsigned int mbar[4]; /* MASK, ADDRESS, TYPE, CACHABLE/PREFETCHABLE */ }; struct ambapp_pnp_apb { - const unsigned int id; /* VENDOR, DEVICE, VER, IRQ, */ - const unsigned int iobar; /* MASK, ADDRESS, TYPE, CACHABLE/PREFETCHABLE */ + const unsigned int id; /* VENDOR, DEVICE, VER, IRQ, */ + const unsigned int iobar; /* MASK, ADDRESS, TYPE, CACHABLE/PREFETCHABLE */ }; #define ambapp_pnp_vendor(id) (((id) >> 24) & 0xff) @@ -168,7 +170,7 @@ struct ambapp_pnp_apb { #define ambapp_pnp_apb_start(iobar, base) ((base) | ((((iobar) & 0xfff00000)>>12) & (((iobar) & 0xfff0)<<4)) ) #define ambapp_pnp_apb_mask(iobar) ((~(ambapp_pnp_mbar_mask(iobar)<<8) & 0x000fffff) + 1) -#define AMBA_TYPE_AHBIO_ADDR(addr, base_ioarea) ((unsigned int)(base_ioarea) | ((addr) >> 12)) +#define AMBA_TYPE_AHBIO_ADDR(addr,base_ioarea) ((unsigned int)(base_ioarea) | ((addr) >> 12)) #define AMBA_TYPE_APBIO 0x1 #define AMBA_TYPE_MEM 0x2 @@ -176,11 +178,11 @@ struct ambapp_pnp_apb { /* Copy Data from AMBA PnP I/O Area */ typedef void *(*ambapp_memcpy_t)( - void *dest, /* Destination RAM copy */ - const void *src, /* Source AMBA PnP Address to copy from */ - int n, /* Number of bytes to be copied */ - struct ambapp_bus *abus /* Optional AMBA Bus pointer */ - ); + void *dest, /* Destination RAM copy */ + const void *src, /* Source AMBA PnP Address to copy from */ + int n, /* Number of bytes to be copied */ + struct ambapp_bus *abus /* Optional AMBA Bus pointer */ + ); /* Scan a AMBA Plug & Play bus and create all device structures describing the * the devices. The devices will form a tree, where every node describes one @@ -196,24 +198,24 @@ typedef void *(*ambapp_memcpy_t)( * */ extern int ambapp_scan( - struct ambapp_bus *abus, - unsigned int ioarea, - ambapp_memcpy_t memfunc, - struct ambapp_mmap *mmaps - ); + struct ambapp_bus *abus, + unsigned int ioarea, + ambapp_memcpy_t memfunc, + struct ambapp_mmap *mmaps + ); /* Initialize the frequency [Hz] of all AHB Buses from knowing the frequency * of one particular APB/AHB Device. */ extern void ambapp_freq_init( - struct ambapp_bus *abus, - struct ambapp_dev *dev, - unsigned int freq); + struct ambapp_bus *abus, + struct ambapp_dev *dev, + unsigned int freq); /* Returns the frequency [Hz] of a AHB/APB device */ extern unsigned int ambapp_freq_get( - struct ambapp_bus *abus, - struct ambapp_dev *dev); + struct ambapp_bus *abus, + struct ambapp_dev *dev); /* Iterates through all AMBA devices previously found, it calls func * once for every device that match the search arguments. @@ -242,12 +244,12 @@ extern unsigned int ambapp_freq_get( * non-zero - stopped by user function returning the non-zero value */ extern int ambapp_for_each( - struct ambapp_bus *abus, - unsigned int options, - int vendor, - int device, - ambapp_func_t func, - void *arg); + struct ambapp_bus *abus, + unsigned int options, + int vendor, + int device, + ambapp_func_t func, + void *arg); /* Helper function for ambapp_for_each(), find a device by index. If pcount * is NULL the first device is returned, else pcount is interpreted as index @@ -264,7 +266,7 @@ extern int ambapp_find_by_idx(struct ambapp_dev *dev, int index, void *pcount); * arguments are passed onto ambapp_for_each(). */ extern int ambapp_dev_count(struct ambapp_bus *abus, unsigned int options, - int vendor, int device); + int vendor, int device); /* Print short information about devices on the AMBA bus onto the console */ extern void ambapp_print(struct ambapp_bus *abus, int show_depth); @@ -297,70 +299,61 @@ extern int ambapp_vendev_id2str(int vendor, int id, char *buf); /* Help functions for backwards compability */ extern int ambapp_find_apbslv( - struct ambapp_bus *abus, - int vendor, - int device, - struct ambapp_apb_info *dev); + struct ambapp_bus *abus, + int vendor, + int device, + struct ambapp_apb_info *dev); extern int ambapp_find_apbslv_next( - struct ambapp_bus *abus, - int vendor, - int device, - struct ambapp_apb_info *dev, - int index); + struct ambapp_bus *abus, + int vendor, + int device, + struct ambapp_apb_info *dev, + int index); extern int ambapp_find_apbslvs_next( - struct ambapp_bus *abus, - int vendor, - int device, - struct ambapp_apb_info *dev, - int index, - int maxno); + struct ambapp_bus *abus, + int vendor, + int device, + struct ambapp_apb_info *dev, + int index, + int maxno); extern int ambapp_find_apbslvs( - struct ambapp_bus *abus, - int vendor, - int device, - struct ambapp_apb_info *dev, - int maxno); - -extern int ambapp_get_number_apbslv_devices( - struct ambapp_bus *abus, - int vendor, - int device); + struct ambapp_bus *abus, + int vendor, + int device, + struct ambapp_apb_info *dev, + int maxno); extern int ambapp_find_ahbslv( - struct ambapp_bus *abus, - int vendor, - int device, - struct ambapp_ahb_info *dev); + struct ambapp_bus *abus, + int vendor, + int device, + struct ambapp_ahb_info *dev); extern int ambapp_find_ahbslv_next( - struct ambapp_bus *abus, - int vendor, - int device, - struct ambapp_ahb_info *dev, - int index); + struct ambapp_bus *abus, + int vendor, + int device, + struct ambapp_ahb_info *dev, + int index); extern int ambapp_find_ahbslvs_next( - struct ambapp_bus *abus, - int vendor, - int device, - struct ambapp_ahb_info *dev, - int index, - int maxno); + struct ambapp_bus *abus, + int vendor, + int device, + struct ambapp_ahb_info *dev, + int index, + int maxno); extern int ambapp_find_ahbslvs( - struct ambapp_bus *abus, - int vendor, - int device, - struct ambapp_ahb_info *dev, - int maxno); - -extern int ambapp_get_number_ahbslv_devices( - struct ambapp_bus *abus, - int vendor, - int device); + struct ambapp_bus *abus, + int vendor, + int device, + struct ambapp_ahb_info *dev, + int maxno); + /******** AMBA DEVICES *******/ diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart.h b/c/src/lib/libbsp/sparc/shared/include/apbuart.h index c8a6e35fec..c948b24da1 100644 --- a/c/src/lib/libbsp/sparc/shared/include/apbuart.h +++ b/c/src/lib/libbsp/sparc/shared/include/apbuart.h @@ -72,9 +72,9 @@ typedef struct { /* Register APBUART driver * bus = pointer to AMBA bus description used to search for APBUART(s). - * (&amba_conf for LEON3), (LEON2: see amba_scan) + * (&ambapp_plb for LEON3), (LEON2: see amba_scan) */ -int apbuart_register (amba_confarea_type * bus); +int apbuart_register (struct ambapp_bus *bus); #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h b/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h index e8064297c8..11ac33e506 100644 --- a/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h +++ b/c/src/lib/libbsp/sparc/shared/include/apbuart_pci.h @@ -24,7 +24,7 @@ extern "C" { * */ -int apbuart_pci_register (amba_confarea_type * bus); +int apbuart_pci_register (struct ambapp_bus * bus); /* This function must be called on APBUART interrupt. Called from the * PCI interrupt handler. diff --git a/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h b/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h index 1edf6f98d3..61c6144818 100644 --- a/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h +++ b/c/src/lib/libbsp/sparc/shared/include/apbuart_rasta.h @@ -24,7 +24,7 @@ extern "C" { * */ -int apbuart_rasta_register(amba_confarea_type *bus); +int apbuart_rasta_register(struct ambapp_bus *bus); /* This function must be called on APBUART interrupt. Called from the * RASTA interrupt handler. diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h b/c/src/lib/libbsp/sparc/shared/include/b1553brm.h index f5fd343078..f0f09c5969 100644 --- a/c/src/lib/libbsp/sparc/shared/include/b1553brm.h +++ b/c/src/lib/libbsp/sparc/shared/include/b1553brm.h @@ -158,9 +158,9 @@ int brm_register_leon3_ramon_asic(void); /* Register BRM driver * See (struct brm_reg).w_ctrl for clksel and clkdiv. * See Enhanced register (the least signinficant 2 bits) in BRM Core for brm_freq - * bus = &amba_conf for LEON3. (LEON2 not yet supported for this driver) + * bus = &ambapp_plb for LEON3. (LEON2 not yet supported for this driver) */ -int b1553brm_register(amba_confarea_type *bus, unsigned int clksel, unsigned int clkdiv, unsigned int brm_freq); +int b1553brm_register(struct ambapp_bus *bus, unsigned int clksel, unsigned int clkdiv, unsigned int brm_freq); #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h b/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h index 74f9d321de..9861dc3658 100644 --- a/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h +++ b/c/src/lib/libbsp/sparc/shared/include/b1553brm_pci.h @@ -22,7 +22,7 @@ extern "C" { /* Register BRM driver * See (struct brm_reg).w_ctrl for clksel and clkdiv. * See Enhanced register (the least signinficant 2 bits) in BRM Core for brm_freq - * bus = &amba_conf for LEON3. (LEON2 not yet supported for this driver) + * bus = &ambapp_plb for LEON3. (LEON2 not yet supported for this driver) * * Memory setup: * memarea = 128k aligned pointer to memory (if zero malloc will be used) (as the CPU sees it) @@ -30,7 +30,7 @@ extern "C" { */ 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/include/b1553brm_rasta.h b/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h index cd5165801c..360b72fc18 100644 --- a/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h +++ b/c/src/lib/libbsp/sparc/shared/include/b1553brm_rasta.h @@ -22,7 +22,7 @@ extern "C" { /* Register BRM driver * See (struct brm_reg).w_ctrl for clksel and clkdiv. * See Enhanced register (the least signinficant 2 bits) in BRM Core for brm_freq - * bus = &amba_conf for LEON3. (LEON2 not yet supported for this driver) + * bus = &ambapp_plb for LEON3. (LEON2 not yet supported for this driver) * * Memory setup: * memarea = 128k aligned pointer to memory (if zero malloc will be used) (as the CPU sees it) @@ -30,7 +30,7 @@ extern "C" { */ int b1553brm_rasta_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/include/grcan.h b/c/src/lib/libbsp/sparc/shared/include/grcan.h index 8b3ed15e55..f8f577d4d5 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grcan.h +++ b/c/src/lib/libbsp/sparc/shared/include/grcan.h @@ -190,7 +190,7 @@ struct grcan_device_info { int grcan_register_abs(struct grcan_device_info *devices, int dev_cnt); /* Use prescanned AMBA Plug&Play information to find all GRFIFO cores */ -int grcan_register(amba_confarea_type *abus); +int grcan_register(struct ambapp_bus *abus); #if 0 void grcan_register(unsigned int baseaddr, unsigned int ram_base); void grcan_interrupt_handler(rtems_vector_number v); diff --git a/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h b/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h index 1f96da6bef..20a2fac252 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h +++ b/c/src/lib/libbsp/sparc/shared/include/grcan_rasta.h @@ -13,7 +13,7 @@ extern "C" { * rambase is address of the first GRCAN core has it's TX buffer, followed by * it's RX buffer */ -int grcan_rasta_ram_register(amba_confarea_type *abus, int rambase); +int grcan_rasta_ram_register(struct ambapp_bus *abus, int rambase); extern void (*grcan_rasta_int_reg)(void *handler, int irq, void *arg); diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw.h b/c/src/lib/libbsp/sparc/shared/include/grspw.h index 4c6c869d61..e60aa87a07 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grspw.h +++ b/c/src/lib/libbsp/sparc/shared/include/grspw.h @@ -111,7 +111,7 @@ typedef struct { #define SPACEWIRE_IOCTRL_START 64 #define SPACEWIRE_IOCTRL_STOP 65 -int grspw_register(amba_confarea_type *bus); +int grspw_register(struct ambapp_bus *bus); #if 0 diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h b/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h index aea50f3791..9e2cd60d4a 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h +++ b/c/src/lib/libbsp/sparc/shared/include/grspw_pci.h @@ -20,14 +20,14 @@ extern "C" { #endif /* Register GRSPW Driver - * bus = &amba_conf for LEON3 + * bus = &ambapp_plb for LEON3 * * Memory setup: * memarea = 128k aligned pointer to memory (if zero malloc will be used) (as the CPU sees it) * hw_address = address that HW must use to access memarea. (used in the translation process) */ -int grspw_pci_register (amba_confarea_type * bus, +int grspw_pci_register (struct ambapp_bus *bus, unsigned int memarea, unsigned int hw_address); diff --git a/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h b/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h index 0e4e5bee4d..c4c0cd0dd7 100644 --- a/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h +++ b/c/src/lib/libbsp/sparc/shared/include/grspw_rasta.h @@ -20,14 +20,14 @@ extern "C" { #endif /* Register GRSPW Driver - * bus = &amba_conf for LEON3 + * bus = &ambapp_plb for LEON3 * * Memory setup: * ram_base = 128k aligned pointer to memory (as the CPU sees it) */ int grspw_rasta_register( - amba_confarea_type *bus, + struct ambapp_bus *bus, unsigned int ram_base ); diff --git a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h b/c/src/lib/libbsp/sparc/shared/include/i2cmst.h index 21780ee143..9f612fab1e 100644 --- a/c/src/lib/libbsp/sparc/shared/include/i2cmst.h +++ b/c/src/lib/libbsp/sparc/shared/include/i2cmst.h @@ -68,7 +68,7 @@ typedef struct gr_i2cmst_desc { } gr_i2cmst_desc_t; /* 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); #ifdef __cplusplus } diff --git a/c/src/lib/libbsp/sparc/shared/include/occan.h b/c/src/lib/libbsp/sparc/shared/include/occan.h index 12ec42a01c..5c875b324e 100644 --- a/c/src/lib/libbsp/sparc/shared/include/occan.h +++ b/c/src/lib/libbsp/sparc/shared/include/occan.h @@ -147,7 +147,7 @@ struct occan_afilter { #define OCCAN_BLK_MODE_RX 0x1 #define OCCAN_BLK_MODE_TX 0x2 -int occan_register(amba_confarea_type *bus); +int occan_register(struct ambapp_bus *bus); #define OCCAN_SPEED_500K 500000 diff --git a/c/src/lib/libbsp/sparc/shared/include/occan_pci.h b/c/src/lib/libbsp/sparc/shared/include/occan_pci.h index 2f46293af2..d351f85ff9 100644 --- a/c/src/lib/libbsp/sparc/shared/include/occan_pci.h +++ b/c/src/lib/libbsp/sparc/shared/include/occan_pci.h @@ -23,7 +23,7 @@ extern "C" { * bus = pointer to AMBA bus description used to search for OC_CAN contrller(s). */ -int occan_pci_register(amba_confarea_type *bus); +int occan_pci_register(struct ambapp_bus *bus); /* This function must be called on OC_CAN interrupt. Called from the * PCI interrupt handler. irq = AMBA IRQ assigned to the OC_CAN device, |