Commit bd777120 authored by Thanassis Tsiodras's avatar Thanassis Tsiodras
Browse files

Merge branch 'feature_buster' into CoRA-ZynQ-v10

parents cd543519 374a160f
...@@ -201,12 +201,6 @@ AC_OUTPUT([ ...@@ -201,12 +201,6 @@ AC_OUTPUT([
include/monitoring/Makefile include/monitoring/Makefile
include/simulator/Makefile include/simulator/Makefile
examples/Makefile examples/Makefile
examples/aadlv1/Makefile
examples/aadlv1/d3.1.3-1/Makefile
examples/aadlv1/ping/Makefile
examples/aadlv1/flight-mgmt/Makefile
examples/aadlv1/rma/Makefile
examples/aadlv1/sunseeker/Makefile
examples/aadlv2/Makefile examples/aadlv2/Makefile
examples/aadlv2/code_coverage/Makefile examples/aadlv2/code_coverage/Makefile
examples/aadlv2/cpp/Makefile examples/aadlv2/cpp/Makefile
......
SUBDIRS = aadlv1 aadlv2 SUBDIRS = aadlv2
EXTRA_DIST = Makefile.common EXTRA_DIST = Makefile.common
SAMPLE_DIR = ${shell $(CYGPATH_U) '$(OCARINA_PREFIX)/examples/ocarina/polyorb-hi-c'} SAMPLE_DIR = ${shell $(CYGPATH_U) '$(OCARINA_PREFIX)/examples/ocarina/polyorb-hi-c'}
...@@ -16,5 +16,5 @@ build-all: ...@@ -16,5 +16,5 @@ build-all:
check-all: check-all:
for dir in $(SUBDIRS); do \ for dir in $(SUBDIRS); do \
($(MAKE) -C $${dir} check-all) || exit 1; \ ($(MAKE) -C $${dir} check-all) || exit 1; \
done done
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
#include <time.h> #include <time.h>
#include <po_hi_time.h> #include <po_hi_time.h>
void user_produce_spg (int* data);
void user_consume_spg (int data);
void user_produce_spg (int* data) void user_produce_spg (int* data)
{ {
static int produce_data = 42; static int produce_data = 42;
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2018 ESA & ISAE. * Copyright (C) 2018-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
/** /**
......
/*
* This is a part of PolyORB-HI-C distribution, a minimal
* middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite.
*
* For more informations, please visit http://www.openaadl.org
*
* Copyright (C) 2020 OpenAADL
*/
#ifndef GENERATED_ASN1SCC_1553_H #ifndef GENERATED_ASN1SCC_1553_H
#define GENERATED_ASN1SCC_1553_H #define GENERATED_ASN1SCC_1553_H
/* /*
......
/*
* This is a part of PolyORB-HI-C distribution, a minimal
* middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite.
*
* For more informations, please visit http://www.openaadl.org
*
* Copyright (C) 2020 OpenAADL
*/
#ifndef ASN1SCC_ASN1CRT_H_ #ifndef ASN1SCC_ASN1CRT_H_
#define ASN1SCC_ASN1CRT_H_ #define ASN1SCC_ASN1CRT_H_
......
/*
* This is a part of PolyORB-HI-C distribution, a minimal
* middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite.
*
* For more informations, please visit http://www.openaadl.org
*
* Copyright (C) 2020 OpenAADL
*/
#ifndef GENERATED_ASN1SCC_ip_H #ifndef GENERATED_ASN1SCC_ip_H
#define GENERATED_ASN1SCC_ip_H #define GENERATED_ASN1SCC_ip_H
/* /*
......
/*
* This is a part of PolyORB-HI-C distribution, a minimal
* middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite.
*
* For more informations, please visit http://www.openaadl.org
*
* Copyright (C) 2020 OpenAADL
*/
#ifndef GENERATED_ASN1SCC_serial_H #ifndef GENERATED_ASN1SCC_serial_H
#define GENERATED_ASN1SCC_serial_H #define GENERATED_ASN1SCC_serial_H
/* /*
......
/*
* This is a part of PolyORB-HI-C distribution, a minimal
* middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite.
*
* For more informations, please visit http://www.openaadl.org
*
* Copyright (C) 2020 OpenAADL
*/
#ifndef GENERATED_ASN1SCC_spacewire_H #ifndef GENERATED_ASN1SCC_spacewire_H
#define GENERATED_ASN1SCC_spacewire_H #define GENERATED_ASN1SCC_spacewire_H
/* /*
......
/*
* This is a part of PolyORB-HI-C distribution, a minimal
* middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite.
*
* For more informations, please visit http://www.openaadl.org
*
* Copyright (C) 2020 OpenAADL
*/
#ifndef __GRSPW_API_H__ #ifndef __GRSPW_API_H__
#define __GRSPW_API_H__ #define __GRSPW_API_H__
......
/*
* This is a part of PolyORB-HI-C distribution, a minimal
* middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite.
*
* For more informations, please visit http://www.openaadl.org
*
* Copyright (C) 2020 OpenAADL
*/
/* GRSPW Packet driver Library helper functions */ /* GRSPW Packet driver Library helper functions */
#ifndef __GRSPW_PKT_LIB_H__ #ifndef __GRSPW_PKT_LIB_H__
......
/*
* This is a part of PolyORB-HI-C distribution, a minimal
* middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite.
*
* For more informations, please visit http://www.openaadl.org
*
* Copyright (C) 2020 OpenAADL
*/
#ifndef __PO_HI_DRIVER_DRVMGR_COMMON__ #ifndef __PO_HI_DRIVER_DRVMGR_COMMON__
#define __PO_HI_DRIVER_DRVMGR_COMMON__ #define __PO_HI_DRIVER_DRVMGR_COMMON__
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2012-2014 ESA & ISAE. * Copyright (C) 2012-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2012-2014 ESA & ISAE. * Copyright (C) 2012-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2011-2014 ESA & ISAE. * Copyright (C) 2011-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2011-2014 ESA & ISAE. * Copyright (C) 2011-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#ifndef __PO_HI_DRIVER_PUS_EVENTS_H__ #ifndef __PO_HI_DRIVER_PUS_EVENTS_H__
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#ifndef __PO_HI_DRIVER_PUS_EVENTS_ACTION_H__ #ifndef __PO_HI_DRIVER_PUS_EVENTS_ACTION_H__
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#ifndef __PO_HI_DRIVER_PUS_PARAMETER_MONITORING_H__ #ifndef __PO_HI_DRIVER_PUS_PARAMETER_MONITORING_H__
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2012-2014 ESA & ISAE. * Copyright (C) 2012-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#ifndef __PO_HI_DRIVER_RASTA_1553_BRM_LIB_H__ #ifndef __PO_HI_DRIVER_RASTA_1553_BRM_LIB_H__
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2017 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2011-2018 ESA & ISAE. * Copyright (C) 2011-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2010-2014 ESA & ISAE. * Copyright (C) 2010-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2011-2014 ESA & ISAE. * Copyright (C) 2011-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2012-2014 ESA & ISAE. * Copyright (C) 2012-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#include <deployment.h> #include <deployment.h>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* *
* Copyright (C) 2012-2014 ESA & ISAE. * Copyright (C) 2012-2019 ESA & ISAE, 2019-2020 OpenAADL
*/ */
#ifndef __PO_HI_DRIVERS_RTEMS_UTILS_H__ #ifndef __PO_HI_DRIVERS_RTEMS_UTILS_H__
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
* middleware written for generated code from AADL models. * middleware written for generated code from AADL models.
* You should use it with the Ocarina toolsuite. * You should use it with the Ocarina toolsuite.
* *
* For more informations, please visit http://taste.tuxfamily.org/wiki * For more informations, please visit http://www.openaadl.org
* <