Fixed byte order and removed log functions from misc_tools

1 files changed, 1 insertions, 86 deletions

diff --git a/toxav/rtp.c b/toxav/rtp.c
index f44b2bfe..d4fdf656 100644
--- a/toxav/rtp.c
+++ b/toxav/rtp.c
@@ -26,6 +26,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #include "../toxcore/logger.h"
+#include "../toxcore/util.h"
 
 #include "rtp.h"
 #include <assert.h>
@@ -37,9 +38,6 @@
 
 #define size_32 4
 
-#define inline__ inline __attribute__((always_inline))
-
-
 #define ADD_FLAG_VERSION(_h, _v) do { ( _h->flags ) &= 0x3F; ( _h->flags ) |= ( ( ( _v ) << 6 ) & 0xC0 ); } while(0)
 #define ADD_FLAG_PADDING(_h, _v) do { if ( _v > 0 ) _v = 1; ( _h->flags ) &= 0xDF; ( _h->flags ) |= ( ( ( _v ) << 5 ) & 0x20 ); } while(0)
 #define ADD_FLAG_EXTENSION(_h, _v) do { if ( _v > 0 ) _v = 1; ( _h->flags ) &= 0xEF;( _h->flags ) |= ( ( ( _v ) << 4 ) & 0x10 ); } while(0)
@@ -56,89 +54,6 @@
 
 
 /**
- * @brief Converts 4 bytes to uint32_t
- *
- * @param dest Where to convert
- * @param bytes What bytes
- * @return void
- */
-inline__ void bytes_to_U32(uint32_t *dest, const uint8_t *bytes)
-{
-    *dest =
-#ifdef WORDS_BIGENDIAN
-        ( ( uint32_t ) *  bytes )              |
-        ( ( uint32_t ) * ( bytes + 1 ) << 8 )  |
-        ( ( uint32_t ) * ( bytes + 2 ) << 16 ) |
-        ( ( uint32_t ) * ( bytes + 3 ) << 24 ) ;
-#else
-        ( ( uint32_t ) *  bytes        << 24 ) |
-        ( ( uint32_t ) * ( bytes + 1 ) << 16 ) |
-        ( ( uint32_t ) * ( bytes + 2 ) << 8 )  |
-        ( ( uint32_t ) * ( bytes + 3 ) ) ;
-#endif
-}
-
-/**
- * @brief Converts 2 bytes to uint16_t
- *
- * @param dest Where to convert
- * @param bytes What bytes
- * @return void
- */
-inline__ void bytes_to_U16(uint16_t *dest, const uint8_t *bytes)
-{
-    *dest =
-#ifdef WORDS_BIGENDIAN
-        ( ( uint16_t ) *   bytes ) |
-        ( ( uint16_t ) * ( bytes + 1 ) << 8 );
-#else
-        ( ( uint16_t ) *   bytes << 8 ) |
-        ( ( uint16_t ) * ( bytes + 1 ) );
-#endif
-}
-
-/**
- * @brief Convert uint32_t to byte string of size 4
- *
- * @param dest Where to convert
- * @param value The value
- * @return void
- */
-inline__ void U32_to_bytes(uint8_t *dest, uint32_t value)
-{
-#ifdef WORDS_BIGENDIAN
-    *(dest)     = ( value );
-    *(dest + 1) = ( value >> 8 );
-    *(dest + 2) = ( value >> 16 );
-    *(dest + 3) = ( value >> 24 );
-#else
-    *(dest)     = ( value >> 24 );
-    *(dest + 1) = ( value >> 16 );
-    *(dest + 2) = ( value >> 8 );
-    *(dest + 3) = ( value );
-#endif
-}
-
-/**
- * @brief Convert uint16_t to byte string of size 2
- *
- * @param dest Where to convert
- * @param value The value
- * @return void
- */
-inline__ void U16_to_bytes(uint8_t *dest, uint16_t value)
-{
-#ifdef WORDS_BIGENDIAN
-    *(dest)     = ( value );
-    *(dest + 1) = ( value >> 8 );
-#else
-    *(dest)     = ( value >> 8 );
-    *(dest + 1) = ( value );
-#endif
-}
-
-
-/**
  * @brief Checks if message came in late.
  *
  * @param session Control session.