* Adjust for RTEMS 4.11 driver configuration, backported from

          TASTE repository

src/drivers/po_hi_driver_rasta_common.c

@@ -5,7 +5,7 @@
  *
  * For more informations, please visit http://taste.tuxfamily.org/wiki
  *
- * Copyright (C) 2010-2014 ESA & ISAE.
+ * Copyright (C) 2010-2016 ESA & ISAE.
  */
 
 #include <deployment.h>
@@ -50,11 +50,10 @@
 #define GAISLER_GPIO         0x01a
 #endif
 
-
-int apbuart_rasta_register(amba_confarea_type *bus);
-
 int __po_hi_c_driver_rasta_common_is_init = 0;
 
+#ifdef RTEMS48
+int apbuart_rasta_register(amba_confarea_type *bus);
 static amba_confarea_type abus;
 extern LEON3_IrqCtrl_Regs_Map *irq;
 extern LEON_Register_Map      *regs;
@@ -63,7 +62,20 @@ amba_confarea_type* __po_hi_driver_rasta_common_get_bus ()
 {
    return &abus;
 }
-
+#elif RTEMS411
+extern int apbuart_rasta_register(struct ambapp_bus *bus);
+static struct ambapp_bus  abus;
+/* Why do we have LEON3 specifics here ???
+extern LEON3_IrqCtrl_Regs_Map *irq;
+extern LEON_Register_Map      *regs;
+*/
+struct ambapp_bus * __po_hi_driver_rasta_common_get_bus ()
+{
+   return &abus;
+}
+#else
+#error "o<"
+#endif
 
 void *uart0_int_arg, *uart1_int_arg;
 void *spw0_int_arg, *spw1_int_arg, *spw2_int_arg;

src/drivers/po_hi_driver_rasta_serial.c

@@ -5,7 +5,7 @@
  *
  * For more informations, please visit http://taste.tuxfamily.org/wiki
  *
- * Copyright (C) 2010-2014 ESA & ISAE.
+ * Copyright (C) 2010-2016 ESA & ISAE.
  */
 
 /*! \file po_hi_driver_rasta_serial.c
@@ -107,8 +107,14 @@ void __po_hi_c_driver_serial_rasta_poller (const __po_hi_device_id dev_id)
    }
    __po_hi_main_deliver (&__po_hi_c_driver_serial_rasta_request);
 }
-
+#ifdef RTEMS48
 extern amba_confarea_type* __po_hi_driver_rasta_common_get_bus ();
+#elif RTEMS411
+extern struct ambapp_bus * __po_hi_driver_rasta_common_get_bus ();
+#else
+#error "o<"
+#endif
+
 void __po_hi_rasta_interrrupt_register(void *handler, int irqno, void *arg);
 
 /*!

src/drivers/po_hi_driver_rasta_spacewire.c

@@ -5,7 +5,7 @@
  *
  * For more informations, please visit http://taste.tuxfamily.org/wiki
  *
- * Copyright (C) 2010-2014 ESA & ISAE.
+ * Copyright (C) 2010-2016 ESA & ISAE.
  */
 
 #include <deployment.h>
@@ -96,7 +96,14 @@ extern rtems_isr __po_hi_rasta_interrupt_handler (rtems_vector_number v);
 extern unsigned int __po_hi_driver_rasta_bar0, __po_hi_driver_rasta_bar1;
 
 void __po_hi_rasta_interrrupt_register(void *handler, int irqno, void *arg);
+
+#ifdef RTEMS48
 extern amba_confarea_type* __po_hi_driver_rasta_common_get_bus ();
+#elif RTEMS411
+extern struct ambapp_bus * __po_hi_driver_rasta_common_get_bus ();
+#else
+#error "o<"
+#endif
 
 void __po_hi_c_driver_spacewire_rasta_init (__po_hi_device_id id)
 {