--- bsps/headers.am | 64 +++++++++++++++++++ bsps/include/grlib/ambapp.h | 2 +- bsps/include/grlib/ambapp_bus.h | 2 +- bsps/include/grlib/apbuart.h | 4 +- bsps/include/grlib/apbuart_termios.h | 2 +- bsps/include/grlib/gr1553bc.h | 2 +- bsps/include/grlib/gr1553bc_list.h | 2 +- bsps/include/grlib/grlib_impl.h | 2 + bsps/include/grlib/grspw.h | 2 +- bsps/include/grlib/i2cmst.h | 2 +- bsps/riscv/riscv/include/bsp.h | 1 + bsps/shared/grlib/1553/b1553brm.c | 8 +-- bsps/shared/grlib/1553/b1553rt.c | 8 +-- bsps/shared/grlib/1553/gr1553b.c | 6 +- bsps/shared/grlib/1553/gr1553bc.c | 8 +-- bsps/shared/grlib/1553/gr1553bm.c | 8 +-- bsps/shared/grlib/1553/gr1553rt.c | 8 +-- bsps/shared/grlib/amba/ahbstat.c | 6 +- bsps/shared/grlib/amba/ambapp.c | 4 +- bsps/shared/grlib/amba/ambapp_alloc.c | 2 +- bsps/shared/grlib/amba/ambapp_count.c | 2 +- bsps/shared/grlib/amba/ambapp_depth.c | 2 +- bsps/shared/grlib/amba/ambapp_find_by_idx.c | 2 +- bsps/shared/grlib/amba/ambapp_freq.c | 2 +- bsps/shared/grlib/amba/ambapp_names.c | 4 +- bsps/shared/grlib/amba/ambapp_old.c | 2 +- bsps/shared/grlib/amba/ambapp_parent.c | 2 +- bsps/shared/grlib/amba/ambapp_show.c | 2 +- bsps/shared/grlib/analog/gradcdac.c | 8 +-- bsps/shared/grlib/ascs/grascs.c | 6 +- bsps/shared/grlib/btimer/gptimer.c | 10 +-- bsps/shared/grlib/btimer/tlib.c | 2 +- bsps/shared/grlib/btimer/tlib_ckinit.c | 2 +- bsps/shared/grlib/can/canmux.c | 6 +- bsps/shared/grlib/can/grcan.c | 10 +-- bsps/shared/grlib/can/occan.c | 6 +- bsps/shared/grlib/can/satcan.c | 6 +- bsps/shared/grlib/drvmgr/ambapp_bus.c | 4 +- bsps/shared/grlib/drvmgr/ambapp_bus_grlib.c | 6 +- bsps/shared/grlib/drvmgr/get_resarray_count.c | 2 +- bsps/shared/grlib/gpio/gpiolib.c | 4 +- bsps/shared/grlib/gpio/grgpio.c | 12 ++-- bsps/shared/grlib/i2c/i2cmst.c | 8 +-- bsps/shared/grlib/iommu/griommu.c | 8 +-- bsps/shared/grlib/irq/genirq.c | 4 +- bsps/shared/grlib/l2c/l2c.c | 8 +-- bsps/shared/grlib/mem/mctrl.c | 6 +- bsps/shared/grlib/net/greth.c | 8 +-- bsps/shared/grlib/net/network_interface_add.c | 2 +- bsps/shared/grlib/pci/gr_701.c | 14 ++-- bsps/shared/grlib/pci/gr_rasta_adcdac.c | 14 ++-- bsps/shared/grlib/pci/gr_rasta_io.c | 14 ++-- bsps/shared/grlib/pci/gr_rasta_spw_router.c | 14 ++-- bsps/shared/grlib/pci/gr_rasta_tmtc.c | 14 ++-- bsps/shared/grlib/pci/gr_tmtc_1553.c | 14 ++-- bsps/shared/grlib/pci/grpci.c | 6 +- bsps/shared/grlib/pci/grpci2.c | 8 +-- bsps/shared/grlib/pci/grpci2dma.c | 4 +- bsps/shared/grlib/pci/pcif.c | 6 +- bsps/shared/grlib/pwm/grpwm.c | 8 +-- bsps/shared/grlib/scrub/memscrub.c | 4 +- bsps/shared/grlib/slink/grslink.c | 6 +- bsps/shared/grlib/spi/spictrl.c | 8 +-- bsps/shared/grlib/spw/grspw.c | 8 +-- bsps/shared/grlib/spw/grspw_pkt.c | 8 +-- bsps/shared/grlib/spw/grspw_router.c | 6 +- bsps/shared/grlib/spw/spwtdp.c | 8 +-- bsps/shared/grlib/stat/l4stat.c | 4 +- bsps/shared/grlib/time/grctm.c | 6 +- bsps/shared/grlib/time/spwcuc.c | 6 +- bsps/shared/grlib/tmtc/grtc.c | 10 +-- bsps/shared/grlib/tmtc/grtm.c | 10 +-- bsps/shared/grlib/uart/apbuart_cons.c | 12 ++-- bsps/shared/grlib/uart/apbuart_polled.c | 2 +- bsps/shared/grlib/uart/apbuart_termios.c | 4 +- bsps/shared/grlib/uart/cons.c | 2 +- 76 files changed, 288 insertions(+), 221 deletions(-)
diff --git a/bsps/headers.am b/bsps/headers.am index e217b9b965..7e3148e184 100644 --- a/bsps/headers.am +++ b/bsps/headers.am @@ -23,6 +23,70 @@ include_bsp_HEADERS += ../../bsps/include/bsp/u-boot.h include_bsp_HEADERS += ../../bsps/include/bsp/uart-output-char.h include_bsp_HEADERS += ../../bsps/include/bsp/utility.h +include_grlibdir = $(includedir)/grlib +include_grlib_HEADERS = +include_grlib_HEADERS += ../../bsps/include/grlib/ahbstat.h +include_grlib_HEADERS += ../../bsps/include/grlib/ambapp.h +include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_bus.h +include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_bus_grlib.h +include_grlib_HEADERS += ../../bsps/include/grlib/ambapp_ids.h +include_grlib_HEADERS += ../../bsps/include/grlib/apbuart.h +include_grlib_HEADERS += ../../bsps/include/grlib/apbuart_cons.h +include_grlib_HEADERS += ../../bsps/include/grlib/apbuart_termios.h +include_grlib_HEADERS += ../../bsps/include/grlib/b1553brm.h +include_grlib_HEADERS += ../../bsps/include/grlib/b1553rt.h +include_grlib_HEADERS += ../../bsps/include/grlib/bspcommon.h +include_grlib_HEADERS += ../../bsps/include/grlib/canmux.h +include_grlib_HEADERS += ../../bsps/include/grlib/cons.h +include_grlib_HEADERS += ../../bsps/include/grlib/debug_defs.h +include_grlib_HEADERS += ../../bsps/include/grlib/genirq.h +include_grlib_HEADERS += ../../bsps/include/grlib/gpiolib.h +include_grlib_HEADERS += ../../bsps/include/grlib/gptimer.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr1553b.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bc.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bc_list.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr1553bm.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr1553rt.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr_701.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr_cpci_gr740.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_adcdac.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_io.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_spw_router.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr_rasta_tmtc.h +include_grlib_HEADERS += ../../bsps/include/grlib/gr_tmtc_1553.h +include_grlib_HEADERS += ../../bsps/include/grlib/gradcdac.h +include_grlib_HEADERS += ../../bsps/include/grlib/grascs.h +include_grlib_HEADERS += ../../bsps/include/grlib/grcan.h +include_grlib_HEADERS += ../../bsps/include/grlib/grctm.h +include_grlib_HEADERS += ../../bsps/include/grlib/greth.h +include_grlib_HEADERS += ../../bsps/include/grlib/grgpio.h +include_grlib_HEADERS += ../../bsps/include/grlib/griommu.h +include_grlib_HEADERS += ../../bsps/include/grlib/grlib.h +include_grlib_HEADERS += ../../bsps/include/grlib/grlib_impl.h +include_grlib_HEADERS += ../../bsps/include/grlib/grpci.h +include_grlib_HEADERS += ../../bsps/include/grlib/grpci2.h +include_grlib_HEADERS += ../../bsps/include/grlib/grpci2dma.h +include_grlib_HEADERS += ../../bsps/include/grlib/grpwm.h +include_grlib_HEADERS += ../../bsps/include/grlib/grslink.h +include_grlib_HEADERS += ../../bsps/include/grlib/grspw.h +include_grlib_HEADERS += ../../bsps/include/grlib/grspw_pkt.h +include_grlib_HEADERS += ../../bsps/include/grlib/grspw_router.h +include_grlib_HEADERS += ../../bsps/include/grlib/grtc.h +include_grlib_HEADERS += ../../bsps/include/grlib/grtm.h +include_grlib_HEADERS += ../../bsps/include/grlib/i2cmst.h +include_grlib_HEADERS += ../../bsps/include/grlib/l2c.h +include_grlib_HEADERS += ../../bsps/include/grlib/l4stat.h +include_grlib_HEADERS += ../../bsps/include/grlib/mctrl.h +include_grlib_HEADERS += ../../bsps/include/grlib/memscrub.h +include_grlib_HEADERS += ../../bsps/include/grlib/network_interface_add.h +include_grlib_HEADERS += ../../bsps/include/grlib/occan.h +include_grlib_HEADERS += ../../bsps/include/grlib/pcif.h +include_grlib_HEADERS += ../../bsps/include/grlib/satcan.h +include_grlib_HEADERS += ../../bsps/include/grlib/spictrl.h +include_grlib_HEADERS += ../../bsps/include/grlib/spwcuc.h +include_grlib_HEADERS += ../../bsps/include/grlib/spwtdp.h +include_grlib_HEADERS += ../../bsps/include/grlib/tlib.h + include_libchipdir = $(includedir)/libchip include_libchip_HEADERS = include_libchip_HEADERS += ../../bsps/include/libchip/am29lv160.h diff --git a/bsps/include/grlib/ambapp.h b/bsps/include/grlib/ambapp.h index 338602e83d..5e5a649f53 100644 --- a/bsps/include/grlib/ambapp.h +++ b/bsps/include/grlib/ambapp.h @@ -19,7 +19,7 @@ #define __AMBAPP_H__ /* Include VENDOR and DEVICE definitions */ -#include <ambapp_ids.h> +#include "ambapp_ids.h" #ifdef __cplusplus extern "C" { diff --git a/bsps/include/grlib/ambapp_bus.h b/bsps/include/grlib/ambapp_bus.h index 94a7fe2216..87cd52bc69 100644 --- a/bsps/include/grlib/ambapp_bus.h +++ b/bsps/include/grlib/ambapp_bus.h @@ -17,7 +17,7 @@ #define __AMBAPP_BUS_H__ #include <drvmgr/drvmgr.h> -#include <ambapp.h> +#include "ambapp.h" #ifdef __cplusplus extern "C" { diff --git a/bsps/include/grlib/apbuart.h b/bsps/include/grlib/apbuart.h index 870e5408d8..d30ad0bcef 100644 --- a/bsps/include/grlib/apbuart.h +++ b/bsps/include/grlib/apbuart.h @@ -19,8 +19,8 @@ #ifndef __APBUART_H__ #define __APBUART_H__ -#include <ambapp.h> -#include <grlib.h> +#include "ambapp.h" +#include "grlib.h" #ifdef __cplusplus extern "C" { diff --git a/bsps/include/grlib/apbuart_termios.h b/bsps/include/grlib/apbuart_termios.h index 6554195d05..ca6b5d3b3e 100644 --- a/bsps/include/grlib/apbuart_termios.h +++ b/bsps/include/grlib/apbuart_termios.h @@ -15,7 +15,7 @@ #define APBUART_TERMIOS_H #include <rtems/termiostypes.h> -#include <grlib.h> +#include "grlib.h" #ifdef __cplusplus extern "C" { diff --git a/bsps/include/grlib/gr1553bc.h b/bsps/include/grlib/gr1553bc.h index ec766d2147..caf6f77722 100644 --- a/bsps/include/grlib/gr1553bc.h +++ b/bsps/include/grlib/gr1553bc.h @@ -40,7 +40,7 @@ struct gr1553bc_major_cfg; #endif #include <stdint.h> -#include <bsp/gr1553bc_list.h> +#include "gr1553bc_list.h" #ifdef __cplusplus extern "C" { diff --git a/bsps/include/grlib/gr1553bc_list.h b/bsps/include/grlib/gr1553bc_list.h index a89ddf58cf..5024923968 100644 --- a/bsps/include/grlib/gr1553bc_list.h +++ b/bsps/include/grlib/gr1553bc_list.h @@ -193,7 +193,7 @@ */ #include <stdint.h> -#include <bsp/gr1553bc.h> +#include "gr1553bc.h" /**** CONFIGURATION OPTIONS ****/ diff --git a/bsps/include/grlib/grlib_impl.h b/bsps/include/grlib/grlib_impl.h index 755f635911..9a7fa15a5e 100644 --- a/bsps/include/grlib/grlib_impl.h +++ b/bsps/include/grlib/grlib_impl.h @@ -90,6 +90,8 @@ RTEMS_INLINE_ROUTINE void *grlib_calloc(size_t nelem, size_t elsize) #endif +extern struct ambapp_bus ambapp_plb; + #ifdef __cplusplus } #endif diff --git a/bsps/include/grlib/grspw.h b/bsps/include/grlib/grspw.h index 3270e8a5a2..70a9e0b100 100644 --- a/bsps/include/grlib/grspw.h +++ b/bsps/include/grlib/grspw.h @@ -18,7 +18,7 @@ #ifndef __GRSPW_H__ #define __GRSPW_H__ -#include <ambapp.h> +#include <grlib/ambapp.h> #ifdef __cplusplus extern "C" { diff --git a/bsps/include/grlib/i2cmst.h b/bsps/include/grlib/i2cmst.h index 3eee717524..a06117f0dc 100644 --- a/bsps/include/grlib/i2cmst.h +++ b/bsps/include/grlib/i2cmst.h @@ -19,7 +19,7 @@ #define _I2CMST_H #include <rtems/libi2c.h> -#include <ambapp.h> +#include "ambapp.h" #ifdef __cplusplus extern "C" { diff --git a/bsps/riscv/riscv/include/bsp.h b/bsps/riscv/riscv/include/bsp.h index d8d0347da8..6d6046d195 100644 --- a/bsps/riscv/riscv/include/bsp.h +++ b/bsps/riscv/riscv/include/bsp.h @@ -34,6 +34,7 @@ #include <rtems.h> #include <rtems/clockdrv.h> #include <rtems/console.h> +#include <rtems/irq-extension.h> #include <bspopts.h> #include <bsp/default-initial-extension.h> diff --git a/bsps/shared/grlib/1553/b1553brm.c b/bsps/shared/grlib/1553/b1553brm.c index 216397b334..5575abb525 100644 --- a/bsps/shared/grlib/1553/b1553brm.c +++ b/bsps/shared/grlib/1553/b1553brm.c @@ -27,11 +27,11 @@ #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <bsp/b1553brm.h> -#include <ambapp.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/b1553brm.h> +#include <grlib/ambapp.h> +#include <grlib/ambapp_bus.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Uncomment for debug output */ /*#define DEBUG 1 diff --git a/bsps/shared/grlib/1553/b1553rt.c b/bsps/shared/grlib/1553/b1553rt.c index 9d2a22d70b..35afd901c8 100644 --- a/bsps/shared/grlib/1553/b1553rt.c +++ b/bsps/shared/grlib/1553/b1553rt.c @@ -19,11 +19,11 @@ #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <bsp/b1553rt.h> -#include <ambapp.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/b1553rt.h> +#include <grlib/ambapp.h> +#include <grlib/ambapp_bus.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Uncomment for debug output */ /*#define DEBUG 1*/ diff --git a/bsps/shared/grlib/1553/gr1553b.c b/bsps/shared/grlib/1553/gr1553b.c index ba75398f63..777b6dc743 100644 --- a/bsps/shared/grlib/1553/gr1553b.c +++ b/bsps/shared/grlib/1553/gr1553b.c @@ -9,11 +9,11 @@ */ #include <stdlib.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> -#include <bsp/gr1553b.h> +#include <grlib/gr1553b.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Driver Manager interface for BC, RT, BM, BRM, BC-BM and RT-BM */ diff --git a/bsps/shared/grlib/1553/gr1553bc.c b/bsps/shared/grlib/1553/gr1553bc.c index c7faba436d..a22e2d8007 100644 --- a/bsps/shared/grlib/1553/gr1553bc.c +++ b/bsps/shared/grlib/1553/gr1553bc.c @@ -12,12 +12,12 @@ #include <string.h> #include <rtems.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> -#include <bsp/gr1553b.h> -#include <bsp/gr1553bc.h> +#include <grlib/gr1553b.h> +#include <grlib/gr1553bc.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #define GR1553BC_WRITE_MEM(adr, val) *(volatile uint32_t *)(adr) = (uint32_t)(val) #define GR1553BC_READ_MEM(adr) (*(volatile uint32_t *)(adr)) diff --git a/bsps/shared/grlib/1553/gr1553bm.c b/bsps/shared/grlib/1553/gr1553bm.c index 1897a16f79..482e574d78 100644 --- a/bsps/shared/grlib/1553/gr1553bm.c +++ b/bsps/shared/grlib/1553/gr1553bm.c @@ -11,12 +11,12 @@ #include <stdlib.h> #include <string.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> -#include <bsp/gr1553b.h> -#include <bsp/gr1553bm.h> +#include <grlib/gr1553b.h> +#include <grlib/gr1553bm.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #define GR1553BM_WRITE_MEM(adr, val) *(volatile uint32_t *)(adr) = (uint32_t)(val) #define GR1553BM_READ_MEM(adr) (*(volatile uint32_t *)(adr)) diff --git a/bsps/shared/grlib/1553/gr1553rt.c b/bsps/shared/grlib/1553/gr1553rt.c index 8a869c9152..339e856c76 100644 --- a/bsps/shared/grlib/1553/gr1553rt.c +++ b/bsps/shared/grlib/1553/gr1553rt.c @@ -13,13 +13,13 @@ #include <stdio.h> #include <string.h> -#include <bsp/gr1553b.h> -#include <bsp/gr1553rt.h> +#include <grlib/gr1553b.h> +#include <grlib/gr1553rt.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #define GR1553RT_WRITE_MEM(adr, val) *(volatile uint32_t *)(adr) = (uint32_t)(val) #define GR1553RT_READ_MEM(adr) (*(volatile uint32_t *)(adr)) diff --git a/bsps/shared/grlib/amba/ahbstat.c b/bsps/shared/grlib/amba/ahbstat.c index 4e4cd72525..af3d778feb 100644 --- a/bsps/shared/grlib/amba/ahbstat.c +++ b/bsps/shared/grlib/amba/ahbstat.c @@ -13,11 +13,11 @@ #include <rtems.h> #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> -#include <bsp/ahbstat.h> +#include <grlib/ahbstat.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #define REG_WRITE(addr, val) (*(volatile uint32_t *)(addr) = (uint32_t)(val)) #define REG_READ(addr) (*(volatile uint32_t *)(addr)) diff --git a/bsps/shared/grlib/amba/ambapp.c b/bsps/shared/grlib/amba/ambapp.c index 4fb8405103..69018f47e7 100644 --- a/bsps/shared/grlib/amba/ambapp.c +++ b/bsps/shared/grlib/amba/ambapp.c @@ -13,10 +13,10 @@ #include <stdlib.h> #include <string.h> -#include <ambapp.h> +#include <grlib/ambapp.h> #include <bsp.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #define AMBA_CONF_AREA 0xff000 #define AMBA_AHB_SLAVE_CONF_AREA (1 << 11) diff --git a/bsps/shared/grlib/amba/ambapp_alloc.c b/bsps/shared/grlib/amba/ambapp_alloc.c index 2357f697b9..96fcb7961b 100644 --- a/bsps/shared/grlib/amba/ambapp_alloc.c +++ b/bsps/shared/grlib/amba/ambapp_alloc.c @@ -9,7 +9,7 @@ * http://www.rtems.org/license/LICENSE. */ -#include <ambapp.h> +#include <grlib/ambapp.h> int ambapp_alloc_dev(struct ambapp_dev *dev, void *owner) { diff --git a/bsps/shared/grlib/amba/ambapp_count.c b/bsps/shared/grlib/amba/ambapp_count.c index 4e3a1dc102..9da4d93a19 100644 --- a/bsps/shared/grlib/amba/ambapp_count.c +++ b/bsps/shared/grlib/amba/ambapp_count.c @@ -9,7 +9,7 @@ * http://www.rtems.org/license/LICENSE. */ -#include <ambapp.h> +#include <grlib/ambapp.h> /* Get number of devices matching search options */ int ambapp_dev_count(struct ambapp_bus *abus, unsigned int options, diff --git a/bsps/shared/grlib/amba/ambapp_depth.c b/bsps/shared/grlib/amba/ambapp_depth.c index 8a96afbee6..2fe0b142e9 100644 --- a/bsps/shared/grlib/amba/ambapp_depth.c +++ b/bsps/shared/grlib/amba/ambapp_depth.c @@ -9,7 +9,7 @@ * http://www.rtems.org/license/LICENSE. */ -#include <ambapp.h> +#include <grlib/ambapp.h> /* Get bus depth a device is located at */ int ambapp_depth(struct ambapp_dev *dev) diff --git a/bsps/shared/grlib/amba/ambapp_find_by_idx.c b/bsps/shared/grlib/amba/ambapp_find_by_idx.c index 6b2d28824c..55d9022881 100644 --- a/bsps/shared/grlib/amba/ambapp_find_by_idx.c +++ b/bsps/shared/grlib/amba/ambapp_find_by_idx.c @@ -9,7 +9,7 @@ * http://www.rtems.org/license/LICENSE. */ -#include <ambapp.h> +#include <grlib/ambapp.h> /* AMBAPP helper routine to find a device by index. The function is given to * ambapp_for_each, the argument may be NULL (find first device) or a pointer diff --git a/bsps/shared/grlib/amba/ambapp_freq.c b/bsps/shared/grlib/amba/ambapp_freq.c index 59db15f865..9e6e9c1765 100644 --- a/bsps/shared/grlib/amba/ambapp_freq.c +++ b/bsps/shared/grlib/amba/ambapp_freq.c @@ -9,7 +9,7 @@ * http://www.rtems.org/license/LICENSE. */ -#include <ambapp.h> +#include <grlib/ambapp.h> /* Calculate AHB Bus frequency of * - Bus[0] (inverse=1), relative to the frequency of Bus[ahbidx] diff --git a/bsps/shared/grlib/amba/ambapp_names.c b/bsps/shared/grlib/amba/ambapp_names.c index 5539d3c489..8d168f283b 100644 --- a/bsps/shared/grlib/amba/ambapp_names.c +++ b/bsps/shared/grlib/amba/ambapp_names.c @@ -12,8 +12,8 @@ * http://www.rtems.org/license/LICENSE. */ -#include <ambapp.h> -#include <ambapp_ids.h> +#include <grlib/ambapp.h> +#include <grlib/ambapp_ids.h> #include <string.h> #ifndef NULL diff --git a/bsps/shared/grlib/amba/ambapp_old.c b/bsps/shared/grlib/amba/ambapp_old.c index 2be77a484f..a51e692fbf 100644 --- a/bsps/shared/grlib/amba/ambapp_old.c +++ b/bsps/shared/grlib/amba/ambapp_old.c @@ -9,7 +9,7 @@ * http://www.rtems.org/license/LICENSE. */ -#include <ambapp.h> +#include <grlib/ambapp.h> struct ambapp_dev_find_match_arg { int index; diff --git a/bsps/shared/grlib/amba/ambapp_parent.c b/bsps/shared/grlib/amba/ambapp_parent.c index 6064b4a165..b77b6eec68 100644 --- a/bsps/shared/grlib/amba/ambapp_parent.c +++ b/bsps/shared/grlib/amba/ambapp_parent.c @@ -10,7 +10,7 @@ */ #include <stdlib.h> -#include <ambapp.h> +#include <grlib/ambapp.h> struct ambapp_dev *ambapp_find_parent(struct ambapp_dev *dev) { diff --git a/bsps/shared/grlib/amba/ambapp_show.c b/bsps/shared/grlib/amba/ambapp_show.c index 1ed15c643e..12cefa2c0f 100644 --- a/bsps/shared/grlib/amba/ambapp_show.c +++ b/bsps/shared/grlib/amba/ambapp_show.c @@ -10,7 +10,7 @@ */ #include <stdio.h> -#include <ambapp.h> +#include <grlib/ambapp.h> struct ambapp_dev_print_arg { int show_depth; diff --git a/bsps/shared/grlib/analog/gradcdac.c b/bsps/shared/grlib/analog/gradcdac.c index bbe6620060..02939e58f0 100644 --- a/bsps/shared/grlib/analog/gradcdac.c +++ b/bsps/shared/grlib/analog/gradcdac.c @@ -13,8 +13,8 @@ #include <stdio.h> #include <string.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/gradcdac.h> +#include <grlib/ambapp_bus.h> +#include <grlib/gradcdac.h> /****************** DEBUG Definitions ********************/ #define DBG_IOCTRL 1 @@ -27,9 +27,9 @@ #define DEBUG #define DEBUGFUNCS */ -#include <bsp/debug_defs.h> +#include <grlib/debug_defs.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> struct gradcdac_priv { struct gradcdac_regs *regs; /* Must be first */ diff --git a/bsps/shared/grlib/ascs/grascs.c b/bsps/shared/grlib/ascs/grascs.c index 1c7599575e..8d3d1b4285 100644 --- a/bsps/shared/grlib/ascs/grascs.c +++ b/bsps/shared/grlib/ascs/grascs.c @@ -10,10 +10,10 @@ #include <stdlib.h> #include <bsp.h> -#include <ambapp.h> -#include <bsp/grascs.h> +#include <grlib/ambapp.h> +#include <grlib/grascs.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #ifndef GAISLER_ASCS #define GAISLER_ASCS 0x043 diff --git a/bsps/shared/grlib/btimer/gptimer.c b/bsps/shared/grlib/btimer/gptimer.c index 6174acc007..4b3ec8c4b8 100644 --- a/bsps/shared/grlib/btimer/gptimer.c +++ b/bsps/shared/grlib/btimer/gptimer.c @@ -36,10 +36,10 @@ #include <stdlib.h> #include <string.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <grlib.h> -#include <bsp/gptimer.h> -#include <bsp/tlib.h> +#include <grlib/ambapp_bus.h> +#include <grlib/grlib.h> +#include <grlib/gptimer.h> +#include <grlib/tlib.h> #if defined(LEON3) #include <leon.h> @@ -54,7 +54,7 @@ #include <rtems/score/smpimpl.h> #endif -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* GPTIMER Core Configuration Register (READ-ONLY) */ #define GPTIMER_CFG_TIMERS_BIT 0 diff --git a/bsps/shared/grlib/btimer/tlib.c b/bsps/shared/grlib/btimer/tlib.c index a0525d072d..d66a472fe9 100644 --- a/bsps/shared/grlib/btimer/tlib.c +++ b/bsps/shared/grlib/btimer/tlib.c @@ -10,7 +10,7 @@ */ #include <rtems.h> -#include <bsp/tlib.h> +#include <grlib/tlib.h> struct tlib_dev *tlib_dev_head = NULL; struct tlib_dev *tlib_dev_tail = NULL; diff --git a/bsps/shared/grlib/btimer/tlib_ckinit.c b/bsps/shared/grlib/btimer/tlib_ckinit.c index 66433359fe..e43c8fdd8e 100644 --- a/bsps/shared/grlib/btimer/tlib_ckinit.c +++ b/bsps/shared/grlib/btimer/tlib_ckinit.c @@ -22,7 +22,7 @@ #include <rtems/clockdrv.h> #include <stdlib.h> #include <bsp.h> -#include <bsp/tlib.h> +#include <grlib/tlib.h> #ifdef RTEMS_DRVMGR_STARTUP diff --git a/bsps/shared/grlib/can/canmux.c b/bsps/shared/grlib/can/canmux.c index ca2125aefd..369cb3dd0a 100644 --- a/bsps/shared/grlib/can/canmux.c +++ b/bsps/shared/grlib/can/canmux.c @@ -16,10 +16,10 @@ #include <bsp.h> #include <rtems/bspIo.h> /* printk */ -#include <bsp/canmux.h> -#include <ambapp.h> +#include <grlib/canmux.h> +#include <grlib/ambapp.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #ifndef GAISLER_CANMUX #define GAISLER_CANMUX 0x081 diff --git a/bsps/shared/grlib/can/grcan.c b/bsps/shared/grlib/can/grcan.c index 03faec915c..55154d823a 100644 --- a/bsps/shared/grlib/can/grcan.c +++ b/bsps/shared/grlib/can/grcan.c @@ -17,12 +17,12 @@ #include <ctype.h> #include <rtems/bspIo.h> -#include <bsp/grcan.h> +#include <grlib/grcan.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/ambapp.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Maximum number of GRCAN devices supported by driver */ #define GRCAN_COUNT_MAX 8 @@ -77,7 +77,7 @@ #define DEBUG #define DEBUGFUNCS */ -#include <bsp/debug_defs.h> +#include <grlib/debug_defs.h> /*********************************************************/ diff --git a/bsps/shared/grlib/can/occan.c b/bsps/shared/grlib/can/occan.c index c0bc315db1..59b4f234f6 100644 --- a/bsps/shared/grlib/can/occan.c +++ b/bsps/shared/grlib/can/occan.c @@ -17,10 +17,10 @@ #include <rtems/bspIo.h> /* printk */ #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/occan.h> +#include <grlib/ambapp_bus.h> +#include <grlib/occan.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* RTEMS -> ERRNO decoding table diff --git a/bsps/shared/grlib/can/satcan.c b/bsps/shared/grlib/can/satcan.c index 9cc27fc0dc..c6d58aaed4 100644 --- a/bsps/shared/grlib/can/satcan.c +++ b/bsps/shared/grlib/can/satcan.c @@ -16,10 +16,10 @@ #include <bsp.h> #include <rtems/bspIo.h> /* printk */ -#include <bsp/satcan.h> -#include <ambapp.h> +#include <grlib/satcan.h> +#include <grlib/ambapp.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #ifndef GAISLER_SATCAN #define GAISLER_SATCAN 0x080 diff --git a/bsps/shared/grlib/drvmgr/ambapp_bus.c b/bsps/shared/grlib/drvmgr/ambapp_bus.c index 3787660a15..931d5d2a61 100644 --- a/bsps/shared/grlib/drvmgr/ambapp_bus.c +++ b/bsps/shared/grlib/drvmgr/ambapp_bus.c @@ -21,10 +21,10 @@ #include <string.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <bsp.h> -#include <ambapp.h> +#include <grlib/ambapp.h> #include <rtems/bspIo.h> /*#define DEBUG 1*/ diff --git a/bsps/shared/grlib/drvmgr/ambapp_bus_grlib.c b/bsps/shared/grlib/drvmgr/ambapp_bus_grlib.c index 1db0d06aeb..5eb51d0944 100644 --- a/bsps/shared/grlib/drvmgr/ambapp_bus_grlib.c +++ b/bsps/shared/grlib/drvmgr/ambapp_bus_grlib.c @@ -17,14 +17,14 @@ #include <stdint.h> #include <libcpu/access.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <drvmgr/ambapp_bus_grlib.h> -#include <bsp/genirq.h> +#include <grlib/genirq.h> #include <bsp.h> #include <bsp/irq.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #define DBG(args...) /*#define DBG(args...) printk(args)*/ diff --git a/bsps/shared/grlib/drvmgr/get_resarray_count.c b/bsps/shared/grlib/drvmgr/get_resarray_count.c index 4099fa6b0d..7b5850d982 100644 --- a/bsps/shared/grlib/drvmgr/get_resarray_count.c +++ b/bsps/shared/grlib/drvmgr/get_resarray_count.c @@ -9,7 +9,7 @@ */ #include <stdlib.h> -#include <drvmgr/bspcommon.h> +#include <grlib/bspcommon.h> int get_resarray_count(struct drvmgr_bus_res **array) { diff --git a/bsps/shared/grlib/gpio/gpiolib.c b/bsps/shared/grlib/gpio/gpiolib.c index 700f27a266..cf0038c5bb 100644 --- a/bsps/shared/grlib/gpio/gpiolib.c +++ b/bsps/shared/grlib/gpio/gpiolib.c @@ -12,9 +12,9 @@ #include <stdio.h> #include <string.h> -#include <bsp/gpiolib.h> +#include <grlib/gpiolib.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> struct gpiolib_port; diff --git a/bsps/shared/grlib/gpio/grgpio.c b/bsps/shared/grlib/gpio/grgpio.c index b235ba273d..05504ef020 100644 --- a/bsps/shared/grlib/gpio/grgpio.c +++ b/bsps/shared/grlib/gpio/grgpio.c @@ -17,12 +17,12 @@ #include <stdio.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/grgpio.h> -#include <bsp/gpiolib.h> -#include <ambapp.h> -#include <grlib.h> -#include <grlib_impl.h> +#include <grlib/ambapp_bus.h> +#include <grlib/grgpio.h> +#include <grlib/gpiolib.h> +#include <grlib/ambapp.h> +#include <grlib/grlib.h> +#include <grlib/grlib_impl.h> /*#define DEBUG 1*/ diff --git a/bsps/shared/grlib/i2c/i2cmst.c b/bsps/shared/grlib/i2c/i2cmst.c index 3f11d879aa..fad0937df2 100644 --- a/bsps/shared/grlib/i2c/i2cmst.c +++ b/bsps/shared/grlib/i2c/i2cmst.c @@ -15,14 +15,14 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <ambapp.h> +#include <grlib/ambapp.h> #include <rtems/libi2c.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> -#include <bsp/i2cmst.h> +#include <grlib/i2cmst.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Enable debug printks? */ /*#define DEBUG*/ diff --git a/bsps/shared/grlib/iommu/griommu.c b/bsps/shared/grlib/iommu/griommu.c index 69d8672057..d0d22723ca 100644 --- a/bsps/shared/grlib/iommu/griommu.c +++ b/bsps/shared/grlib/iommu/griommu.c @@ -12,14 +12,14 @@ #include <stdlib.h> #include <string.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/ambapp.h> #include <rtems.h> #include <rtems/bspIo.h> #include <bsp.h> -#include <bsp/griommu.h> +#include <grlib/griommu.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /*#define STATIC*/ #define STATIC static diff --git a/bsps/shared/grlib/irq/genirq.c b/bsps/shared/grlib/irq/genirq.c index 6ddd442f73..285416b0d3 100644 --- a/bsps/shared/grlib/irq/genirq.c +++ b/bsps/shared/grlib/irq/genirq.c @@ -13,9 +13,9 @@ #include <rtems/bspIo.h> #include <stdlib.h> #include <string.h> -#include <bsp/genirq.h> +#include <grlib/genirq.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> struct genirq_handler_entry { struct genirq_handler_entry *next; /* Next ISR entry for this IRQ number */ diff --git a/bsps/shared/grlib/l2c/l2c.c b/bsps/shared/grlib/l2c/l2c.c index 89b0f40444..ddef0ada5c 100644 --- a/bsps/shared/grlib/l2c/l2c.c +++ b/bsps/shared/grlib/l2c/l2c.c @@ -12,13 +12,13 @@ #include <stdlib.h> #include <string.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/ambapp.h> #include <rtems.h> #include <rtems/bspIo.h> -#include <grlib.h> +#include <grlib/grlib.h> #include <bsp.h> -#include <bsp/l2c.h> +#include <grlib/l2c.h> /*#define STATIC*/ #define STATIC static diff --git a/bsps/shared/grlib/mem/mctrl.c b/bsps/shared/grlib/mem/mctrl.c index 47422a7ee2..a384547de8 100644 --- a/bsps/shared/grlib/mem/mctrl.c +++ b/bsps/shared/grlib/mem/mctrl.c @@ -18,11 +18,11 @@ #include <stdio.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> -#include <bsp/mctrl.h> +#include <grlib/mctrl.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #define MEMSET(priv, start, c, length) memset((void *)start, c, length) diff --git a/bsps/shared/grlib/net/greth.c b/bsps/shared/grlib/net/greth.c index a927ddfee6..30eb4cc8a9 100644 --- a/bsps/shared/grlib/net/greth.c +++ b/bsps/shared/grlib/net/greth.c @@ -29,10 +29,10 @@ #include <rtems/error.h> #include <rtems/rtems_bsdnet.h> -#include <bsp/greth.h> +#include <grlib/greth.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/ambapp.h> #include <sys/param.h> #include <sys/mbuf.h> @@ -50,7 +50,7 @@ #undef free #endif -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #if defined(__m68k__) extern m68k_isr_entry set_vector( rtems_isr_entry, rtems_vector_number, int ); diff --git a/bsps/shared/grlib/net/network_interface_add.c b/bsps/shared/grlib/net/network_interface_add.c index e434e27b8f..011137404f 100644 --- a/bsps/shared/grlib/net/network_interface_add.c +++ b/bsps/shared/grlib/net/network_interface_add.c @@ -17,7 +17,7 @@ #include <rtems/rtems_bsdnet.h> #include <stdio.h> -#include <bsp/network_interface_add.h> +#include <grlib/network_interface_add.h> extern struct rtems_bsdnet_config rtems_bsdnet_config; diff --git a/bsps/shared/grlib/pci/gr_701.c b/bsps/shared/grlib/pci/gr_701.c index b0070fd9dd..c9ac0db0f2 100644 --- a/bsps/shared/grlib/pci/gr_701.c +++ b/bsps/shared/grlib/pci/gr_701.c @@ -27,18 +27,18 @@ #include <pci.h> #include <pci/access.h> -#include <ambapp.h> +#include <grlib/ambapp.h> -#include <ambapp.h> +#include <grlib/ambapp.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <drvmgr/pci_bus.h> -#include <drvmgr/bspcommon.h> -#include <bsp/genirq.h> +#include <grlib/bspcommon.h> +#include <grlib/genirq.h> -#include <bsp/gr_701.h> +#include <grlib/gr_701.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Offset from 0x80000000 (dual bus version) */ #define AHB1_BASE_ADDR 0x80000000 diff --git a/bsps/shared/grlib/pci/gr_rasta_adcdac.c b/bsps/shared/grlib/pci/gr_rasta_adcdac.c index bea58328d4..12e35acbc5 100644 --- a/bsps/shared/grlib/pci/gr_rasta_adcdac.c +++ b/bsps/shared/grlib/pci/gr_rasta_adcdac.c @@ -26,17 +26,17 @@ #include <rtems/bspIo.h> #include <pci.h> -#include <ambapp.h> -#include <grlib.h> +#include <grlib/ambapp.h> +#include <grlib/grlib.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <drvmgr/pci_bus.h> -#include <drvmgr/bspcommon.h> -#include <bsp/genirq.h> +#include <grlib/bspcommon.h> +#include <grlib/genirq.h> -#include <bsp/gr_rasta_adcdac.h> +#include <grlib/gr_rasta_adcdac.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /*#define DEBUG 1*/ diff --git a/bsps/shared/grlib/pci/gr_rasta_io.c b/bsps/shared/grlib/pci/gr_rasta_io.c index 63299c10a7..f4c9d50a7b 100644 --- a/bsps/shared/grlib/pci/gr_rasta_io.c +++ b/bsps/shared/grlib/pci/gr_rasta_io.c @@ -26,17 +26,17 @@ #include <rtems/bspIo.h> #include <pci.h> -#include <ambapp.h> -#include <grlib.h> +#include <grlib/ambapp.h> +#include <grlib/grlib.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <drvmgr/pci_bus.h> -#include <drvmgr/bspcommon.h> -#include <bsp/genirq.h> +#include <grlib/bspcommon.h> +#include <grlib/genirq.h> -#include <bsp/gr_rasta_io.h> +#include <grlib/gr_rasta_io.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Determines which PCI address the AHB masters will access, it should be * set so that the masters can access the CPU RAM. Default is base of CPU RAM, diff --git a/bsps/shared/grlib/pci/gr_rasta_spw_router.c b/bsps/shared/grlib/pci/gr_rasta_spw_router.c index 0bfc645dc2..6efbaa463d 100644 --- a/bsps/shared/grlib/pci/gr_rasta_spw_router.c +++ b/bsps/shared/grlib/pci/gr_rasta_spw_router.c @@ -24,16 +24,16 @@ #include <rtems/bspIo.h> #include <pci.h> -#include <ambapp.h> -#include <grlib.h> +#include <grlib/ambapp.h> +#include <grlib/grlib.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <drvmgr/pci_bus.h> -#include <drvmgr/bspcommon.h> -#include <bsp/genirq.h> -#include <bsp/gr_rasta_spw_router.h> +#include <grlib/bspcommon.h> +#include <grlib/genirq.h> +#include <grlib/gr_rasta_spw_router.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Determines which PCI address the AHB masters will access, it should be * set so that the masters can access the CPU RAM. Default is base of CPU RAM, diff --git a/bsps/shared/grlib/pci/gr_rasta_tmtc.c b/bsps/shared/grlib/pci/gr_rasta_tmtc.c index b243259d96..bef2927926 100644 --- a/bsps/shared/grlib/pci/gr_rasta_tmtc.c +++ b/bsps/shared/grlib/pci/gr_rasta_tmtc.c @@ -26,17 +26,17 @@ #include <rtems/bspIo.h> #include <pci.h> -#include <ambapp.h> -#include <grlib.h> +#include <grlib/ambapp.h> +#include <grlib/grlib.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <drvmgr/pci_bus.h> -#include <drvmgr/bspcommon.h> -#include <bsp/genirq.h> +#include <grlib/bspcommon.h> +#include <grlib/genirq.h> -#include <bsp/gr_rasta_tmtc.h> +#include <grlib/gr_rasta_tmtc.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Determines which PCI address the AHB masters will access, it should be * set so that the masters can access the CPU RAM. Default is base of CPU RAM, diff --git a/bsps/shared/grlib/pci/gr_tmtc_1553.c b/bsps/shared/grlib/pci/gr_tmtc_1553.c index 2a497fe7de..ce02b8a256 100644 --- a/bsps/shared/grlib/pci/gr_tmtc_1553.c +++ b/bsps/shared/grlib/pci/gr_tmtc_1553.c @@ -27,17 +27,17 @@ #include <pci.h> #include <pci/access.h> -#include <ambapp.h> -#include <grlib.h> +#include <grlib/ambapp.h> +#include <grlib/grlib.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <drvmgr/pci_bus.h> -#include <drvmgr/bspcommon.h> -#include <bsp/genirq.h> +#include <grlib/bspcommon.h> +#include <grlib/genirq.h> -#include <bsp/gr_tmtc_1553.h> +#include <grlib/gr_tmtc_1553.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /*#define DEBUG 1 */ diff --git a/bsps/shared/grlib/pci/grpci.c b/bsps/shared/grlib/pci/grpci.c index 6e35b44132..fc2f06a063 100644 --- a/bsps/shared/grlib/pci/grpci.c +++ b/bsps/shared/grlib/pci/grpci.c @@ -26,10 +26,10 @@ #include <pci/cfg.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/ambapp.h> #include <drvmgr/pci_bus.h> -#include <bsp/grpci.h> +#include <grlib/grpci.h> #define DMAPCI_ADDR 0x80000500 diff --git a/bsps/shared/grlib/pci/grpci2.c b/bsps/shared/grlib/pci/grpci2.c index 9bb479c110..21c09f47a5 100644 --- a/bsps/shared/grlib/pci/grpci2.c +++ b/bsps/shared/grlib/pci/grpci2.c @@ -38,12 +38,12 @@ #include <pci/cfg.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/ambapp.h> #include <drvmgr/pci_bus.h> -#include <bsp/grpci2.h> +#include <grlib/grpci2.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* If defined to 1 - byte twisting is enabled by default */ #define DEFAULT_BT_ENABLED 0 diff --git a/bsps/shared/grlib/pci/grpci2dma.c b/bsps/shared/grlib/pci/grpci2dma.c index 0bc06ff50d..7e39ca691d 100644 --- a/bsps/shared/grlib/pci/grpci2dma.c +++ b/bsps/shared/grlib/pci/grpci2dma.c @@ -16,9 +16,9 @@ #include <rtems.h> #include <rtems/bspIo.h> /* for printk */ #include <bsp.h> -#include <bsp/grpci2dma.h> +#include <grlib/grpci2dma.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* This driver has been prepared for SMP operation */ diff --git a/bsps/shared/grlib/pci/pcif.c b/bsps/shared/grlib/pci/pcif.c index 8603c990e2..17708a9c0b 100644 --- a/bsps/shared/grlib/pci/pcif.c +++ b/bsps/shared/grlib/pci/pcif.c @@ -26,10 +26,10 @@ #include <pci/cfg.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/ambapp.h> #include <drvmgr/pci_bus.h> -#include <bsp/pcif.h> +#include <grlib/pcif.h> /* Configuration options */ diff --git a/bsps/shared/grlib/pwm/grpwm.c b/bsps/shared/grlib/pwm/grpwm.c index 87e40663c5..a824201795 100644 --- a/bsps/shared/grlib/pwm/grpwm.c +++ b/bsps/shared/grlib/pwm/grpwm.c @@ -18,11 +18,11 @@ #include <stdio.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/grpwm.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/grpwm.h> +#include <grlib/ambapp.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* #define DEBUG 1 */ diff --git a/bsps/shared/grlib/scrub/memscrub.c b/bsps/shared/grlib/scrub/memscrub.c index 2e4dfeeb0c..7c6ceb43e0 100644 --- a/bsps/shared/grlib/scrub/memscrub.c +++ b/bsps/shared/grlib/scrub/memscrub.c @@ -14,9 +14,9 @@ #include <string.h> #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> -#include <bsp/memscrub.h> +#include <grlib/memscrub.h> /*#define STATIC*/ #define STATIC static diff --git a/bsps/shared/grlib/slink/grslink.c b/bsps/shared/grlib/slink/grslink.c index 07335786e5..fa6f205915 100644 --- a/bsps/shared/grlib/slink/grslink.c +++ b/bsps/shared/grlib/slink/grslink.c @@ -23,10 +23,10 @@ #include <stdlib.h> #include <bsp.h> -#include <bsp/grslink.h> -#include <ambapp.h> +#include <grlib/grslink.h> +#include <grlib/ambapp.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #ifndef GAISLER_SLINK #define GAISLER_SLINK 0x02F diff --git a/bsps/shared/grlib/spi/spictrl.c b/bsps/shared/grlib/spi/spictrl.c index 6f5ffefe25..0c9f88c10f 100644 --- a/bsps/shared/grlib/spi/spictrl.c +++ b/bsps/shared/grlib/spi/spictrl.c @@ -18,13 +18,13 @@ #include <stdio.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/spictrl.h> -#include <ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/spictrl.h> +#include <grlib/ambapp.h> #include <rtems/libi2c.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /*#define DEBUG 1*/ diff --git a/bsps/shared/grlib/spw/grspw.c b/bsps/shared/grlib/spw/grspw.c index 846af8c6b5..ca0f63edd8 100644 --- a/bsps/shared/grlib/spw/grspw.c +++ b/bsps/shared/grlib/spw/grspw.c @@ -17,13 +17,13 @@ #include <assert.h> #include <ctype.h> #include <rtems/bspIo.h> -#include <ambapp.h> +#include <grlib/ambapp.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/grspw.h> +#include <grlib/ambapp_bus.h> +#include <grlib/grspw.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> #define DBGSPW_IOCALLS 1 #define DBGSPW_TX 2 diff --git a/bsps/shared/grlib/spw/grspw_pkt.c b/bsps/shared/grlib/spw/grspw_pkt.c index ce8478de65..208f5a14f7 100644 --- a/bsps/shared/grlib/spw/grspw_pkt.c +++ b/bsps/shared/grlib/spw/grspw_pkt.c @@ -23,11 +23,11 @@ #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <ambapp.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/grspw_pkt.h> +#include <grlib/ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/grspw_pkt.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /*#define STATIC*/ #define STATIC static diff --git a/bsps/shared/grlib/spw/grspw_router.c b/bsps/shared/grlib/spw/grspw_router.c index 41ecfb823a..d8ba8feef3 100644 --- a/bsps/shared/grlib/spw/grspw_router.c +++ b/bsps/shared/grlib/spw/grspw_router.c @@ -15,10 +15,10 @@ #include <bsp.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/grspw_router.h> +#include <grlib/ambapp_bus.h> +#include <grlib/grspw_router.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> //#define STATIC #define STATIC static diff --git a/bsps/shared/grlib/spw/spwtdp.c b/bsps/shared/grlib/spw/spwtdp.c index 679a5b79c5..df74675355 100644 --- a/bsps/shared/grlib/spw/spwtdp.c +++ b/bsps/shared/grlib/spw/spwtdp.c @@ -16,12 +16,12 @@ #include <rtems.h> #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <ambapp.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp.h> +#include <grlib/ambapp_bus.h> #include <bsp.h> -#include <bsp/spwtdp.h> +#include <grlib/spwtdp.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /*#define STATIC*/ #define STATIC static diff --git a/bsps/shared/grlib/stat/l4stat.c b/bsps/shared/grlib/stat/l4stat.c index a7621feb00..ee4ae7d6a4 100644 --- a/bsps/shared/grlib/stat/l4stat.c +++ b/bsps/shared/grlib/stat/l4stat.c @@ -15,8 +15,8 @@ #include <rtems/bspIo.h> /* printk */ #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/l4stat.h> +#include <grlib/ambapp_bus.h> +#include <grlib/l4stat.h> /*#define STATIC*/ #define STATIC static diff --git a/bsps/shared/grlib/time/grctm.c b/bsps/shared/grlib/time/grctm.c index e740f7a7d5..038c3ddf34 100644 --- a/bsps/shared/grlib/time/grctm.c +++ b/bsps/shared/grlib/time/grctm.c @@ -9,13 +9,13 @@ */ #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <stdlib.h> #include <string.h> -#include <bsp/grctm.h> +#include <grlib/grctm.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Private structure of GRCTM driver */ struct grctm_priv { diff --git a/bsps/shared/grlib/time/spwcuc.c b/bsps/shared/grlib/time/spwcuc.c index 354322910e..d742f2d225 100644 --- a/bsps/shared/grlib/time/spwcuc.c +++ b/bsps/shared/grlib/time/spwcuc.c @@ -10,13 +10,13 @@ */ #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> +#include <grlib/ambapp_bus.h> #include <stdlib.h> #include <string.h> -#include <bsp/spwcuc.h> +#include <grlib/spwcuc.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* Private structure of SPWCUC driver. */ struct spwcuc_priv { diff --git a/bsps/shared/grlib/tmtc/grtc.c b/bsps/shared/grlib/tmtc/grtc.c index 35f67f6a4c..44e9685c3a 100644 --- a/bsps/shared/grlib/tmtc/grtc.c +++ b/bsps/shared/grlib/tmtc/grtc.c @@ -18,18 +18,18 @@ #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <ambapp.h> -#include <bsp/grtc.h> +#include <grlib/ambapp_bus.h> +#include <grlib/ambapp.h> +#include <grlib/grtc.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* #define DEBUG #define DEBUGFUNCS */ -#include <bsp/debug_defs.h> +#include <grlib/debug_defs.h> #ifdef DEBUG_ERROR #define DEBUG_ERR_LOG(device,error) grtc_log_error(device,error) diff --git a/bsps/shared/grlib/tmtc/grtm.c b/bsps/shared/grlib/tmtc/grtm.c index a7f7889dc5..43476aaaad 100644 --- a/bsps/shared/grlib/tmtc/grtm.c +++ b/bsps/shared/grlib/tmtc/grtm.c @@ -18,18 +18,18 @@ #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <ambapp.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/grtm.h> +#include <grlib/ambapp.h> +#include <grlib/ambapp_bus.h> +#include <grlib/grtm.h> -#include <grlib_impl.h> +#include <grlib/grlib_impl.h> /* #define DEBUG #define DEBUGFUNCS */ -#include <bsp/debug_defs.h> +#include <grlib/debug_defs.h> /* GRTM register map */ struct grtm_regs { diff --git a/bsps/shared/grlib/uart/apbuart_cons.c b/bsps/shared/grlib/uart/apbuart_cons.c index a54c222935..8cd8a1ebf0 100644 --- a/bsps/shared/grlib/uart/apbuart_cons.c +++ b/bsps/shared/grlib/uart/apbuart_cons.c @@ -25,13 +25,13 @@ #include <stdio.h> #include <drvmgr/drvmgr.h> -#include <drvmgr/ambapp_bus.h> -#include <bsp/apbuart.h> -#include <ambapp.h> -#include <grlib.h> -#include <bsp/cons.h> +#include <grlib/ambapp_bus.h> +#include <grlib/apbuart.h> +#include <grlib/ambapp.h> +#include <grlib/grlib.h> +#include <grlib/cons.h> #include <rtems/termiostypes.h> -#include <bsp/apbuart_cons.h> +#include <grlib/apbuart_cons.h> /*#define DEBUG 1 */ diff --git a/bsps/shared/grlib/uart/apbuart_polled.c b/bsps/shared/grlib/uart/apbuart_polled.c index 4a4402712a..0fbfbc51ba 100644 --- a/bsps/shared/grlib/uart/apbuart_polled.c +++ b/bsps/shared/grlib/uart/apbuart_polled.c @@ -7,7 +7,7 @@ * http://www.rtems.org/license/LICENSE. */ -#include <bsp/apbuart.h> +#include <grlib/apbuart.h> void apbuart_outbyte_polled( struct apbuart_regs *regs, diff --git a/bsps/shared/grlib/uart/apbuart_termios.c b/bsps/shared/grlib/uart/apbuart_termios.c index a4ecc749ce..81df89c171 100644 --- a/bsps/shared/grlib/uart/apbuart_termios.c +++ b/bsps/shared/grlib/uart/apbuart_termios.c @@ -11,8 +11,8 @@ * http://www.rtems.org/license/LICENSE. */ -#include <bsp/apbuart_termios.h> -#include <bsp/apbuart.h> +#include <grlib/apbuart_termios.h> +#include <grlib/apbuart.h> #include <bsp.h> static void apbuart_isr(void *arg) diff --git a/bsps/shared/grlib/uart/cons.c b/bsps/shared/grlib/uart/cons.c index 410d6e231f..5fa41e6914 100644 --- a/bsps/shared/grlib/uart/cons.c +++ b/bsps/shared/grlib/uart/cons.c @@ -15,7 +15,7 @@ #include <bsp.h> #include <stdlib.h> #include <string.h> -#include <bsp/cons.h> +#include <grlib/cons.h> #include <rtems/console.h> #ifdef RTEMS_DRVMGR_STARTUP -- 2.17.1 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel