More adaptations to make POHIC work with the latest RTEMS.

include/po_hi_common.h

@@ -36,8 +36,8 @@
    // #include <amba.h>
    // #include <bsp/grspw.h>
 
-   // Things are always moving around in RTEMS.
-   // Adapt... the latest RTEMS (2019/07) has restructured Leon/AMBA
+   // Things are always moving around in RTEMS - adapt.
+   // The latest RTEMS (2019/07) has restructured Leon/AMBA
    // headers under grlib. Detect this by a combination of checks,
    // that depends on the fact that our custom cross build in TASTE
    // enabled Ada (which Gaisler's RCC doesn't).

src/drivers/config.c

@@ -20,7 +20,18 @@
 /*#define LEON2_GRLIB*/
 /* Configure Network if enabled */
 #ifdef ENABLE_NETWORK
+
+// Things are always moving around in RTEMS - adapt.
+// The latest RTEMS (2019/07) has restructured Leon/AMBA
+// headers under grlib. Detect this by a combination of checks,
+// that depends on the fact that our custom cross build in TASTE
+// enabled Ada (which Gaisler's RCC doesn't).
+#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
+#include <grlib/network_interface_add.h>
+#else
 #include <bsp/network_interface_add.h>
+#endif
+
 //#include "networkconfig.h"
 
 //  Gaisler uses this file, user provided. for the moment, config done

src/drivers/config_leon3_drvmgr.c

@@ -3,8 +3,8 @@
  * Any modification there should be carefully weighted.
  */
 
-// Things are always moving around in RTEMS.
-// Adapt... the latest RTEMS (2019/07) has restructured Leon/AMBA
+// Things are always moving around in RTEMS - adapt.
+// The latest RTEMS (2019/07) has restructured Leon/AMBA
 // headers under grlib. Detect this by a combination of checks,
 // that depends on the fact that our custom cross build in TASTE
 // enabled Ada (which Gaisler's RCC doesn't).

src/drivers/config_leon4_n2x.c

 #include <bsp/gr_leon4_n2x.h>
-#include <drvmgr/ambapp_bus.h>
+
+// Things are always moving around in RTEMS - adapt.
+// The latest RTEMS (2019/07) has restructured Leon/AMBA
+// headers under grlib. Detect this by a combination of checks,
+// that depends on the fact that our custom cross build in TASTE
+// enabled Ada (which Gaisler's RCC doesn't).
+#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
+   #include <grlib/ambapp_bus.h>
+#else
+   #include <drvmgr/ambapp_bus.h>
+#endif
 
 /* GR-CPCI-LEON4-N2X boards configuration example. Note that this is
  * optional, we only override defaults. If default are ok, nothing

src/drivers/po_hi_driver_leon_eth.c

@@ -124,7 +124,17 @@ static struct rtems_bsdnet_ifconfig netdriver_config = {
    0           /* Use default driver parameters */
 };
 #elif defined RTEMS412
+
+// Things are always moving around in RTEMS - adapt.
+// The latest RTEMS (2019/07) has restructured Leon/AMBA
+// headers under grlib. Detect this by a combination of checks,
+// that depends on the fact that our custom cross build in TASTE
+// enabled Ada (which Gaisler's RCC doesn't).
+#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
+#include <grlib/network_interface_add.h>
+#else
 #include <bsp/network_interface_add.h>
+#endif
 
 struct ethernet_config interface_configs[]=
 {

src/drivers/po_hi_driver_rasta_common.c

@@ -35,7 +35,18 @@
 #include <ambapp.h>
 #include <drvmgr/drvmgr.h>
 #include <drvmgr/ambapp_bus_grlib.h>
-#include <drvmgr/ambapp_bus.h>
+
+// Things are always moving around in RTEMS - adapt.
+// The latest RTEMS (2019/07) has restructured Leon/AMBA
+// headers under grlib. Detect this by a combination of checks,
+// that depends on the fact that our custom cross build in TASTE
+// enabled Ada (which Gaisler's RCC doesn't).
+#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
+   #include <grlib/ambapp_bus.h>
+#else
+   #include <drvmgr/ambapp_bus.h>
+#endif
+
 /* GRSPW0 resources  */
 struct drvmgr_key grlib_grspw0_res[] =
 

src/drivers/po_hi_driver_rtems_drvmgr_ethernet.c

@@ -79,7 +79,16 @@ __po_hi_device_id leon_eth_device_id;
 #include <bsp.h>
 #include <rtems/rtems_bsdnet.h>
 
+// Things are always moving around in RTEMS - adapt.
+// The latest RTEMS (2019/07) has restructured Leon/AMBA
+// headers under grlib. Detect this by a combination of checks,
+// that depends on the fact that our custom cross build in TASTE
+// enabled Ada (which Gaisler's RCC doesn't).
+#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
+#include <grlib/network_interface_add.h>
+#else
 #include <bsp/network_interface_add.h>
+#endif
 
 #ifdef RTEMS_USE_LOOPBACK
 /*