moved swapX functions into utils.c

This commit is contained in:
matthias.ringwald@gmail.com 2014-02-28 21:07:59 +00:00
parent 79de7a1b4b
commit 1fb05f9241
4 changed files with 25 additions and 25 deletions

View File

@ -302,25 +302,6 @@ static const stk_generation_method_t stk_generation_method[5][5] = {
static void sm_run();
// Utils
static inline void swapX(uint8_t *src, uint8_t *dst, int len){
int i;
for (i = 0; i < len; i++)
dst[len - 1 - i] = src[i];
}
static inline void swap24(uint8_t src[3], uint8_t dst[3]){
swapX(src, dst, 3);
}
static inline void swap56(uint8_t src[7], uint8_t dst[7]){
swapX(src, dst, 7);
}
static inline void swap64(uint8_t src[8], uint8_t dst[8]){
swapX(src, dst, 8);
}
static inline void swap128(uint8_t src[16], uint8_t dst[16]){
swapX(src, dst, 16);
}
static void print_hex16(const char * name, uint16_t value){
printf("%-6s 0x%04x\n", name, value);
}

View File

@ -83,12 +83,6 @@ uint8_t * ad_iterator_get_data(ad_context_t * context){
return &context->data[context->offset + 2];
}
static inline void swap128(uint8_t src[16], uint8_t dst[16]){
int i;
for (i = 0; i < 16; i++)
dst[15 - i] = src[i];
}
int ad_data_contains_uuid16(uint8_t ad_len, uint8_t * ad_data, uint16_t uuid16){
ad_context_t context;
for (ad_iterator_init(&context, ad_len, ad_data) ; ad_iterator_has_more(&context) ; ad_iterator_next(&context)){

View File

@ -124,6 +124,12 @@ void bt_flip_addr(bd_addr_t dest, bd_addr_t src);
void net_store_16(uint8_t *buffer, uint16_t pos, uint16_t value);
void net_store_32(uint8_t *buffer, uint16_t pos, uint32_t value);
void swapX(uint8_t *src, uint8_t *dst, int len);
void swap24(uint8_t src[3], uint8_t dst[3]);
void swap56(uint8_t src[7], uint8_t dst[7]);
void swap64(uint8_t src[8], uint8_t dst[8]);
void swap128(uint8_t src[16], uint8_t dst[16]);
void hexdump(void *data, int size);
void printUUID(uint8_t *uuid);
void print_key(const char * name, sm_key_t key);

View File

@ -80,6 +80,25 @@ void bt_flip_addr(bd_addr_t dest, bd_addr_t src){
dest[5] = src[0];
}
// general swap/endianess utils
void swapX(uint8_t *src, uint8_t *dst, int len){
int i;
for (i = 0; i < len; i++)
dst[len - 1 - i] = src[i];
}
void swap24(uint8_t src[3], uint8_t dst[3]){
swapX(src, dst, 3);
}
void swap56(uint8_t src[7], uint8_t dst[7]){
swapX(src, dst, 7);
}
void swap64(uint8_t src[8], uint8_t dst[8]){
swapX(src, dst, 8);
}
void swap128(uint8_t src[16], uint8_t dst[16]){
swapX(src, dst, 16);
}
void hexdump(void *data, int size){
int i;
for (i=0; i<size;i++){