Commit 296b10d4 authored by Maxime Perrotin's avatar Maxime Perrotin

Fix git merging

parent 55931ad7
...@@ -84,17 +84,6 @@ typedef struct { ...@@ -84,17 +84,6 @@ typedef struct {
void __po_hi_c_mil_1553_conf_t_devname_Initialize(__po_hi_c_mil_1553_conf_t_devname val); void __po_hi_c_mil_1553_conf_t_devname_Initialize(__po_hi_c_mil_1553_conf_t_devname val);
void __po_hi_c_mil_1553_conf_t_Initialize(__po_hi_c_mil_1553_conf_t* pVal); void __po_hi_c_mil_1553_conf_t_Initialize(__po_hi_c_mil_1553_conf_t* pVal);
<<<<<<< HEAD
#define ERR_MIL_1553_CONF_T 105 /**/
#define ERR_MIL_1553_CONF_T_DEVNAME 29 /**/
#define ERR_MIL_1553_CONF_T_STANDARD_2 43 /**/
#define ERR_MIL_1553_CONF_T_MODE_2 55 /**/
#define ERR_MIL_1553_CONF_T_BUS_2 67 /**/
#define ERR_MIL_1553_CONF_T_TERMADDR_2 79 /**/
#define ERR_MIL_1553_CONF_T_BROADCAST 84 /**/
#define ERR_MIL_1553_CONF_T_RXBLOCK 91 /**/
#define ERR_MIL_1553_CONF_T_TXBLOCK 98 /**/
=======
#define ERR_MIL_1553_CONF_T 101 /**/ #define ERR_MIL_1553_CONF_T 101 /**/
#define ERR_MIL_1553_CONF_T_DEVNAME 29 /**/ #define ERR_MIL_1553_CONF_T_DEVNAME 29 /**/
#define ERR_MIL_1553_CONF_T_STANDARD 36 /**/ #define ERR_MIL_1553_CONF_T_STANDARD 36 /**/
...@@ -104,7 +93,6 @@ void __po_hi_c_mil_1553_conf_t_Initialize(__po_hi_c_mil_1553_conf_t* pVal); ...@@ -104,7 +93,6 @@ void __po_hi_c_mil_1553_conf_t_Initialize(__po_hi_c_mil_1553_conf_t* pVal);
#define ERR_MIL_1553_CONF_T_BROADCAST 80 /**/ #define ERR_MIL_1553_CONF_T_BROADCAST 80 /**/
#define ERR_MIL_1553_CONF_T_RXBLOCK 87 /**/ #define ERR_MIL_1553_CONF_T_RXBLOCK 87 /**/
#define ERR_MIL_1553_CONF_T_TXBLOCK 94 /**/ #define ERR_MIL_1553_CONF_T_TXBLOCK 94 /**/
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
flag __po_hi_c_mil_1553_conf_t_IsConstraintValid(const __po_hi_c_mil_1553_conf_t* pVal, int* pErrCode); flag __po_hi_c_mil_1553_conf_t_IsConstraintValid(const __po_hi_c_mil_1553_conf_t* pVal, int* pErrCode);
......
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
#include <stddef.h> #include <stddef.h>
<<<<<<< HEAD
=======
#if (!defined(_MSC_VER) || _MSC_VER >= 1800) #if (!defined(_MSC_VER) || _MSC_VER >= 1800)
# ifndef SWIG # ifndef SWIG
# include <stdbool.h> # include <stdbool.h>
...@@ -14,32 +12,10 @@ typedef unsigned char bool; ...@@ -14,32 +12,10 @@ typedef unsigned char bool;
#define true 1 #define true 1
#define false 0 #define false 0
#endif #endif
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#include <cstdint>
#else
// C99 check
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
# include <stdbool.h>
# include <stdint.h>
#else
typedef unsigned char bool;
# define true 1
# define false 0
typedef unsigned char uint8_t;
typedef int int32_t;
typedef unsigned int uint32_t;
typedef long long int64_t;
typedef unsigned long long uint64_t;
#endif #endif
#endif /* __cplusplus */
#ifndef NULL #ifndef NULL
#define NULL 0 #define NULL 0
...@@ -60,40 +36,22 @@ typedef unsigned long long uint64_t; ...@@ -60,40 +36,22 @@ typedef unsigned long long uint64_t;
#ifndef FP_WORD_SIZE #ifndef FP_WORD_SIZE
#define FP_WORD_SIZE 8 #define FP_WORD_SIZE 8
#endif #endif
<<<<<<< HEAD
#define OBJECT_IDENTIFIER_MAX_LENGTH 20 #define OBJECT_IDENTIFIER_MAX_LENGTH 20
=======
#define OBJECT_IDENTIFIER_MAX_LENGTH 20
typedef float asn1Real32;
typedef double asn1Real64;
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
<<<<<<< HEAD
typedef float asn1Real32; typedef float asn1Real32;
typedef double asn1Real64; typedef double asn1Real64;
typedef uint8_t byte;
typedef int32_t asn1SccSint32;
typedef uint32_t asn1SccUint32;
typedef int64_t asn1SccSint64; typedef unsigned char byte;
typedef uint64_t asn1SccUint64;
=======
typedef int asn1SccSint32; typedef int asn1SccSint32;
typedef unsigned int asn1SccUint32; typedef unsigned int asn1SccUint32;
typedef long long asn1SccSint64; typedef long long asn1SccSint64;
typedef unsigned long long asn1SccUint64; typedef unsigned long long asn1SccUint64;
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
#if WORD_SIZE==8 #if WORD_SIZE==8
typedef asn1SccUint64 asn1SccUint; typedef asn1SccUint64 asn1SccUint;
typedef asn1SccSint64 asn1SccSint; typedef asn1SccSint64 asn1SccSint;
...@@ -102,12 +60,6 @@ typedef asn1SccUint32 asn1SccUint; ...@@ -102,12 +60,6 @@ typedef asn1SccUint32 asn1SccUint;
typedef asn1SccSint32 asn1SccSint; typedef asn1SccSint32 asn1SccSint;
#endif #endif
<<<<<<< HEAD
asn1SccUint int2uint(asn1SccSint v);
asn1SccSint uint2int(asn1SccUint v, int uintSizeInBytes);
=======
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
#if FP_WORD_SIZE==8 #if FP_WORD_SIZE==8
typedef asn1Real64 asn1Real; typedef asn1Real64 asn1Real;
#else #else
...@@ -128,29 +80,14 @@ typedef bool flag; ...@@ -128,29 +80,14 @@ typedef bool flag;
typedef char NullType; typedef char NullType;
struct BitStream_t; typedef struct {
typedef void(*PushDataFnc)(struct BitStream_t* pThis, void* pushDataPrm);
typedef void(*FetchDataFnc)(struct BitStream_t* pThis, void* fetchDataPrm);
typedef struct BitStream_t {
byte* buf; byte* buf;
long count; long count;
long currentByte; long currentByte;
/* Next available bit for writting. /* Next available bit for writting. Possible vallues 0..7, 0 is most significant bit of current byte*/
Possible vallues 0..7, 0 is most significant
bit of current byte*/
int currentBit; int currentBit;
PushDataFnc pushData;
void* pushDataPrm;
FetchDataFnc fetchData;
void* fetchDataPrm;
} BitStream; } BitStream;
typedef struct { typedef struct {
byte* buf; byte* buf;
long count; long count;
...@@ -186,62 +123,6 @@ typedef struct { ...@@ -186,62 +123,6 @@ typedef struct {
#define ERR_INVALID_BER_FILE 201 #define ERR_INVALID_BER_FILE 201
#define ERR_BER_LENGTH_MISMATCH 202 #define ERR_BER_LENGTH_MISMATCH 202
<<<<<<< HEAD
int GetCharIndex(char ch, byte allowedCharSet[], int setLen);
void ObjectIdentifier_Init(Asn1ObjectIdentifier *pVal);
flag ObjectIdentifier_equal(const Asn1ObjectIdentifier *pVal1, const Asn1ObjectIdentifier *pVal2);
flag ObjectIdentifier_isValid(const Asn1ObjectIdentifier *pVal);
flag RelativeOID_isValid(const Asn1ObjectIdentifier *pVal);
/* Time Classes
Asn1LocalTime, // TIME-OF-DAY ::= TIME(SETTINGS "Basic=Time Time=HMS Local-or-UTC=L")
Asn1UtcTime, // TIME(SETTINGS "Basic=Time Time=HMS Local-or-UTC=Z")
Asn1LocalTimeWithTimeZone, // TIME(SETTINGS "Basic=Time Time=HMS Local-or-UTC=LD")
Asn1Date, // DATE ::= TIME(SETTINGS "Basic=Date Date=YMD Year=Basic")
Asn1Date_LocalTime, // DATE-TIME ::= TIME(SETTINGS "Basic=Date-Time Date=YMD Year=Basic Time=HMS Local-or-UTC=L")
Asn1Date_UtcTime, // TIME(SETTINGS "Basic=Date-Time Date=YMD Year=Basic Time=HMS Local-or-UTC=Z")
Asn1Date_LocalTimeWithTimeZone // TIME(SETTINGS "Basic=Date-Time Date=YMD Year=Basic Time=HMS Local-or-UTC=LD")
*/
typedef struct {
int sign; //-1 or +1
int hours;
int mins;
} Asn1TimeZone;
typedef struct {
int hours;
int mins;
int secs;
int fraction;
Asn1TimeZone tz;
} Asn1TimeWithTimeZone;
typedef struct {
int hours;
int mins;
int secs;
int fraction;
} Asn1UtcTime;
typedef struct {
int hours;
int mins;
int secs;
int fraction;
} Asn1LocalTime;
typedef struct {
int years;
int months;
int days;
} Asn1Date;
typedef struct {
Asn1Date date;
Asn1LocalTime time;
} Asn1DateLocalTime;
=======
flag OctetString_equal(int len1, int len2, const byte arr1[], const byte arr2[]); flag OctetString_equal(int len1, int len2, const byte arr1[], const byte arr2[]);
...@@ -256,45 +137,25 @@ int GetCharIndex(char ch, byte allowedCharSet[], int setLen); ...@@ -256,45 +137,25 @@ int GetCharIndex(char ch, byte allowedCharSet[], int setLen);
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
typedef struct {
Asn1Date date;
Asn1UtcTime time;
} Asn1DateUtcTime;
typedef struct {
Asn1Date date;
Asn1TimeWithTimeZone time;
} Asn1DateTimeWithTimeZone;
typedef enum {
Asn1TC_LocalTimeStamp,
Asn1TC_UtcTimeStamp,
Asn1TC_LocalTimeTZStamp
} Asn1TimeZoneClass;
typedef asn1SccUint BerTag; typedef asn1SccUint BerTag;
<<<<<<< HEAD
=======
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
#if WORD_SIZE==8 #if WORD_SIZE==8
extern const asn1SccUint64 ber_aux[]; extern const asn1SccUint64 ber_aux[];
#else #else
extern const asn1SccUint32 ber_aux[]; extern const asn1SccUint32 ber_aux[];
#endif #endif
<<<<<<< HEAD
=======
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
#define CHECK_BIT_STREAM(pBitStrm) assert((pBitStrm)->currentByte*8+(pBitStrm)->currentBit<=(pBitStrm)->count*8) #define CHECK_BIT_STREAM(pBitStrm) assert((pBitStrm)->currentByte*8+(pBitStrm)->currentBit<=(pBitStrm)->count*8)
......
...@@ -65,24 +65,15 @@ void __po_hi_c_ip_conf_t_gateway_Initialize(__po_hi_c_ip_conf_t_gateway val); ...@@ -65,24 +65,15 @@ void __po_hi_c_ip_conf_t_gateway_Initialize(__po_hi_c_ip_conf_t_gateway val);
void __po_hi_c_ip_conf_t_dns_Initialize(__po_hi_c_ip_conf_t_dns val); void __po_hi_c_ip_conf_t_dns_Initialize(__po_hi_c_ip_conf_t_dns val);
void __po_hi_c_ip_conf_t_Initialize(__po_hi_c_ip_conf_t* pVal); void __po_hi_c_ip_conf_t_Initialize(__po_hi_c_ip_conf_t* pVal);
<<<<<<< HEAD
#define ERR_IP_CONF_T 81 /**/
=======
#define ERR_IP_CONF_T 79 /**/ #define ERR_IP_CONF_T 79 /**/
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
#define ERR_IP_CONF_T_DEVNAME 15 /**/ #define ERR_IP_CONF_T_DEVNAME 15 /**/
#define ERR_IP_CONF_T_ADDRESS 22 /**/ #define ERR_IP_CONF_T_ADDRESS 22 /**/
#define ERR_IP_CONF_T_BROADCAST 29 /**/ #define ERR_IP_CONF_T_BROADCAST 29 /**/
#define ERR_IP_CONF_T_NETMASK 36 /**/ #define ERR_IP_CONF_T_NETMASK 36 /**/
#define ERR_IP_CONF_T_GATEWAY 43 /**/ #define ERR_IP_CONF_T_GATEWAY 43 /**/
#define ERR_IP_CONF_T_DNS 50 /**/ #define ERR_IP_CONF_T_DNS 50 /**/
<<<<<<< HEAD
#define ERR_IP_CONF_T_VERSION_2 64 /**/
#define ERR_IP_CONF_T_PORT_2 76 /**/
=======
#define ERR_IP_CONF_T_VERSION 57 /**/ #define ERR_IP_CONF_T_VERSION 57 /**/
#define ERR_IP_CONF_T_PORT 68 /**/ #define ERR_IP_CONF_T_PORT 68 /**/
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
flag __po_hi_c_ip_conf_t_IsConstraintValid(const __po_hi_c_ip_conf_t* pVal, int* pErrCode); flag __po_hi_c_ip_conf_t_IsConstraintValid(const __po_hi_c_ip_conf_t* pVal, int* pErrCode);
extern const __po_hi_c_ip_conf_t localhost1; extern const __po_hi_c_ip_conf_t localhost1;
......
...@@ -73,15 +73,6 @@ void __po_hi_c_serial_conf_t_bits_Initialize(__po_hi_c_serial_conf_t_bits* pVal) ...@@ -73,15 +73,6 @@ void __po_hi_c_serial_conf_t_bits_Initialize(__po_hi_c_serial_conf_t_bits* pVal)
void __po_hi_c_serial_conf_t_sending_wait_Initialize(__po_hi_c_serial_conf_t_sending_wait* pVal); void __po_hi_c_serial_conf_t_sending_wait_Initialize(__po_hi_c_serial_conf_t_sending_wait* pVal);
void __po_hi_c_serial_conf_t_Initialize(__po_hi_c_serial_conf_t* pVal); void __po_hi_c_serial_conf_t_Initialize(__po_hi_c_serial_conf_t* pVal);
<<<<<<< HEAD
#define ERR_SERIAL_CONF_T 67 /**/
#define ERR_SERIAL_CONF_T_DEVNAME 15 /**/
#define ERR_SERIAL_CONF_T_SPEED_2 29 /**/
#define ERR_SERIAL_CONF_T_PARITY_2 41 /**/
#define ERR_SERIAL_CONF_T_BITS 46 /**/
#define ERR_SERIAL_CONF_T_SENDING_WAIT 53 /**/
#define ERR_SERIAL_CONF_T_USE_PARITYBIT 60 /**/
=======
#define ERR_SERIAL_CONF_T 65 /**/ #define ERR_SERIAL_CONF_T 65 /**/
#define ERR_SERIAL_CONF_T_DEVNAME 15 /**/ #define ERR_SERIAL_CONF_T_DEVNAME 15 /**/
#define ERR_SERIAL_CONF_T_SPEED 22 /**/ #define ERR_SERIAL_CONF_T_SPEED 22 /**/
...@@ -89,7 +80,6 @@ void __po_hi_c_serial_conf_t_Initialize(__po_hi_c_serial_conf_t* pVal); ...@@ -89,7 +80,6 @@ void __po_hi_c_serial_conf_t_Initialize(__po_hi_c_serial_conf_t* pVal);
#define ERR_SERIAL_CONF_T_BITS 44 /**/ #define ERR_SERIAL_CONF_T_BITS 44 /**/
#define ERR_SERIAL_CONF_T_SENDING_WAIT 51 /**/ #define ERR_SERIAL_CONF_T_SENDING_WAIT 51 /**/
#define ERR_SERIAL_CONF_T_USE_PARITYBIT 58 /**/ #define ERR_SERIAL_CONF_T_USE_PARITYBIT 58 /**/
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
flag __po_hi_c_serial_conf_t_IsConstraintValid(const __po_hi_c_serial_conf_t* pVal, int* pErrCode); flag __po_hi_c_serial_conf_t_IsConstraintValid(const __po_hi_c_serial_conf_t* pVal, int* pErrCode);
extern const __po_hi_c_serial_conf_t linux_ttyS0; extern const __po_hi_c_serial_conf_t linux_ttyS0;
......
...@@ -57,17 +57,6 @@ typedef struct { ...@@ -57,17 +57,6 @@ typedef struct {
void __po_hi_c_spacewire_conf_t_devname_Initialize(__po_hi_c_spacewire_conf_t_devname val); void __po_hi_c_spacewire_conf_t_devname_Initialize(__po_hi_c_spacewire_conf_t_devname val);
void __po_hi_c_spacewire_conf_t_Initialize(__po_hi_c_spacewire_conf_t* pVal); void __po_hi_c_spacewire_conf_t_Initialize(__po_hi_c_spacewire_conf_t* pVal);
<<<<<<< HEAD
#define ERR_SPACEWIRE_CONF_T 93 /**/
#define ERR_SPACEWIRE_CONF_T_DEVNAME 22 /**/
#define ERR_SPACEWIRE_CONF_T_NODEADDR_2 36 /**/
#define ERR_SPACEWIRE_CONF_T_COREFREQ_2 48 /**/
#define ERR_SPACEWIRE_CONF_T_CLOCKDIV_2 60 /**/
#define ERR_SPACEWIRE_CONF_T_USE_ROUTER 65 /**/
#define ERR_SPACEWIRE_CONF_T_REMOVE_PROT_ID 72 /**/
#define ERR_SPACEWIRE_CONF_T_RXBLOCK 79 /**/
#define ERR_SPACEWIRE_CONF_T_TXBLOCK 86 /**/
=======
#define ERR_SPACEWIRE_CONF_T 90 /**/ #define ERR_SPACEWIRE_CONF_T 90 /**/
#define ERR_SPACEWIRE_CONF_T_DEVNAME 22 /**/ #define ERR_SPACEWIRE_CONF_T_DEVNAME 22 /**/
#define ERR_SPACEWIRE_CONF_T_NODEADDR 29 /**/ #define ERR_SPACEWIRE_CONF_T_NODEADDR 29 /**/
...@@ -77,7 +66,6 @@ void __po_hi_c_spacewire_conf_t_Initialize(__po_hi_c_spacewire_conf_t* pVal); ...@@ -77,7 +66,6 @@ void __po_hi_c_spacewire_conf_t_Initialize(__po_hi_c_spacewire_conf_t* pVal);
#define ERR_SPACEWIRE_CONF_T_REMOVE_PROT_ID 69 /**/ #define ERR_SPACEWIRE_CONF_T_REMOVE_PROT_ID 69 /**/
#define ERR_SPACEWIRE_CONF_T_RXBLOCK 76 /**/ #define ERR_SPACEWIRE_CONF_T_RXBLOCK 76 /**/
#define ERR_SPACEWIRE_CONF_T_TXBLOCK 83 /**/ #define ERR_SPACEWIRE_CONF_T_TXBLOCK 83 /**/
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
flag __po_hi_c_spacewire_conf_t_IsConstraintValid(const __po_hi_c_spacewire_conf_t* pVal, int* pErrCode); flag __po_hi_c_spacewire_conf_t_IsConstraintValid(const __po_hi_c_spacewire_conf_t* pVal, int* pErrCode);
extern const __po_hi_c_spacewire_conf_t leon_rasta_spw_sender; extern const __po_hi_c_spacewire_conf_t leon_rasta_spw_sender;
......
...@@ -137,15 +137,6 @@ flag __po_hi_c_mil_1553_conf_t_IsConstraintValid(const __po_hi_c_mil_1553_conf_t ...@@ -137,15 +137,6 @@ flag __po_hi_c_mil_1553_conf_t_IsConstraintValid(const __po_hi_c_mil_1553_conf_t
ret = ((1 <= strlen(pVal->devname)) && (strlen(pVal->devname) <= 20)); ret = ((1 <= strlen(pVal->devname)) && (strlen(pVal->devname) <= 20));
*pErrCode = ret ? 0 : ERR_MIL_1553_CONF_T_DEVNAME; *pErrCode = ret ? 0 : ERR_MIL_1553_CONF_T_DEVNAME;
if (ret) { if (ret) {
<<<<<<< HEAD
ret = __po_hi_c_Standard_T_IsConstraintValid((&(pVal->standard)), pErrCode);
if (ret) {
ret = __po_hi_c_Mode_T_IsConstraintValid((&(pVal->mode)), pErrCode);
if (ret) {
ret = __po_hi_c_Bus_T_IsConstraintValid((&(pVal->bus)), pErrCode);
if (ret) {
ret = __po_hi_c_Node_Addr_T_IsConstraintValid((&(pVal->termaddr)), pErrCode);
=======
ret = (((pVal->standard == __po_hi_c_mil1553a)) || ((pVal->standard == __po_hi_c_mil1553b))); ret = (((pVal->standard == __po_hi_c_mil1553a)) || ((pVal->standard == __po_hi_c_mil1553b)));
*pErrCode = ret ? 0 : ERR_MIL_1553_CONF_T_STANDARD; *pErrCode = ret ? 0 : ERR_MIL_1553_CONF_T_STANDARD;
if (ret) { if (ret) {
...@@ -157,7 +148,6 @@ flag __po_hi_c_mil_1553_conf_t_IsConstraintValid(const __po_hi_c_mil_1553_conf_t ...@@ -157,7 +148,6 @@ flag __po_hi_c_mil_1553_conf_t_IsConstraintValid(const __po_hi_c_mil_1553_conf_t
if (ret) { if (ret) {
ret = (pVal->termaddr <= 31UL); ret = (pVal->termaddr <= 31UL);
*pErrCode = ret ? 0 : ERR_MIL_1553_CONF_T_TERMADDR; *pErrCode = ret ? 0 : ERR_MIL_1553_CONF_T_TERMADDR;
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
} }
} }
} }
......
AUTOMAKE_OPTIONS = no-dependencies AUTOMAKE_OPTIONS = no-dependencies
C_FILES = $(srcdir)/1553.c \ C_FILES = $(srcdir)/1553.c \
<<<<<<< HEAD
$(srcdir)/ip.c \
$(srcdir)/serial.c \
$(srcdir)/spacewire.c \
$(srcdir)/bluetooth.c
ASN_FILES = $(srcdir)/1553.asn \
$(srcdir)/ip.asn \
$(srcdir)/serial.asn \
$(srcdir)/spacewire.asn \
$(srcdir)/bluetooth.asn
=======
$(srcdir)/ip.c \ $(srcdir)/ip.c \
$(srcdir)/serial.c \ $(srcdir)/serial.c \
$(srcdir)/spacewire.c $(srcdir)/spacewire.c
...@@ -21,7 +9,6 @@ ASN_FILES = $(srcdir)/1553.asn \ ...@@ -21,7 +9,6 @@ ASN_FILES = $(srcdir)/1553.asn \
$(srcdir)/ip.asn \ $(srcdir)/ip.asn \
$(srcdir)/serial.asn \ $(srcdir)/serial.asn \
$(srcdir)/spacewire.asn $(srcdir)/spacewire.asn
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
csrc = ${shell $(CYGPATH_U) '$(OCARINA_RUNTIME)/polyorb-hi-c/src/drivers/configuration'} csrc = ${shell $(CYGPATH_U) '$(OCARINA_RUNTIME)/polyorb-hi-c/src/drivers/configuration'}
...@@ -31,11 +18,7 @@ t: ...@@ -31,11 +18,7 @@ t:
echo `shell which asn1.exe` echo `shell which asn1.exe`
$(srcdir)/1553.c: $(srcdir)/1553.c:
<<<<<<< HEAD
mono $$(which asn1.exe) -c -typePrefix __po_hi_c_ 1553.asn
=======
mono $(shell which asn1.exe) -c -typePrefix __po_hi_c_ 1553.asn mono $(shell which asn1.exe) -c -typePrefix __po_hi_c_ 1553.asn
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
sed -e 's/Mil\_1553\_Conf\_T/mil\_1553\_conf\_t/g' 1553.h > 1553new.h sed -e 's/Mil\_1553\_Conf\_T/mil\_1553\_conf\_t/g' 1553.h > 1553new.h
mv 1553new.h 1553.h mv 1553new.h 1553.h
echo "#if (defined (__PO_HI_NEED_DRIVER_1553_RASTA))\n" > 1553new.c echo "#if (defined (__PO_HI_NEED_DRIVER_1553_RASTA))\n" > 1553new.c
...@@ -46,11 +29,7 @@ $(srcdir)/1553.c: ...@@ -46,11 +29,7 @@ $(srcdir)/1553.c:
mv asn1crt.h ../../../include/drivers/configuration/ mv asn1crt.h ../../../include/drivers/configuration/
$(srcdir)/spacewire.c: $(srcdir)/spacewire.c:
<<<<<<< HEAD
mono $$(which asn1.exe) -c -typePrefix __po_hi_c_ spacewire.asn
=======
mono $(shell which asn1.exe) -c -typePrefix __po_hi_c_ spacewire.asn mono $(shell which asn1.exe) -c -typePrefix __po_hi_c_ spacewire.asn
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
sed -e 's/Spacewire\_Conf\_T/spacewire\_conf\_t/g' spacewire.h > spacewirenew.h sed -e 's/Spacewire\_Conf\_T/spacewire\_conf\_t/g' spacewire.h > spacewirenew.h
mv spacewirenew.h spacewire.h mv spacewirenew.h spacewire.h
echo "#if (defined (__PO_HI_NEED_DRIVER_SPACEWIRE_RASTA))\n" > spacewirenew.c echo "#if (defined (__PO_HI_NEED_DRIVER_SPACEWIRE_RASTA))\n" > spacewirenew.c
...@@ -61,11 +40,7 @@ $(srcdir)/spacewire.c: ...@@ -61,11 +40,7 @@ $(srcdir)/spacewire.c:
mv asn1crt.h ../../../include/drivers/configuration/ mv asn1crt.h ../../../include/drivers/configuration/
$(srcdir)/ip.c: $(srcdir)/ip.c:
<<<<<<< HEAD
mono $$(which asn1.exe) -c -typePrefix __po_hi_c_ ip.asn
=======
mono $(shell which asn1.exe) -c -typePrefix __po_hi_c_ ip.asn mono $(shell which asn1.exe) -c -typePrefix __po_hi_c_ ip.asn
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
mv asn1crt.h ../../../include/drivers/configuration/ mv asn1crt.h ../../../include/drivers/configuration/
sed -e 's/IP\_Conf\_T/ip\_conf\_t/g' ip.h > ipnew.h sed -e 's/IP\_Conf\_T/ip\_conf\_t/g' ip.h > ipnew.h
mv ipnew.h ip.h mv ipnew.h ip.h
...@@ -76,11 +51,7 @@ $(srcdir)/ip.c: ...@@ -76,11 +51,7 @@ $(srcdir)/ip.c:
mv ip.h ../../../include/drivers/configuration/ mv ip.h ../../../include/drivers/configuration/
$(srcdir)/serial.c: $(srcdir)/serial.c:
<<<<<<< HEAD
mono $$(which asn1.exe) -c -typePrefix __po_hi_c_ serial.asn
=======
mono $(shell which asn1.exe) -c -typePrefix __po_hi_c_ serial.asn mono $(shell which asn1.exe) -c -typePrefix __po_hi_c_ serial.asn
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
sed -e 's/Serial\_Conf\_T/serial\_conf\_t/g' serial.h > serialnew.h sed -e 's/Serial\_Conf\_T/serial\_conf\_t/g' serial.h > serialnew.h
mv serialnew.h serial.h mv serialnew.h serial.h
echo "#if (defined (__PO_HI_NEED_DRIVER_SERIAL_LINUX) || defined (__PO_HI_NEED_DRIVER_SERIAL_LINUX_RECEIVER) || defined (__PO_HI_NEED_DRIVER_SERIAL_LINUX_SENDER) || defined (__PO_HI_NEED_DRIVER_SERIAL_RASTA) || defined (__PO_HI_NEED_DRIVER_SERIAL_LEON) || defined (__PO_HI_NEED_DRIVER_SERIAL_LEON_SENDER) || defined (__PO_HI_NEED_DRIVER_SERIAL_LEON_RECEIVER))\n" > serialnew.c echo "#if (defined (__PO_HI_NEED_DRIVER_SERIAL_LINUX) || defined (__PO_HI_NEED_DRIVER_SERIAL_LINUX_RECEIVER) || defined (__PO_HI_NEED_DRIVER_SERIAL_LINUX_SENDER) || defined (__PO_HI_NEED_DRIVER_SERIAL_RASTA) || defined (__PO_HI_NEED_DRIVER_SERIAL_LEON) || defined (__PO_HI_NEED_DRIVER_SERIAL_LEON_SENDER) || defined (__PO_HI_NEED_DRIVER_SERIAL_LEON_RECEIVER))\n" > serialnew.c
...@@ -90,17 +61,6 @@ $(srcdir)/serial.c: ...@@ -90,17 +61,6 @@ $(srcdir)/serial.c:
mv serial.h ../../../include/drivers/configuration/ mv serial.h ../../../include/drivers/configuration/
mv asn1crt.h ../../../include/drivers/configuration/ mv asn1crt.h ../../../include/drivers/configuration/
$(srcdir)/bluetooth.c:
mono $$(which asn1.exe) -c -typePrefix __po_hi_c_ bluetooth.asn
sed -e 's/Bluetooth\_Conf\_T/bluetooth\_conf\_t/g' bluetooth.h > bluetoothnew.h
mv bluetoothnew.h bluetooth.h
echo "#if (defined (__PO_HI_NEED_DRIVER_BLUETOOTH))\n" > bluetoothnew.c
sed -e 's/Bluetooth\_Conf\_T/bluetooth\_conf\_t/g' bluetooth.c >> bluetoothnew.c
echo "\n#endif" >> bluetoothnew.c
mv bluetoothnew.c bluetooth.c
mv bluetooth.h ../../../include/drivers/configuration/
mv asn1crt.h ../../../include/drivers/configuration/
regenerate: regenerate:
rm -f $(C_FILES) rm -f $(C_FILES)
for v in $(C_FILES); do $(MAKE) $$v ; done for v in $(C_FILES); do $(MAKE) $$v ; done
......
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
#include "asn1crt.h" #include "asn1crt.h"
<<<<<<< HEAD
=======
...@@ -43,7 +41,6 @@ asn1SccSint ByteStream_GetLength(ByteStream* pStrm) ...@@ -43,7 +41,6 @@ asn1SccSint ByteStream_GetLength(ByteStream* pStrm)
return pStrm->currentByte; return pStrm->currentByte;
} }
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
#if WORD_SIZE==8 #if WORD_SIZE==8
const asn1SccUint64 ber_aux[] = { const asn1SccUint64 ber_aux[] = {
0xFF, 0xFF,
...@@ -62,11 +59,8 @@ const asn1SccUint32 ber_aux[] = { ...@@ -62,11 +59,8 @@ const asn1SccUint32 ber_aux[] = {
0xFF000000 }; 0xFF000000 };
#endif #endif
<<<<<<< HEAD
=======
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
asn1SccUint int2uint(asn1SccSint v) { asn1SccUint int2uint(asn1SccSint v) {
asn1SccUint ret = 0; asn1SccUint ret = 0;
if (v < 0) { if (v < 0) {
...@@ -90,18 +84,7 @@ asn1SccSint uint2int(asn1SccUint v, int uintSizeInBytes) { ...@@ -90,18 +84,7 @@ asn1SccSint uint2int(asn1SccUint v, int uintSizeInBytes) {
return -(asn1SccSint)(~v) - 1; return -(asn1SccSint)(~v) - 1;
} }
<<<<<<< HEAD
int GetCharIndex(char ch, byte Set[], int setLen)
{
int i=0;
for(i=0; i<setLen; i++)
if (ch == Set[i])
return i;
return 0;
}
=======
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
/* /*
...@@ -147,10 +130,7 @@ flag ObjectIdentifier_equal(const Asn1ObjectIdentifier *pVal1, const Asn1ObjectI ...@@ -147,10 +130,7 @@ flag ObjectIdentifier_equal(const Asn1ObjectIdentifier *pVal1, const Asn1ObjectI
return FALSE; return FALSE;
} }
} }
<<<<<<< HEAD
=======
>>>>>>> 0e86b129902a792f4ae0c4a6bacb781c57331060
...@@ -188,19 +188,12 @@ flag __po_hi_c_ip_conf_t_IsConstraintValid(const __po_hi_c_ip_conf_t* pVal, int* ...@@ -188,19 +188,12 @@ flag __po_hi_c_ip_conf_t_IsConstraintValid(const __po_hi_c_ip_conf_t* pVal, int*
} }
if (ret) { if (ret) {