From 86ac31e9edaecf7f140d16959aadf4acb9904137 Mon Sep 17 00:00:00 2001 From: yoogx Date: Tue, 12 Jun 2018 09:02:36 +0200 Subject: [PATCH] * Adjusts for AIR For openaadl/ocarina#160 --- include/po_hi_common.h | 6 +++--- include/po_hi_transport.h | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/po_hi_common.h b/include/po_hi_common.h index 9bf5218..bed8586 100644 --- a/include/po_hi_common.h +++ b/include/po_hi_common.h @@ -60,7 +60,7 @@ #define CONFIGURE_EXTRA_TASK_STACKS (40 * RTEMS_MINIMUM_STACK_SIZE) #define CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE (40 * RTEMS_MINIMUM_STACK_SIZE) - #define CONFIGURE_MICROSECONDS_PER_TICK RTEMS_MILLISECONDS_TO_MICROSECONDS(2) + #define CONFIGURE_MICROSECONDS_PER_TICK 5000 /*****************************************************************************/ /* Driver Manager configuration for RTEMS 5 */ @@ -105,10 +105,10 @@ #endif /* defined(RTEMS_DRVMGR_STARTUP) && defined(LEON3) */ -void *POSIX_Init (void); - #endif /*GRLEON3 && RTEMS412*/ +void *POSIX_Init (void); + #include #if defined(RTEMS_DRVMGR_STARTUP) && defined(LEON3) diff --git a/include/po_hi_transport.h b/include/po_hi_transport.h index 7631bcf..0ea0a5d 100644 --- a/include/po_hi_transport.h +++ b/include/po_hi_transport.h @@ -5,7 +5,7 @@ * * For more informations, please visit http://taste.tuxfamily.org/wiki * - * Copyright (C) 2007-2009 Telecom ParisTech, 2010-2017 ESA & ISAE. + * Copyright (C) 2007-2009 Telecom ParisTech, 2010-2018 ESA & ISAE. */ #ifndef __PO_HI_TRANSPORT__ @@ -294,13 +294,19 @@ int __po_hi_transport_call_sending_func_by_port (__po_hi_task_id, __po_hi_port_t __po_hi_transport_sending_func __po_hi_transport_get_sending_func (const __po_hi_device_id device); +/* + * These functions map PolyORB-HI/C ports to Xtratum (resp. AIR) ones + */ #ifdef XM3_RTEMS_MODE void __po_hi_transport_xtratum_port_init (const __po_hi_port_t portno, int val); int __po_hi_transport_xtratum_get_port (const __po_hi_port_t portno); #endif - +#ifdef AIR_HYPERVISOR +void __po_hi_transport_air_port_init (const __po_hi_port_t portno, long int val); +long int __po_hi_transport_air_get_port (const __po_hi_port_t portno); +#endif #endif /* __PO_HI_NB_PORTS > 0 */ -- GitLab