diff options
Diffstat (limited to 'c/src/lib/libbsp/sparc/shared')
50 files changed, 71 insertions, 71 deletions
diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c index da8e2afdb6..d998748e94 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c +++ b/c/src/lib/libbsp/sparc/shared/1553/b1553brm.c @@ -27,7 +27,7 @@ #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <b1553brm.h> +#include <bsp/b1553brm.h> #include <ambapp.h> #include <drvmgr/ambapp_bus.h> diff --git a/c/src/lib/libbsp/sparc/shared/1553/b1553rt.c b/c/src/lib/libbsp/sparc/shared/1553/b1553rt.c index 57bc4d3b50..b5561089c3 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/b1553rt.c +++ b/c/src/lib/libbsp/sparc/shared/1553/b1553rt.c @@ -19,7 +19,7 @@ #include <rtems/bspIo.h> #include <drvmgr/drvmgr.h> -#include <b1553rt.h> +#include <bsp/b1553rt.h> #include <ambapp.h> #include <drvmgr/ambapp_bus.h> diff --git a/c/src/lib/libbsp/sparc/shared/1553/gr1553b.c b/c/src/lib/libbsp/sparc/shared/1553/gr1553b.c index c715e4fa40..c92cbdc051 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/gr1553b.c +++ b/c/src/lib/libbsp/sparc/shared/1553/gr1553b.c @@ -11,7 +11,7 @@ #include <stdlib.h> #include <drvmgr/ambapp_bus.h> -#include <gr1553b.h> +#include <bsp/gr1553b.h> /* Driver Manager interface for BC, RT, BM, BRM, BC-BM and RT-BM */ diff --git a/c/src/lib/libbsp/sparc/shared/1553/gr1553bc.c b/c/src/lib/libbsp/sparc/shared/1553/gr1553bc.c index 636d39cca9..e61c36d858 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/gr1553bc.c +++ b/c/src/lib/libbsp/sparc/shared/1553/gr1553bc.c @@ -13,8 +13,8 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <gr1553b.h> -#include <gr1553bc.h> +#include <bsp/gr1553b.h> +#include <bsp/gr1553bc.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/c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c b/c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c index 746899fa8f..2cc7d3afc7 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c +++ b/c/src/lib/libbsp/sparc/shared/1553/gr1553bm.c @@ -13,8 +13,8 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <gr1553b.h> -#include <gr1553bm.h> +#include <bsp/gr1553b.h> +#include <bsp/gr1553bm.h> #define GR1553BM_WRITE_MEM(adr, val) *(volatile uint32_t *)(adr) = (uint32_t)(val) diff --git a/c/src/lib/libbsp/sparc/shared/1553/gr1553rt.c b/c/src/lib/libbsp/sparc/shared/1553/gr1553rt.c index f1d5fdd395..e1acd046f5 100644 --- a/c/src/lib/libbsp/sparc/shared/1553/gr1553rt.c +++ b/c/src/lib/libbsp/sparc/shared/1553/gr1553rt.c @@ -13,8 +13,8 @@ #include <stdio.h> #include <string.h> -#include <gr1553b.h> -#include <gr1553rt.h> +#include <bsp/gr1553b.h> +#include <bsp/gr1553rt.h> #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> diff --git a/c/src/lib/libbsp/sparc/shared/amba/ahbstat.c b/c/src/lib/libbsp/sparc/shared/amba/ahbstat.c index 8825a29439..5e7ecd7047 100644 --- a/c/src/lib/libbsp/sparc/shared/amba/ahbstat.c +++ b/c/src/lib/libbsp/sparc/shared/amba/ahbstat.c @@ -12,7 +12,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <ahbstat.h> +#include <bsp/ahbstat.h> void ahbstat_isr(void *arg); diff --git a/c/src/lib/libbsp/sparc/shared/analog/gradcdac.c b/c/src/lib/libbsp/sparc/shared/analog/gradcdac.c index c04c856b09..96e86b16f9 100644 --- a/c/src/lib/libbsp/sparc/shared/analog/gradcdac.c +++ b/c/src/lib/libbsp/sparc/shared/analog/gradcdac.c @@ -13,7 +13,7 @@ #include <stdio.h> #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <gradcdac.h> +#include <bsp/gradcdac.h> /****************** DEBUG Definitions ********************/ #define DBG_IOCTRL 1 @@ -26,7 +26,7 @@ #define DEBUG #define DEBUGFUNCS */ -#include <debug_defs.h> +#include <bsp/debug_defs.h> struct gradcdac_priv { struct gradcdac_regs *regs; /* Must be first */ diff --git a/c/src/lib/libbsp/sparc/shared/ascs/grascs.c b/c/src/lib/libbsp/sparc/shared/ascs/grascs.c index a2019703d1..b9319caffd 100644 --- a/c/src/lib/libbsp/sparc/shared/ascs/grascs.c +++ b/c/src/lib/libbsp/sparc/shared/ascs/grascs.c @@ -11,7 +11,7 @@ #include <stdlib.h> #include <bsp.h> #include <ambapp.h> -#include <grascs.h> +#include <bsp/grascs.h> #ifndef GAISLER_ASCS #define GAISLER_ASCS 0x043 diff --git a/c/src/lib/libbsp/sparc/shared/can/canmux.c b/c/src/lib/libbsp/sparc/shared/can/canmux.c index 0884d911f5..fecdfd867e 100644 --- a/c/src/lib/libbsp/sparc/shared/can/canmux.c +++ b/c/src/lib/libbsp/sparc/shared/can/canmux.c @@ -16,7 +16,7 @@ #include <bsp.h> #include <rtems/bspIo.h> /* printk */ -#include <canmux.h> +#include <bsp/canmux.h> #include <ambapp.h> #ifndef GAISLER_CANMUX diff --git a/c/src/lib/libbsp/sparc/shared/can/grcan.c b/c/src/lib/libbsp/sparc/shared/can/grcan.c index 7ad53e1fb6..1d7d1ba872 100644 --- a/c/src/lib/libbsp/sparc/shared/can/grcan.c +++ b/c/src/lib/libbsp/sparc/shared/can/grcan.c @@ -18,7 +18,7 @@ #include <ctype.h> #include <rtems/bspIo.h> -#include <grcan.h> +#include <bsp/grcan.h> #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> #include <ambapp.h> @@ -85,7 +85,7 @@ #define DEBUG #define DEBUGFUNCS */ -#include <debug_defs.h> +#include <bsp/debug_defs.h> /*********************************************************/ diff --git a/c/src/lib/libbsp/sparc/shared/can/occan.c b/c/src/lib/libbsp/sparc/shared/can/occan.c index b9050cdb8e..2f113c44bd 100644 --- a/c/src/lib/libbsp/sparc/shared/can/occan.c +++ b/c/src/lib/libbsp/sparc/shared/can/occan.c @@ -17,7 +17,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <occan.h> +#include <bsp/occan.h> /* RTEMS -> ERRNO decoding table diff --git a/c/src/lib/libbsp/sparc/shared/can/satcan.c b/c/src/lib/libbsp/sparc/shared/can/satcan.c index 36c6bb9f5d..d21d00e0f0 100644 --- a/c/src/lib/libbsp/sparc/shared/can/satcan.c +++ b/c/src/lib/libbsp/sparc/shared/can/satcan.c @@ -16,7 +16,7 @@ #include <bsp.h> #include <rtems/bspIo.h> /* printk */ -#include <satcan.h> +#include <bsp/satcan.h> #include <ambapp.h> #ifndef GAISLER_SATCAN diff --git a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_grlib.c b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_grlib.c index 69b2816e5b..ebca4252ce 100644 --- a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_grlib.c +++ b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_grlib.c @@ -19,7 +19,7 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/ambapp_bus_grlib.h> -#include <genirq.h> +#include <bsp/genirq.h> #include <bsp.h> diff --git a/c/src/lib/libbsp/sparc/shared/gpio/gpiolib.c b/c/src/lib/libbsp/sparc/shared/gpio/gpiolib.c index 6fb1cfc70c..08f8eaa4fa 100644 --- a/c/src/lib/libbsp/sparc/shared/gpio/gpiolib.c +++ b/c/src/lib/libbsp/sparc/shared/gpio/gpiolib.c @@ -12,7 +12,7 @@ #include <stdio.h> #include <string.h> -#include <gpiolib.h> +#include <bsp/gpiolib.h> struct gpiolib_port; diff --git a/c/src/lib/libbsp/sparc/shared/gpio/grgpio.c b/c/src/lib/libbsp/sparc/shared/gpio/grgpio.c index e9a5426d88..f3fb88699f 100644 --- a/c/src/lib/libbsp/sparc/shared/gpio/grgpio.c +++ b/c/src/lib/libbsp/sparc/shared/gpio/grgpio.c @@ -18,8 +18,8 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <grgpio.h> -#include <gpiolib.h> +#include <bsp/grgpio.h> +#include <bsp/gpiolib.h> #include <ambapp.h> #include <grlib.h> diff --git a/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c b/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c index b95e39f4fd..347b3fa5bd 100644 --- a/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c +++ b/c/src/lib/libbsp/sparc/shared/i2c/i2cmst.c @@ -19,7 +19,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <i2cmst.h> +#include <bsp/i2cmst.h> /* Enable debug printks? */ /*#define DEBUG*/ diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h b/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h index cb71b92394..d0ebd7bf3e 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h +++ b/c/src/lib/libbsp/sparc/shared/include/gr1553bc.h @@ -40,7 +40,7 @@ struct gr1553bc_major_cfg; #endif #include <stdint.h> -#include <gr1553bc_list.h> +#include <bsp/gr1553bc_list.h> #ifdef __cplusplus extern "C" { diff --git a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h b/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h index 24f52815af..b717da2097 100644 --- a/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h +++ b/c/src/lib/libbsp/sparc/shared/include/gr1553bc_list.h @@ -193,7 +193,7 @@ */ #include <stdint.h> -#include <gr1553bc.h> +#include <bsp/gr1553bc.h> /**** CONFIGURATION OPTIONS ****/ diff --git a/c/src/lib/libbsp/sparc/shared/irq/genirq.c b/c/src/lib/libbsp/sparc/shared/irq/genirq.c index 57654b38bf..fa419b1394 100644 --- a/c/src/lib/libbsp/sparc/shared/irq/genirq.c +++ b/c/src/lib/libbsp/sparc/shared/irq/genirq.c @@ -12,7 +12,7 @@ #include <rtems.h> #include <stdlib.h> #include <string.h> -#include <genirq.h> +#include <bsp/genirq.h> struct genirq_handler_entry { struct genirq_handler_entry *next; /* Next ISR entry for this IRQ number */ diff --git a/c/src/lib/libbsp/sparc/shared/mem/mctrl.c b/c/src/lib/libbsp/sparc/shared/mem/mctrl.c index a9407356ba..31ec32e66d 100644 --- a/c/src/lib/libbsp/sparc/shared/mem/mctrl.c +++ b/c/src/lib/libbsp/sparc/shared/mem/mctrl.c @@ -20,7 +20,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <mctrl.h> +#include <bsp/mctrl.h> #define MEMSET(priv, start, c, length) memset((void *)start, c, length) diff --git a/c/src/lib/libbsp/sparc/shared/net/greth.c b/c/src/lib/libbsp/sparc/shared/net/greth.c index d5d477fc6e..a6b38ef82a 100644 --- a/c/src/lib/libbsp/sparc/shared/net/greth.c +++ b/c/src/lib/libbsp/sparc/shared/net/greth.c @@ -27,7 +27,7 @@ #include <rtems/error.h> #include <rtems/rtems_bsdnet.h> -#include <greth.h> +#include <bsp/greth.h> #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> #include <ambapp.h> diff --git a/c/src/lib/libbsp/sparc/shared/net/network_interface_add.c b/c/src/lib/libbsp/sparc/shared/net/network_interface_add.c index 6e3a58a75c..dd6e12f8db 100644 --- a/c/src/lib/libbsp/sparc/shared/net/network_interface_add.c +++ b/c/src/lib/libbsp/sparc/shared/net/network_interface_add.c @@ -17,7 +17,7 @@ #include <rtems/rtems_bsdnet.h> #include <stdio.h> -#include <network_interface_add.h> +#include <bsp/network_interface_add.h> extern struct rtems_bsdnet_config rtems_bsdnet_config; diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_701.c b/c/src/lib/libbsp/sparc/shared/pci/gr_701.c index b52b14a214..815b850c6d 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_701.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_701.c @@ -33,9 +33,9 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/pci_bus.h> #include <drvmgr/bspcommon.h> -#include <genirq.h> +#include <bsp/genirq.h> -#include <gr_701.h> +#include <bsp/gr_701.h> /* Offset from 0x80000000 (dual bus version) */ #define AHB1_BASE_ADDR 0x80000000 diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c index d997162ecd..2423248ade 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_leon4_n2x.c @@ -40,9 +40,9 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/pci_bus.h> #include <drvmgr/bspcommon.h> -#include <genirq.h> +#include <bsp/genirq.h> -#include <gr_leon4_n2x.h> +#include <bsp/gr_leon4_n2x.h> /* Determines which PCI address the AHB masters on the LEON-N2X board will * access when accessing the AHB to PCI window, it should be set so that the diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c index 145c9f267e..96225c8b64 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_adcdac.c @@ -31,9 +31,9 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/pci_bus.h> #include <drvmgr/bspcommon.h> -#include <genirq.h> +#include <bsp/genirq.h> -#include <gr_rasta_adcdac.h> +#include <bsp/gr_rasta_adcdac.h> /*#define DEBUG 1*/ diff --git a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c index 06af6d0f9e..417056f692 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_io.c @@ -31,9 +31,9 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/pci_bus.h> #include <drvmgr/bspcommon.h> -#include <genirq.h> +#include <bsp/genirq.h> -#include <gr_rasta_io.h> +#include <bsp/gr_rasta_io.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/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c index 92e6b4af83..986adcc75e 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_spw_router.c @@ -29,8 +29,8 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/pci_bus.h> #include <drvmgr/bspcommon.h> -#include <genirq.h> -#include <gr_rasta_spw_router.h> +#include <bsp/genirq.h> +#include <bsp/gr_rasta_spw_router.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/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c index 7714a00aba..809919ee3c 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_rasta_tmtc.c @@ -31,9 +31,9 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/pci_bus.h> #include <drvmgr/bspcommon.h> -#include <genirq.h> +#include <bsp/genirq.h> -#include <gr_rasta_tmtc.h> +#include <bsp/gr_rasta_tmtc.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/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c b/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c index c2bd8ebde9..28d93b493d 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c +++ b/c/src/lib/libbsp/sparc/shared/pci/gr_tmtc_1553.c @@ -32,9 +32,9 @@ #include <drvmgr/ambapp_bus.h> #include <drvmgr/pci_bus.h> #include <drvmgr/bspcommon.h> -#include <genirq.h> +#include <bsp/genirq.h> -#include <gr_tmtc_1553.h> +#include <bsp/gr_tmtc_1553.h> /*#define DEBUG 1 */ diff --git a/c/src/lib/libbsp/sparc/shared/pci/grpci.c b/c/src/lib/libbsp/sparc/shared/pci/grpci.c index af3d0359ab..b417956d90 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/grpci.c +++ b/c/src/lib/libbsp/sparc/shared/pci/grpci.c @@ -29,7 +29,7 @@ #include <drvmgr/ambapp_bus.h> #include <ambapp.h> #include <drvmgr/pci_bus.h> -#include <grpci.h> +#include <bsp/grpci.h> #define DMAPCI_ADDR 0x80000500 diff --git a/c/src/lib/libbsp/sparc/shared/pci/grpci2.c b/c/src/lib/libbsp/sparc/shared/pci/grpci2.c index 53c4181d68..07bc8038b3 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/grpci2.c +++ b/c/src/lib/libbsp/sparc/shared/pci/grpci2.c @@ -40,7 +40,7 @@ #include <drvmgr/ambapp_bus.h> #include <ambapp.h> #include <drvmgr/pci_bus.h> -#include <grpci2.h> +#include <bsp/grpci2.h> #ifndef IRQ_GLOBAL_PREPARE #define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level diff --git a/c/src/lib/libbsp/sparc/shared/pci/pcif.c b/c/src/lib/libbsp/sparc/shared/pci/pcif.c index 8ace3dfc5f..32de562283 100644 --- a/c/src/lib/libbsp/sparc/shared/pci/pcif.c +++ b/c/src/lib/libbsp/sparc/shared/pci/pcif.c @@ -29,7 +29,7 @@ #include <drvmgr/ambapp_bus.h> #include <ambapp.h> #include <drvmgr/pci_bus.h> -#include <pcif.h> +#include <bsp/pcif.h> /* Configuration options */ diff --git a/c/src/lib/libbsp/sparc/shared/pwm/grpwm.c b/c/src/lib/libbsp/sparc/shared/pwm/grpwm.c index b4506c67e7..8a5db9a796 100644 --- a/c/src/lib/libbsp/sparc/shared/pwm/grpwm.c +++ b/c/src/lib/libbsp/sparc/shared/pwm/grpwm.c @@ -19,7 +19,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <grpwm.h> +#include <bsp/grpwm.h> #include <ambapp.h> /* #define DEBUG 1 */ diff --git a/c/src/lib/libbsp/sparc/shared/slink/grslink.c b/c/src/lib/libbsp/sparc/shared/slink/grslink.c index 0c3d086a64..474c9c354e 100644 --- a/c/src/lib/libbsp/sparc/shared/slink/grslink.c +++ b/c/src/lib/libbsp/sparc/shared/slink/grslink.c @@ -23,7 +23,7 @@ #include <stdlib.h> #include <bsp.h> -#include <grslink.h> +#include <bsp/grslink.h> #include <ambapp.h> #ifndef GAISLER_SLINK @@ -553,7 +553,7 @@ void SLINK_seqabort(void) * Function: SLINK_seqstatus * Returns: The current or status of the SEQUENCE operation: * SLINK_COMPLETED, SLINK_ACTIVE, SLINK_PARERR, SLINK_AMBAERR, - * SLINK_ABORTED (these are defined in grslink.h) + * SLINK_ABORTED (these are defined in bsp/grslink.h) * Description: Meaning of returned values: * SLINK_ABORTED: Aborted before all operations completed. * SLINK_ACTIVE: The core is busy processing the SEQUENCE @@ -588,7 +588,7 @@ int SLINK_seqwrds(void) /* * Function: SLINK_hwstatus * Returns: The SLINK core's status register. The register values can be - * interpreted with the help of macros defined in grslink.h. + * interpreted with the help of macros defined in bsp/grslink.h. */ int SLINK_hwstatus(void) { diff --git a/c/src/lib/libbsp/sparc/shared/spi/spictrl.c b/c/src/lib/libbsp/sparc/shared/spi/spictrl.c index dab478d4f1..b34b037394 100644 --- a/c/src/lib/libbsp/sparc/shared/spi/spictrl.c +++ b/c/src/lib/libbsp/sparc/shared/spi/spictrl.c @@ -19,7 +19,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <spictrl.h> +#include <bsp/spictrl.h> #include <ambapp.h> #include <rtems/libi2c.h> diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw.c b/c/src/lib/libbsp/sparc/shared/spw/grspw.c index d50e7574b6..a145b1c3ab 100644 --- a/c/src/lib/libbsp/sparc/shared/spw/grspw.c +++ b/c/src/lib/libbsp/sparc/shared/spw/grspw.c @@ -22,7 +22,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <grspw.h> +#include <bsp/grspw.h> #define DBGSPW_IOCALLS 1 #define DBGSPW_TX 2 diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw_pkt.c b/c/src/lib/libbsp/sparc/shared/spw/grspw_pkt.c index 41ca009bc7..7c9d898e4b 100644 --- a/c/src/lib/libbsp/sparc/shared/spw/grspw_pkt.c +++ b/c/src/lib/libbsp/sparc/shared/spw/grspw_pkt.c @@ -26,7 +26,7 @@ #include <drvmgr/drvmgr.h> #include <ambapp.h> #include <drvmgr/ambapp_bus.h> -#include <grspw_pkt.h> +#include <bsp/grspw_pkt.h> /* This driver has been prepared for SMP operation however never tested * on a SMP system - use on your own risk. diff --git a/c/src/lib/libbsp/sparc/shared/spw/grspw_router.c b/c/src/lib/libbsp/sparc/shared/spw/grspw_router.c index b0d0c610ce..a2e0b44297 100644 --- a/c/src/lib/libbsp/sparc/shared/spw/grspw_router.c +++ b/c/src/lib/libbsp/sparc/shared/spw/grspw_router.c @@ -14,7 +14,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <grspw_router.h> +#include <bsp/grspw_router.h> #define ROUTER_DBG(args...) diff --git a/c/src/lib/libbsp/sparc/shared/time/grctm.c b/c/src/lib/libbsp/sparc/shared/time/grctm.c index c756a430ae..e83aeedac2 100644 --- a/c/src/lib/libbsp/sparc/shared/time/grctm.c +++ b/c/src/lib/libbsp/sparc/shared/time/grctm.c @@ -12,7 +12,7 @@ #include <drvmgr/ambapp_bus.h> #include <stdlib.h> -#include <grctm.h> +#include <bsp/grctm.h> /* Private structure of GRCTM driver */ struct grctm_priv { diff --git a/c/src/lib/libbsp/sparc/shared/time/spwcuc.c b/c/src/lib/libbsp/sparc/shared/time/spwcuc.c index f5d0f11237..a1912017fe 100644 --- a/c/src/lib/libbsp/sparc/shared/time/spwcuc.c +++ b/c/src/lib/libbsp/sparc/shared/time/spwcuc.c @@ -13,7 +13,7 @@ #include <drvmgr/ambapp_bus.h> #include <stdlib.h> -#include <spwcuc.h> +#include <bsp/spwcuc.h> /* Private structure of SPWCUC driver. */ struct spwcuc_priv { diff --git a/c/src/lib/libbsp/sparc/shared/timer/gptimer.c b/c/src/lib/libbsp/sparc/shared/timer/gptimer.c index f8dec2be1c..de35cd75f4 100644 --- a/c/src/lib/libbsp/sparc/shared/timer/gptimer.c +++ b/c/src/lib/libbsp/sparc/shared/timer/gptimer.c @@ -37,8 +37,8 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> #include <grlib.h> -#include <gptimer.h> -#include "tlib.h" +#include <bsp/gptimer.h> +#include <bsp/tlib.h> #if defined(LEON3) && defined(RTEMS_DRVMGR_STARTUP) #include <leon.h> diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib.c b/c/src/lib/libbsp/sparc/shared/timer/tlib.c index d1f68eded2..ea62c4d13d 100644 --- a/c/src/lib/libbsp/sparc/shared/timer/tlib.c +++ b/c/src/lib/libbsp/sparc/shared/timer/tlib.c @@ -10,7 +10,7 @@ */ #include <rtems.h> -#include <tlib.h> +#include <bsp/tlib.h> struct tlib_dev *tlib_dev_head = NULL; struct tlib_dev *tlib_dev_tail = NULL; diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c index a5afbbeafa..a656ee52af 100644 --- a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c +++ b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c @@ -14,7 +14,7 @@ #include <rtems.h> #include <stdlib.h> #include <bsp.h> -#include <tlib.h> +#include <bsp/tlib.h> #ifdef RTEMS_DRVMGR_STARTUP diff --git a/c/src/lib/libbsp/sparc/shared/tmtc/grtc.c b/c/src/lib/libbsp/sparc/shared/tmtc/grtc.c index 600c40ac7d..d1e4ab7e79 100644 --- a/c/src/lib/libbsp/sparc/shared/tmtc/grtc.c +++ b/c/src/lib/libbsp/sparc/shared/tmtc/grtc.c @@ -21,7 +21,7 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> #include <ambapp.h> -#include <grtc.h> +#include <bsp/grtc.h> #ifndef IRQ_GLOBAL_PREPARE #define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level @@ -40,7 +40,7 @@ #define DEBUGFUNCS */ -#include <debug_defs.h> +#include <bsp/debug_defs.h> #ifdef DEBUG_ERROR #define DEBUG_ERR_LOG(device,error) grtc_log_error(device,error) diff --git a/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c b/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c index 1d9fb005f3..2302c56ca0 100644 --- a/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c +++ b/c/src/lib/libbsp/sparc/shared/tmtc/grtm.c @@ -21,7 +21,7 @@ #include <drvmgr/drvmgr.h> #include <ambapp.h> #include <drvmgr/ambapp_bus.h> -#include <grtm.h> +#include <bsp/grtm.h> #ifndef IRQ_GLOBAL_PREPARE #define IRQ_GLOBAL_PREPARE(level) rtems_interrupt_level level @@ -40,7 +40,7 @@ #define DEBUGFUNCS */ -#include <debug_defs.h> +#include <bsp/debug_defs.h> /* GRTM register map */ struct grtm_regs { diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c index 75fe094244..202def36bd 100644 --- a/c/src/lib/libbsp/sparc/shared/uart/apbuart.c +++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart.c @@ -23,7 +23,7 @@ #include <ambapp.h> #include <grlib.h> -#include <apbuart.h> +#include <bsp/apbuart.h> #ifndef DEFAULT_TXBUF_SIZE #define DEFAULT_TXBUF_SIZE 32 diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c index 8bee2e9f21..b79a2cf73b 100644 --- a/c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c +++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart_cons.c @@ -27,12 +27,12 @@ #include <drvmgr/drvmgr.h> #include <drvmgr/ambapp_bus.h> -#include <apbuart.h> +#include <bsp/apbuart.h> #include <ambapp.h> #include <grlib.h> -#include <cons.h> +#include <bsp/cons.h> #include <rtems/termiostypes.h> -#include <apbuart_cons.h> +#include <bsp/apbuart_cons.h> /*#define DEBUG 1 */ diff --git a/c/src/lib/libbsp/sparc/shared/uart/apbuart_termios.c b/c/src/lib/libbsp/sparc/shared/uart/apbuart_termios.c index 3000dbcb93..21f2e834cb 100644 --- a/c/src/lib/libbsp/sparc/shared/uart/apbuart_termios.c +++ b/c/src/lib/libbsp/sparc/shared/uart/apbuart_termios.c @@ -11,8 +11,8 @@ * http://www.rtems.org/license/LICENSE. */ -#include <apbuart_termios.h> -#include <apbuart.h> +#include <bsp/apbuart_termios.h> +#include <bsp/apbuart.h> #include <bsp.h> static void apbuart_isr(void *arg) diff --git a/c/src/lib/libbsp/sparc/shared/uart/cons.c b/c/src/lib/libbsp/sparc/shared/uart/cons.c index f0af1f9c52..a31b6ef9f4 100644 --- a/c/src/lib/libbsp/sparc/shared/uart/cons.c +++ b/c/src/lib/libbsp/sparc/shared/uart/cons.c @@ -16,7 +16,7 @@ #include <stdlib.h> #include <rtems/libio.h> #include <rtems/bspIo.h> -#include <cons.h> +#include <bsp/cons.h> #ifdef RTEMS_DRVMGR_STARTUP |