marrub
/
spingle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move Read* functions to common.h

master
an 2019-12-03 09:24:06 -05:00
parent 654fe5af8a
commit 98eec98361
2 changed files with 56 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
source/common.c
View File

@ -569,64 +569,6 @@ static float FloatNoSwap(float f)
return f;
}
int16_t ReadBigShort(byte *bytes)
{
int16_t v;
v = bytes[1];
v |= bytes[0] << 8;
return v;
}
int32_t ReadBigLong(byte *bytes)
{
int32_t v;
v = bytes[3];
v |= bytes[2] << 8;
v |= bytes[1] << 16;
v |= bytes[0] << 24;
return v;
}
float ReadBigFloat(byte *bytes)
{
union
{
float f;
uint32_t i;
} data;
data.i = ReadBigLong(bytes);
return data.f;
}
int16_t ReadLittleShort(byte *bytes)
{
int16_t v;
v = bytes[0];
v |= bytes[1] << 8;
return v;
}
int32_t ReadLittleLong(byte *bytes)
{
int32_t v;
v = bytes[0];
v |= bytes[1] << 8;
v |= bytes[2] << 16;
v |= bytes[3] << 24;
return v;
}
float ReadLittleFloat(byte *bytes)
{
union
{
float f;
uint32_t i;
} data;
data.i = ReadLittleLong(bytes);
return data.f;
}
/*
==============================================================================

62
source/common.h
View File

@ -74,13 +74,63 @@ extern int16_t (*LittleShort)(int16_t l);
extern int32_t (*LittleLong)(int32_t l);
extern float (*LittleFloat)(float l);
int16_t ReadBigShort(byte *bytes);
int32_t ReadBigLong(byte *bytes);
float ReadBigFloat(byte *bytes);
static inline int16_t ReadBigShort(byte const *bytes)
{
int16_t v;
v = bytes[1];
v |= bytes[0] << 8;
return v;
}
int16_t ReadLittleShort(byte *bytes);
int32_t ReadLittleLong(byte *bytes);
float ReadLittleFloat(byte *bytes);
static inline int32_t ReadBigLong(byte const *bytes)
{
int32_t v;
v = bytes[3];
v |= bytes[2] << 8;
v |= bytes[1] << 16;
v |= bytes[0] << 24;
return v;
}
static inline float ReadBigFloat(byte const *bytes)
{
union
{
float f;
uint32_t i;
} data;
data.i = ReadBigLong(bytes);
return data.f;
}
static inline int16_t ReadLittleShort(byte const *bytes)
{
int16_t v;
v = bytes[0];
v |= bytes[1] << 8;
return v;
}
static inline int32_t ReadLittleLong(byte const *bytes)
{
int32_t v;
v = bytes[0];
v |= bytes[1] << 8;
v |= bytes[2] << 16;
v |= bytes[3] << 24;
return v;
}
static inline float ReadLittleFloat(byte const *bytes)
{
union
{
float f;
uint32_t i;
} data;
data.i = ReadLittleLong(bytes);
return data.f;
}
//============================================================================