dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected for ENDIANNESS.

Browse Source
This commit is contained in:
bacpack
2010-10-27 19:15:10 +00:00
parent 76260a994d
commit 79b86d3a8c
1 changed files with 87 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/src/bacint.c
+87 -63
View File
@@ -41,12 +41,23 @@
/** @file bacint.c Encode/Decode Integer Types */ /** @file bacint.c Encode/Decode Integer Types */
#ifndef BIG_ENDIAN
#error Define BIG_ENDIAN=0 or BIG_ENDIAN=1 for BACnet Stack in compiler settings
#endif
int encode_unsigned16( int encode_unsigned16(
uint8_t * apdu, uint8_t * apdu,
uint16_t value) uint16_t value)
{ {
apdu[0] = (uint8_t) ((value & 0xff00) >> 8); uint8_t *in = (uint8_t *)&value;
apdu[1] = (uint8_t) (value & 0x00ff);
#if BIG_ENDIAN
apdu[0] = in[0];
apdu[1] = in[1];
#else
apdu[0] = in[1];
apdu[1] = in[0];
#endif
return 2; return 2;
} }
@@ -55,11 +66,17 @@ int decode_unsigned16(
uint8_t * apdu, uint8_t * apdu,
uint16_t * value) uint16_t * value)
{ {
if (value) { uint8_t *out = (uint8_t *)value;
*value = (uint16_t) ((((uint16_t) apdu[0]) << 8) & 0xff00);
*value |= ((uint16_t) (((uint16_t) apdu[1]) & 0x00ff));
}
if (out) {
#if BIG_ENDIAN
out[0] = apdu[0];
out[1] = apdu[1];
#else
out[0] = apdu[1];
out[1] = apdu[0];
#endif
}
return 2; return 2;
} }
@@ -67,9 +84,17 @@ int encode_unsigned24(
uint8_t * apdu, uint8_t * apdu,
uint32_t value) uint32_t value)
{ {
apdu[0] = (uint8_t) ((value & 0xff0000) >> 16); uint8_t *in = (uint8_t *)&value;
apdu[1] = (uint8_t) ((value & 0x00ff00) >> 8);
apdu[2] = (uint8_t) (value & 0x0000ff); #if BIG_ENDIAN
apdu[0] = in[1];
apdu[1] = in[2];
apdu[2] = in[3];
#else
apdu[0] = in[2];
apdu[1] = in[1];
apdu[2] = in[0];
#endif
return 3; return 3;
} }
@@ -78,10 +103,20 @@ int decode_unsigned24(
uint8_t * apdu, uint8_t * apdu,
uint32_t * value) uint32_t * value)
{ {
if (value) { uint8_t *out = (uint8_t *)value;
*value = ((uint32_t) ((((uint32_t) apdu[0]) << 16) & 0x00ff0000));
*value |= (uint32_t) ((((uint32_t) apdu[1]) << 8) & 0x0000ff00); if (out) {
*value |= ((uint32_t) (((uint32_t) apdu[2]) & 0x000000ff)); #if BIG_ENDIAN
out[0] = 0;
out[1] = apdu[0];
out[2] = apdu[1];
out[3] = apdu[2];
#else
out[0] = apdu[2];
out[1] = apdu[1];
out[2] = apdu[0];
out[3] = 0;
#endif
} }
return 3; return 3;
@@ -91,10 +126,19 @@ int encode_unsigned32(
uint8_t * apdu, uint8_t * apdu,
uint32_t value) uint32_t value)
{ {
apdu[0] = (uint8_t) ((value & 0xff000000) >> 24); uint8_t *in = (uint8_t *)&value;
apdu[1] = (uint8_t) ((value & 0x00ff0000) >> 16);
apdu[2] = (uint8_t) ((value & 0x0000ff00) >> 8); #if BIG_ENDIAN
apdu[3] = (uint8_t) (value & 0x000000ff); apdu[0] = in[0];
apdu[1] = in[1];
apdu[2] = in[2];
apdu[3] = in[3];
#else
apdu[0] = in[3];
apdu[1] = in[2];
apdu[2] = in[1];
apdu[3] = in[0];
#endif
return 4; return 4;
} }
@@ -103,13 +147,21 @@ int decode_unsigned32(
uint8_t * apdu, uint8_t * apdu,
uint32_t * value) uint32_t * value)
{ {
if (value) { uint8_t *out = (uint8_t *)value;
*value = ((uint32_t) ((((uint32_t) apdu[0]) << 24) & 0xff000000));
*value |= ((uint32_t) ((((uint32_t) apdu[1]) << 16) & 0x00ff0000));
*value |= ((uint32_t) ((((uint32_t) apdu[2]) << 8) & 0x0000ff00));
*value |= ((uint32_t) (((uint32_t) apdu[3]) & 0x000000ff));
}
if (out) {
#if BIG_ENDIAN
out[0] = apdu[0];
out[1] = apdu[1];
out[2] = apdu[2];
out[3] = apdu[3];
#else
out[0] = apdu[3];
out[1] = apdu[2];
out[2] = apdu[1];
out[3] = apdu[0];
#endif
}
return 4; return 4;
} }
@@ -142,25 +194,17 @@ int encode_signed16(
uint8_t * apdu, uint8_t * apdu,
int16_t value) int16_t value)
{ {
apdu[0] = (uint8_t) ((value & 0xff00) >> 8); return encode_unsigned16 (apdu, value);
apdu[1] = (uint8_t) (value & 0x00ff);
return 2;
} }
int decode_signed16( int decode_signed16(
uint8_t * apdu, uint8_t * apdu,
int32_t * value) int32_t * value)
{ {
if (value) { int16_t val;
/* negative - bit 7 is set */
if (apdu[0] & 0x80) decode_unsigned16 (apdu, (uint16_t *)&val);
*value = 0xFFFF0000; *value = (int32_t)val;
else
*value = 0;
*value |= ((int32_t) ((((int32_t) apdu[0]) << 8) & 0x0000ff00));
*value |= ((int32_t) (((int32_t) apdu[1]) & 0x000000ff));
}
return 2; return 2;
} }
@@ -169,11 +213,7 @@ int encode_signed24(
uint8_t * apdu, uint8_t * apdu,
int32_t value) int32_t value)
{ {
apdu[0] = (uint8_t) ((value & 0xff0000) >> 16); return encode_unsigned24 (apdu, value);
apdu[1] = (uint8_t) ((value & 0x00ff00) >> 8);
apdu[2] = (uint8_t) (value & 0x0000ff);
return 3;
} }
int decode_signed24( int decode_signed24(
@@ -181,14 +221,10 @@ int decode_signed24(
int32_t * value) int32_t * value)
{ {
if (value) { if (value) {
/* negative - bit 7 is set */ decode_unsigned24 (apdu, (uint32_t *)value);
if (apdu[0] & 0x80) if (*value & 0x00800000) {
*value = 0xFF000000; *value |= 0xFF000000;
else }
*value = 0;
*value |= ((int32_t) ((((int32_t) apdu[0]) << 16) & 0x00ff0000));
*value |= ((int32_t) ((((int32_t) apdu[1]) << 8) & 0x0000ff00));
*value |= ((int32_t) (((int32_t) apdu[2]) & 0x000000ff));
} }
return 3; return 3;
@@ -198,26 +234,14 @@ int encode_signed32(
uint8_t * apdu, uint8_t * apdu,
int32_t value) int32_t value)
{ {
apdu[0] = (uint8_t) ((value & 0xff000000) >> 24); return encode_unsigned32 (apdu, value);
apdu[1] = (uint8_t) ((value & 0x00ff0000) >> 16);
apdu[2] = (uint8_t) ((value & 0x0000ff00) >> 8);
apdu[3] = (uint8_t) (value & 0x000000ff);
return 4;
} }
int decode_signed32( int decode_signed32(
uint8_t * apdu, uint8_t * apdu,
int32_t * value) int32_t * value)
{ {
if (value) { return decode_unsigned32 (apdu, (uint32_t *)value);
*value = ((int32_t) ((((int32_t) apdu[0]) << 24) & 0xff000000));
*value |= ((int32_t) ((((int32_t) apdu[1]) << 16) & 0x00ff0000));
*value |= ((int32_t) ((((int32_t) apdu[2]) << 8) & 0x0000ff00));
*value |= ((int32_t) (((int32_t) apdu[3]) & 0x000000ff));
}
return 4;
} }
/* end of decoding_encoding.c */ /* end of decoding_encoding.c */