bsp/gen5200: Use public include path

Update #3254.
2018-01-04 08:50:56 +01:00
parent 9c91520ad6
commit caeaae2673
31 changed files with 54 additions and 68 deletions
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_api.c
@@ -39,11 +39,11 @@
 * inline in capi/bestcomm_api.h.
 */

-#include "include/ppctypes.h"
-#include "bestcomm_api.h"
-#include "task_api/bestcomm_cntrl.h"
-#include "task_api/bestcomm_api_mem.h"
-#include "task_api/tasksetup_bdtable.h"
+#include <bsp/bestcomm/include/ppctypes.h>
+#include <bsp/bestcomm/bestcomm_api.h>
+#include <bsp/bestcomm/task_api/bestcomm_cntrl.h>
+#include <bsp/bestcomm/task_api/bestcomm_api_mem.h>
+#include <bsp/bestcomm/task_api/tasksetup_bdtable.h>

 /***********************************************************************
 */
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/bestcomm_glue.c
@@ -20,13 +20,13 @@
 #include <rtems.h>
 #include <bsp.h>
 #include <bsp/irq.h>
-#include "../include/mpc5200.h"
-#include "include/ppctypes.h"			/* uint32, et. al.		   */
-#include "dma_image.h"
-#include "task_api/bestcomm_cntrl.h"
-#include "bestcomm_api.h"
-#include "bestcomm_glue.h"
-#include "include/mgt5200/sdma.h"
+#include <bsp/mpc5200.h>
+#include <bsp/bestcomm/include/ppctypes.h> /* uint32, et. al.		   */
+#include <bsp/bestcomm/dma_image.h>
+#include <bsp/bestcomm/task_api/bestcomm_cntrl.h>
+#include <bsp/bestcomm/bestcomm_api.h>
+#include <bsp/bestcomm/bestcomm_glue.h>
+#include <bsp/bestcomm/include/mgt5200/sdma.h>
 #include <rtems/score/heapimpl.h>

 extern const uint32 taskTableBytes;
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.c
@@ -22,7 +22,7 @@
 *
 ******************************************************************************/

-#include "dma_image.h"
+#include <bsp/bestcomm/dma_image.h>

 TASK_PCI_TX_api_t  TASK_PCI_TX_storage;
 TASK_PCI_TX_api_t *TASK_PCI_TX_api=&TASK_PCI_TX_storage;
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.reloc.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/dma_image.reloc.c
@@ -23,7 +23,7 @@
 ******************************************************************************/


-#include "include/ppctypes.h"
+#include <bsp/bestcomm/include/ppctypes.h>

 uint32 taskTableBytes = 0x00001500;  /* Number of bytes in image */

--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/load_task.c
@@ -26,12 +26,12 @@
 #include <string.h>
 #endif

-#include "include/ppctypes.h"
-#include "include/mgt5200/sdma.h"
-#include "include/mgt5200/mgt5200.h"
+#include <bsp/bestcomm/include/ppctypes.h>
+#include <bsp/bestcomm/include/mgt5200/sdma.h>
+#include <bsp/bestcomm/include/mgt5200/mgt5200.h>

-#include "dma_image.h"
-#include "bestcomm_api.h"
+#include <bsp/bestcomm/dma_image.h>
+#include <bsp/bestcomm/bestcomm_api.h>

 #ifdef __MWERKS__
 __declspec(section ".text") extern const uint32 taskTable;
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_ata.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_ata.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_bdtable.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_bdtable.c
@@ -24,10 +24,10 @@

 #include <assert.h>

