projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust for DevLib.
[bertos.git]
/
mware
/
byteorder.h
diff --git
a/mware/byteorder.h
b/mware/byteorder.h
index b1c2df9da1e19f2eab1ec780bee177313b268e01..8bd11c4f31bb4217bbce55982a178051e7d7d42b 100755
(executable)
--- a/
mware/byteorder.h
+++ b/
mware/byteorder.h
@@
-15,6
+15,12
@@
/*
* $Log$
/*
* $Log$
+ * Revision 1.4 2004/07/22 01:08:43 bernie
+ * swab32(): Fix a very serious bug.
+ *
+ * Revision 1.3 2004/07/20 23:47:12 bernie
+ * Finally remove redundant protos.
+ *
* Revision 1.2 2004/07/20 17:09:11 bernie
* swab16(), swab32(), cpu_to_be32(), cpu_to_le32(): New functions.
*
* Revision 1.2 2004/07/20 17:09:11 bernie
* swab16(), swab32(), cpu_to_be32(), cpu_to_le32(): New functions.
*
@@
-32,7
+38,6
@@
/*!
* \brief Swap upper and lower bytes in a 16-bit value.
*/
/*!
* \brief Swap upper and lower bytes in a 16-bit value.
*/
-INLINE uint16_t swab16(uint16_t x);
INLINE uint16_t swab16(uint16_t x)
{
return ((x & (uint16_t)0x00FFU) << 8)
INLINE uint16_t swab16(uint16_t x)
{
return ((x & (uint16_t)0x00FFU) << 8)
@@
-42,8
+47,7
@@
INLINE uint16_t swab16(uint16_t x)
/*!
* \brief Reverse bytes in a 32-bit value (e.g.: 0x12345678 -> 0x78563412).
*/
/*!
* \brief Reverse bytes in a 32-bit value (e.g.: 0x12345678 -> 0x78563412).
*/
-INLINE uint16_t swab32(uint16_t x);
-INLINE uint16_t swab32(uint16_t x)
+INLINE uint32_t swab32(uint32_t x)
{
return ((x & (uint32_t)0x000000FFUL) << 24)
| ((x & (uint32_t)0x0000FF00UL) << 8)
{
return ((x & (uint32_t)0x000000FFUL) << 24)
| ((x & (uint32_t)0x0000FF00UL) << 8)
@@
-51,25
+55,21
@@
INLINE uint16_t swab32(uint16_t x)
| ((x & (uint32_t)0xFF000000UL) >> 24);
}
| ((x & (uint32_t)0xFF000000UL) >> 24);
}
-INLINE uint16_t cpu_to_be16(uint16_t x);
INLINE uint16_t cpu_to_be16(uint16_t x)
{
return (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN) ? swab16(x) : x;
}
INLINE uint16_t cpu_to_be16(uint16_t x)
{
return (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN) ? swab16(x) : x;
}
-INLINE uint16_t cpu_to_le16(uint16_t x);
INLINE uint16_t cpu_to_le16(uint16_t x)
{
return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab16(x) : x;
}
INLINE uint16_t cpu_to_le16(uint16_t x)
{
return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab16(x) : x;
}
-INLINE uint32_t cpu_to_be32(uint32_t x);
INLINE uint32_t cpu_to_be32(uint32_t x)
{
return (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN) ? swab32(x) : x;
}
INLINE uint32_t cpu_to_be32(uint32_t x)
{
return (CPU_BYTE_ORDER == CPU_LITTLE_ENDIAN) ? swab32(x) : x;
}
-INLINE uint32_t cpu_to_le32(uint32_t x);
INLINE uint32_t cpu_to_le32(uint32_t x)
{
return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab32(x) : x;
INLINE uint32_t cpu_to_le32(uint32_t x)
{
return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab32(x) : x;