From 3133af897443ca9f5504e50f304181452f29ec5e Mon Sep 17 00:00:00 2001 From: XANTRONIX Development Date: Wed, 29 Nov 2017 22:08:17 -0600 Subject: [PATCH] ENDIANNNNNNNN --- examples/test.c | 25 +++++-------------------- examples/test.c-e | 25 +++++-------------------- src/util.h | 3 +++ 3 files changed, 13 insertions(+), 40 deletions(-) diff --git a/examples/test.c b/examples/test.c index c5eb5d2..86fa17f 100644 --- a/examples/test.c +++ b/examples/test.c @@ -33,17 +33,17 @@ static int answer_music_message(skipstone_message_service *service, skipstone_message_append_string(message, "KMFDM", 5); skipstone_message_append_string(message, "Nihil", 5); skipstone_message_append_string(message, "Ultra", 5); - skipstone_message_append_uint32(message, htobe32(274)); - skipstone_message_append_uint16(message, htobe16(10)); - skipstone_message_append_uint16(message, htobe16(1)); + skipstone_message_append_uint32(message, htole32(274)); + skipstone_message_append_uint16(message, htole16(10)); + skipstone_message_append_uint16(message, htole16(1)); skipstone_message_service_queue(service, message, 32); skipstone_message_destroy(message); message = skipstone_message_new(); skipstone_message_append_uint8(message, 0x11); skipstone_message_append_uint8(message, 1); - skipstone_message_append_uint32(message, htobe32(120)); - skipstone_message_append_uint32(message, htobe32(1)); + skipstone_message_append_uint32(message, htole32(120)); + skipstone_message_append_uint32(message, htole32(320)); skipstone_message_append_uint8(message, 1); skipstone_message_append_uint8(message, 1); skipstone_message_service_queue(service, message, 32); @@ -91,9 +91,6 @@ int main(int argc, char **argv) { skipstone_message_service_register(service, 32, answer_music_message, NULL); skipstone_message_service_register(service, 33, answer_phone_message, NULL); - time_t start = time(NULL); - int done = 0; - while (1) { struct timeval timeout = { .tv_sec = 0, @@ -105,18 +102,6 @@ int main(int argc, char **argv) { goto error_io; } - - if (!done && time(NULL) - start >= 10) { - skipstone_message *message = skipstone_message_new(); - skipstone_message_append_uint8(message, 4); - skipstone_message_append_uint32(message, htobe32(0xdeadbeef)); - skipstone_message_append_string(message, "+19004206969", 12); - skipstone_message_append_string(message, "XANTRONIX ehf", 13); - skipstone_message_service_queue(service, message, 0x21); - skipstone_message_destroy(message); - - done = 1; - } } skipstone_link_close(link); diff --git a/examples/test.c-e b/examples/test.c-e index 53eff9e..86fa17f 100644 --- a/examples/test.c-e +++ b/examples/test.c-e @@ -33,17 +33,17 @@ static int answer_music_message(skipstone_message_service *service, skipstone_message_append_string(message, "KMFDM", 5); skipstone_message_append_string(message, "Nihil", 5); skipstone_message_append_string(message, "Ultra", 5); - skipstone_message_append_uint32(message, htobe32(274)); - skipstone_message_append_uint16(message, htobe16(10)); - skipstone_message_append_uint16(message, htobe16(1)); + skipstone_message_append_uint32(message, htole32(274)); + skipstone_message_append_uint16(message, htole16(10)); + skipstone_message_append_uint16(message, htole16(1)); skipstone_message_service_queue(service, message, 32); skipstone_message_destroy(message); message = skipstone_message_new(); skipstone_message_append_uint8(message, 0x11); skipstone_message_append_uint8(message, 1); - skipstone_message_append_uint32(message, htobe32(120)); - skipstone_message_append_uint32(message, htobe32(1)); + skipstone_message_append_uint32(message, htole32(120)); + skipstone_message_append_uint32(message, htole32(320)); skipstone_message_append_uint8(message, 1); skipstone_message_append_uint8(message, 1); skipstone_message_service_queue(service, message, 32); @@ -91,9 +91,6 @@ int main(int argc, char **argv) { skipstone_message_service_register(service, 32, answer_music_message, NULL); skipstone_message_service_register(service, 33, answer_phone_message, NULL); - time_t start = time(NULL); - int done = 0; - while (1) { struct timeval timeout = { .tv_sec = 0, @@ -105,18 +102,6 @@ int main(int argc, char **argv) { goto error_io; } - - if (!done && time(NULL) - start >= 10) { - skipstone_message *message = skipstone_message_new(); - skipstone_message_append_uint8(message, 4); - skipstone_message_append_uint32(message, htobe32(0xdeadbeef)); - skipstone_message_append_string(message, "+19005556969", 12); - skipstone_message_append_string(message, "XANTRONIX ehf", 13); - skipstone_message_service_queue(service, message, 0x21); - skipstone_message_destroy(message); - - done = 1; - } } skipstone_link_close(link); diff --git a/src/util.h b/src/util.h index 534479c..02b6640 100644 --- a/src/util.h +++ b/src/util.h @@ -26,14 +26,17 @@ #ifdef __DO_SWAP_BYTES #define be16toh(v) ((uint16_t)bswap16((uint16_t)v)) #define be32toh(v) ((uint32_t)bswap32((uint32_t)v)) +#define be64toh(v) ((uint64_t)bswap64((uint64_t)v)) #define htobe16(v) ((uint16_t)bswap16((uint16_t)v)) #define htobe32(v) ((uint32_t)bswap32((uint32_t)v)) #define htobe64(v) ((uint64_t)bswap64((uint64_t)v)) +#define htole16(v) ((uint16_t)v) #define htole32(v) ((uint32_t)v) #define htole64(v) ((uint64_t)v) #else #define be16toh(v) ((uint16_t)v) #define be32toh(v) ((uint32_t)v) +#define be32toh(v) ((uint32_t)v) #define htobe16(v) ((uint16_t)v) #define htobe32(v) ((uint32_t)v) #define htobe64(v) ((uint64_t)v)