X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fbyteorder.h;h=4730eb5bca9bd566b81ef2083031b650bc30b35b;hb=a1d43c00e1504fd5e7e89d84516c0a8c86883ce9;hp=b1c2df9da1e19f2eab1ec780bee177313b268e01;hpb=ba5e53171634dae4368928f7353c5ee112624a22;p=bertos.git diff --git a/mware/byteorder.h b/mware/byteorder.h index b1c2df9d..4730eb5b 100755 --- a/mware/byteorder.h +++ b/mware/byteorder.h @@ -13,15 +13,24 @@ * \author Stefano Fedrigo */ -/* - * $Log$ - * Revision 1.2 2004/07/20 17:09:11 bernie - * swab16(), swab32(), cpu_to_be32(), cpu_to_le32(): New functions. - * - * Revision 1.1 2004/07/20 16:26:15 bernie - * Import byte-order macros into DevLib. - * - */ +/*#* + *#* $Log$ + *#* Revision 1.5 2004/08/25 14:12:09 rasky + *#* Aggiornato il comment block dei log RCS + *#* + *#* 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.1 2004/07/20 16:26:15 bernie + *#* Import byte-order macros into DevLib. + *#* + *#*/ #ifndef MWARE_BYTEORDER_H #define MWARE_BYTEORDER_H @@ -32,7 +41,6 @@ /*! * \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) @@ -42,8 +50,7 @@ INLINE uint16_t swab16(uint16_t x) /*! * \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) @@ -51,25 +58,21 @@ INLINE uint16_t swab32(uint16_t x) | ((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_le16(uint16_t 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_le32(uint32_t x); INLINE uint32_t cpu_to_le32(uint32_t x) { return (CPU_BYTE_ORDER == CPU_BIG_ENDIAN) ? swab32(x) : x;