-#include "bestcomm_api.h"
-#include "bestcomm_glue.h"
-#include "task_api/tasksetup_bdtable.h"
-#include "include/mgt5200/mgt5200.h"
+#include <bsp/bestcomm/bestcomm_api.h>
+#include <bsp/bestcomm/bestcomm_glue.h>
+#include <bsp/bestcomm/task_api/tasksetup_bdtable.h>
+#include <bsp/bestcomm/include/mgt5200/mgt5200.h>

 #ifdef __MWERKS__
 __declspec(section ".text") extern const uint32 taskTable;
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_0.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_0.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_1.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_crc16_dp_1.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_rx_bd.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_rx_bd.c
@@ -34,5 +34,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_tx_bd.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_fec_tx_bd.c
@@ -35,4 +35,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_0.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_0.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_1.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_1.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_2.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_2.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_3.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_3.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_0.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_0.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_1.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_dp_bd_1.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_rx_bd.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_rx_bd.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_tx_bd.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_gen_tx_bd.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_lpc.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_lpc.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_rx.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_rx.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_tx.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/bestcomm/tasksetup_pci_tx.c
@@ -33,5 +33,4 @@
 #define INCR_DST          0
 #define TYPE_DST          FLEX_T

-#include "task_api/tasksetup_general.h"
-
+#include <bsp/bestcomm/task_api/tasksetup_general.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/console/console.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/console/console.c
@@ -99,7 +99,7 @@
 #include <string.h>

 #include <rtems.h>
-#include "../include/mpc5200.h"
+#include <bsp/mpc5200.h>
 #include <bsp.h>
 #include <bsp/irq.h>

--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.c
@@ -30,10 +30,10 @@
 *
 * http://www.rtems.org/license/LICENSE.
 */
-#include "mpc5200mbus.h"
-#include "../include/mpc5200.h"
+#include "../i2c/mpc5200mbus.h"
+#include <bsp/mpc5200.h>
 #include <bsp/irq.h>
-#include "../include/i2c.h"
+#include <i2c.h>

 /* Events of I2C machine */
 typedef enum i2c_event {
--- a/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/i2c/mpc5200mbus.h
@@ -34,8 +34,9 @@
 #ifndef __MPC5200BSP_MPC5200MBUS_H__
 #define __MPC5200BSP_MPC5200MBUS_H__

-#include "../include/mpc5200.h"
-#include "../include/i2c.h"
+#include <bsp/mpc5200.h>
+#include <i2c.h>
+

 /* States of I2C machine */
 typedef enum mpc5200mbus_i2c_state {
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/idecfg.c
@@ -19,7 +19,7 @@
 #include <rtems.h>
 #include <bsp.h>
 #include <bsp/irq.h>
-#include "../include/mpc5200.h"
+#include <bsp/mpc5200.h>
 #include "./pcmcia_ide.h"

 #include <libchip/ide_ctrl.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
@@ -81,7 +81,7 @@
 #include <rtems/score/sysstate.h>
 #include <bsp.h>
 #include <bsp/irq.h>
-#include "../include/mpc5200.h"
+#include <bsp/mpc5200.h>
 #include "./pcmcia_ide.h"

 #include <libchip/ide_ctrl.h>
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan.c
@@ -24,7 +24,7 @@
 #include <rtems/libio.h>
 #include <string.h>

-#include "../include/bsp.h"
+#include <bsp.h>
 #include <bsp/fatal.h>
 #include <bsp/irq.h>
 #include "../mscan/mscan_int.h"
--- a/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan_int.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/mscan/mscan_int.h
@@ -28,7 +28,7 @@ extern "C" {

 #include <bsp/mscan-base.h>

-#include "../mscan/mscan.h"
+#include <bsp/mscan.h>

 #define MSCAN_RX_BUFF_NUM        4
 #define MSCAN_TX_BUFF_NUM        3
--- a/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/nvram/nvram.c
@@ -83,8 +83,8 @@
 #include <string.h>
 #include <stdio.h>
 #include <bsp.h>
-#include "../include/mpc5200.h"
-#include "nvram.h"
+#include <bsp/mpc5200.h>
+#include <bsp/nvram.h>
 #include "m93cxx.h"

 /*
--- a/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/slicetimer/slicetimer.c
@@ -107,8 +107,8 @@
 #include <rtems/libio.h>

 #include <bsp/irq.h>
-#include "../include/mpc5200.h"
-#include "../slicetimer/slicetimer.h"
+#include <bsp/mpc5200.h>
+#include <bsp/slicetimer.h>
 #include <stdio.h>

 uint32_t value0 = 0;