From fd550e49c28d8003cd5ce143f34334c3d0a57e7b Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Sun, 31 Aug 2014 15:25:58 +0000 Subject: [PATCH] changed and renamed opal AsyncIP files to our naming scheme git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@178 8ec27952-4edc-4aab-86aa-e87bb2611832 --- .../include/{Config.h => config.h} | 4 ++-- .../include/{Interface.h => interface.h} | 0 .../include/{MsgFormat.h => msg_format.h} | 10 ++-------- .../send_receive/include/{Sched.h => sched.h} | 0 .../include/{Socket.h => socket.h} | 0 .../send_receive/{AsyncIP.mk => s2ss.mk} | 0 .../opal/models/send_receive/send_receive.llm | 20 +++++++++---------- .../src/{Interface.c => interface.c} | 4 ++-- .../send_receive/src/{AsyncIP.c => s2ss.c} | 10 +++++----- .../send_receive/src/{Sched.c => sched.c} | 4 ++-- .../send_receive/src/{Socket.c => socket.c} | 4 ++-- .../send_receive/src/{Utils.c => utils.c} | 1 + 12 files changed, 26 insertions(+), 31 deletions(-) rename clients/opal/models/send_receive/include/{Config.h => config.h} (79%) rename clients/opal/models/send_receive/include/{Interface.h => interface.h} (100%) rename clients/opal/models/send_receive/include/{MsgFormat.h => msg_format.h} (83%) rename clients/opal/models/send_receive/include/{Sched.h => sched.h} (100%) rename clients/opal/models/send_receive/include/{Socket.h => socket.h} (100%) rename clients/opal/models/send_receive/{AsyncIP.mk => s2ss.mk} (100%) rename clients/opal/models/send_receive/src/{Interface.c => interface.c} (93%) rename clients/opal/models/send_receive/src/{AsyncIP.c => s2ss.c} (95%) rename clients/opal/models/send_receive/src/{Sched.c => sched.c} (97%) rename clients/opal/models/send_receive/src/{Socket.c => socket.c} (96%) rename clients/opal/models/send_receive/src/{Utils.c => utils.c} (92%) diff --git a/clients/opal/models/send_receive/include/Config.h b/clients/opal/models/send_receive/include/config.h similarity index 79% rename from clients/opal/models/send_receive/include/Config.h rename to clients/opal/models/send_receive/include/config.h index dc5d2af80..d442dd210 100644 --- a/clients/opal/models/send_receive/include/Config.h +++ b/clients/opal/models/send_receive/include/config.h @@ -8,7 +8,7 @@ #ifndef _CONFIG_H_ #define _CONFIG_H_ -#define PROGNAME "AsyncIP" +#define PROGNAME "S2SS" #define VERSION "0.1" -#endif /* _CONFIG_H_ */ \ No newline at end of file +#endif /* _CONFIG_H_ */ diff --git a/clients/opal/models/send_receive/include/Interface.h b/clients/opal/models/send_receive/include/interface.h similarity index 100% rename from clients/opal/models/send_receive/include/Interface.h rename to clients/opal/models/send_receive/include/interface.h diff --git a/clients/opal/models/send_receive/include/MsgFormat.h b/clients/opal/models/send_receive/include/msg_format.h similarity index 83% rename from clients/opal/models/send_receive/include/MsgFormat.h rename to clients/opal/models/send_receive/include/msg_format.h index f738a4638..4a04df4e3 100644 --- a/clients/opal/models/send_receive/include/MsgFormat.h +++ b/clients/opal/models/send_receive/include/msg_format.h @@ -36,7 +36,7 @@ #endif /** The total length of a message */ -#define MSG_LEN(values) (4 * (values + 1)) +#define MSG_LEN(values) (4 * (values + 1)) /** Initialize a message */ #define MSG_INIT(i) { \ @@ -53,17 +53,11 @@ **/ struct msg { -#if BYTE_ORDER == BIG_ENDIAN unsigned version: 4; /**< Specifies the format of the remaining message (see MGS_VERSION) */ unsigned type : 2; /**< Data or control message (see MSG_TYPE_*) */ unsigned endian : 1; /**< Specifies the byteorder of the message (see MSG_ENDIAN_*) */ unsigned : 1; /**< Reserved padding bits */ -#else - unsigned : 1; /**< Reserved padding bits */ - unsigned endian : 1; /**< Specifies the byteorder of the message (see MSG_ENDIAN_*) */ - unsigned type : 2; /**< Data or control message (see MSG_TYPE_*) */ - unsigned version: 4; /**< Specifies the format of the remaining message (see MGS_VERSION) */ -#endif + /** Number of valid dword values in msg::data[] */ uint8_t length; /** The sequence number gets incremented by one for consecutive messages */ diff --git a/clients/opal/models/send_receive/include/Sched.h b/clients/opal/models/send_receive/include/sched.h similarity index 100% rename from clients/opal/models/send_receive/include/Sched.h rename to clients/opal/models/send_receive/include/sched.h diff --git a/clients/opal/models/send_receive/include/Socket.h b/clients/opal/models/send_receive/include/socket.h similarity index 100% rename from clients/opal/models/send_receive/include/Socket.h rename to clients/opal/models/send_receive/include/socket.h diff --git a/clients/opal/models/send_receive/AsyncIP.mk b/clients/opal/models/send_receive/s2ss.mk similarity index 100% rename from clients/opal/models/send_receive/AsyncIP.mk rename to clients/opal/models/send_receive/s2ss.mk diff --git a/clients/opal/models/send_receive/send_receive.llm b/clients/opal/models/send_receive/send_receive.llm index a4c7a4035..f5ca548ca 100644 --- a/clients/opal/models/send_receive/send_receive.llm +++ b/clients/opal/models/send_receive/send_receive.llm @@ -37,16 +37,16 @@ INTERNAL_IGN_SOURCE_FILE=sfun_gen_async_ctrl.c sfun_recv_async.c sfun_send_async INTERNAL_LIBRARY2=-lOpalAsyncApiR2011b INTERNAL_LIBRARY3=-lOpalAsyncApiCore [ExtraPutFilesComp] -AsyncIP.mk=Ascii -include\Config.h=Ascii -include\Interface.h=Ascii -include\MsgFormat.h=Ascii -include\Sched.h=Ascii -include\Socket.h=Ascii -src\AsyncIP.c=Ascii -src\Interface.c=Ascii -src\Sched.c=Ascii -src\Socket.c=Ascii +s2ss.mk=Ascii +include\config.h=Ascii +include\interface.h=Ascii +include\msg_format.h=Ascii +include\sched.h=Ascii +include\socket.h=Ascii +src\s2ss.c=Ascii +src\interface.c=Ascii +src\sched.c=Ascii +src\socket.c=Ascii [ExtraPutFilesComp_1_RT_LAB] C:\OPAL-RT\RT-LAB\v10.5.9.356\common\lib\redhawk\libOpalAsyncApiCore.a=Binary [General] diff --git a/clients/opal/models/send_receive/src/Interface.c b/clients/opal/models/send_receive/src/interface.c similarity index 93% rename from clients/opal/models/send_receive/src/Interface.c rename to clients/opal/models/send_receive/src/interface.c index 97b5d6017..c1883cc6c 100644 --- a/clients/opal/models/send_receive/src/Interface.c +++ b/clients/opal/models/send_receive/src/interface.c @@ -5,8 +5,8 @@ * @file */ -#include "Config.h" -#include "Interface.h" +#include "config.h" +#include "interface.h" int if_setup(const char *op, const char *iface, const char *addr) { diff --git a/clients/opal/models/send_receive/src/AsyncIP.c b/clients/opal/models/send_receive/src/s2ss.c similarity index 95% rename from clients/opal/models/send_receive/src/AsyncIP.c rename to clients/opal/models/send_receive/src/s2ss.c index a99368cc3..718bcb1c3 100644 --- a/clients/opal/models/send_receive/src/AsyncIP.c +++ b/clients/opal/models/send_receive/src/s2ss.c @@ -1,4 +1,4 @@ -/** AsyncIP +/** Main * * Code example of an asynchronous program. This program is started * by the asynchronous controller and demonstrates how to send and @@ -38,10 +38,10 @@ #include "AsyncApi.h" /* This is the message format */ -#include "Config.h" -#include "MsgFormat.h" -#include "Socket.h" -#include "Interface.h" +#include "config.h" +#include "msg_format.h" +#include "socket.h" +#include "interface.h" /* This is just for initializing the shared memory access to communicate * with the RT-LAB model. It's easier to remember the arguments like this */ diff --git a/clients/opal/models/send_receive/src/Sched.c b/clients/opal/models/send_receive/src/sched.c similarity index 97% rename from clients/opal/models/send_receive/src/Sched.c rename to clients/opal/models/send_receive/src/sched.c index f4744fcc9..42e5a89b1 100644 --- a/clients/opal/models/send_receive/src/Sched.c +++ b/clients/opal/models/send_receive/src/sched.c @@ -14,8 +14,8 @@ #define RTLAB #include "OpalPrint.h" -#include "Config.h" -#include "Sched.h" +#include "config.h" +#include "sched.h" #if defined(__QNXNTO__) # include diff --git a/clients/opal/models/send_receive/src/Socket.c b/clients/opal/models/send_receive/src/socket.c similarity index 96% rename from clients/opal/models/send_receive/src/Socket.c rename to clients/opal/models/send_receive/src/socket.c index a5f4b7393..bdba72753 100644 --- a/clients/opal/models/send_receive/src/Socket.c +++ b/clients/opal/models/send_receive/src/socket.c @@ -26,8 +26,8 @@ #include "OpalPrint.h" #include "AsyncApi.h" -#include "Config.h" -#include "Socket.h" +#include "config.h" +#include "socket.h" /* Globals variables */ struct sockaddr_in send_ad; /* Send address */ diff --git a/clients/opal/models/send_receive/src/Utils.c b/clients/opal/models/send_receive/src/utils.c similarity index 92% rename from clients/opal/models/send_receive/src/Utils.c rename to clients/opal/models/send_receive/src/utils.c index f88ce7e56..9e499dcab 100644 --- a/clients/opal/models/send_receive/src/Utils.c +++ b/clients/opal/models/send_receive/src/utils.c @@ -1,3 +1,4 @@ +#include "utils.h" static union fi { float f;