remove hexdump2, use printf_hexdump instead

MSP-EXP430F5438-CC256x/example-ant/ant-test.c

@@ -23,6 +23,7 @@
 #include <btstack/hci_cmds.h>
 #include <btstack/run_loop.h>
 #include <btstack/sdp_util.h>
+#include <btstack/utils.h>
 
 #include "hci.h"
 #include "l2cap.h"
@@ -38,14 +39,6 @@ static uint8_t   rfcomm_channel_nr = 1;
 static uint16_t  rfcomm_channel_id = 0;
 static uint8_t   spp_service_buffer[100];
 
-void hexdump2(void const *data, int size){
-    int i;
-    for (i=0; i<size;i++){
-        printf("%02X ", ((uint8_t *)data)[i]);
-    }
-    printf("\n");
-}
-
 
 // Bluetooth logic
 static void packet_handler (void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
@@ -129,7 +122,7 @@ static void packet_handler (void * connection, uint8_t packet_type, uint16_t cha
 					event_code = packet[7];
 
                 	printf("ANT Event: ");
-                	hexdump2(packet, size);
+                	printf_hexdump(packet, size);
 
 					switch(event_code){
 						

MSP-EXP430F5438-CC256x/example-ble/ble_server.c

@@ -105,14 +105,6 @@ void overwriteLine(int line, char *text){
     halLcdPrintLine(text, line, 0);
 }
 
-void hexdump2(void *data, int size){
-    int i;
-    for (i=0; i<size;i++){
-        printf("%02X ", ((uint8_t *)data)[i]);
-    }
-    printf("\n");
-}
-
 // enable LE, setup ADV data
 static void app_packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
     if (packet_type != HCI_EVENT_PACKET) return;

example/l2cap-server.c

@@ -71,7 +71,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 		case L2CAP_DATA_PACKET:
 			// just dump data for now
 			printf("source cid %x -- ", channel);
-			hexdump( packet, size );
+			printf_hexdump( packet, size );
 			break;
 			
 		case HCI_EVENT_PACKET:

example/libusb/ancs_client.c

@@ -290,7 +290,7 @@ void handle_gatt_client_event(le_event_t * event){
                     sizeof(get_notification_attributes), get_notification_attributes);
             } else {
                 printf("Unknown Source: ");
-                hexdump(value_event->blob , value_event->blob_length);
+                printf_hexdump(value_event->blob , value_event->blob_length);
             }
             break;
         default:

example/libusb/ble_client.c

@@ -75,15 +75,6 @@ typedef struct ad_event {
 void (*ble_client_packet_handler)(uint8_t packet_type, uint8_t *packet, uint16_t size) = NULL;
 static void ble_packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
 
-static void hexdump2(void *data, int size){
-    if (size <= 0) return;
-    int i;
-    for (i=0; i<size;i++){
-        printf("%02X ", ((uint8_t *)data)[i]);
-    }
-    // printf("\n");
-}
-
 void ble_client_init(){
     gatt_client_init();
     l2cap_register_packet_handler(ble_packet_handler);
@@ -129,7 +120,7 @@ static void dump_characteristic(le_characteristic_t * characteristic){
 static void dump_ad_event(ad_event_t * e){
     printf("    *** adv. event *** evt-type %u, addr-type %u, addr %s, rssi %u, length adv %u, data: ", e->event_type, 
                             e->address_type, bd_addr_to_str(e->address), e->rssi, e->length);
-    hexdump2(e->data, e->length);
+    printf_hexdump(e->data, e->length);
     
 }
 
@@ -143,13 +134,13 @@ static void dump_descriptor(le_event_t * event){
     le_characteristic_descriptor_event_t * devent = (le_characteristic_descriptor_event_t *) event;
     le_characteristic_descriptor_t descriptor = devent->characteristic_descriptor;
     printf("    *** descriptor *** handle 0x%02x, value ", descriptor.handle);
-    hexdump2(devent->value, devent->value_length);
+    printf_hexdump(devent->value, devent->value_length);
     printUUID(descriptor.uuid128, descriptor.uuid16);
 }
 
 static void dump_characteristic_value(le_characteristic_value_event_t * event){
     printf("    *** characteristic value of length %d *** ", event->blob_length );
-    hexdump2(event->blob , event->blob_length);
+    printf_hexdump(event->blob , event->blob_length);
     printf("\n");
 }
 

example/libusb/ble_peripheral.c

@@ -363,7 +363,7 @@ static uint16_t att_read_callback(uint16_t con_handle, uint16_t attribute_handle
         att_value_len = att_attributes[index].len;
     }
     printf("Attribute len %u, data: ", att_value_len);
-    hexdump(att_value, att_value_len);
+    printf_hexdump(att_value, att_value_len);
 
     // assert offset <= att_value_len
     if (offset > att_value_len) {
@@ -381,7 +381,7 @@ static uint16_t att_read_callback(uint16_t con_handle, uint16_t attribute_handle
 // write requests
 static int att_write_callback(uint16_t con_handle, uint16_t attribute_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size){
     printf("WRITE Callback, handle %04x, mode %u, offset %u, data: ", handle, transaction_mode, offset);
-    hexdump(buffer, buffer_size);
+    printf_hexdump(buffer, buffer_size);
 
     uint16_t uuid16 = att_uuid_for_handle(handle);
     switch (uuid16){
@@ -617,7 +617,7 @@ void show_usage(){
     printf("\n--- CLI for LE Peripheral ---\n");
     printf("GAP: discoverable %u, connectable %u, bondable %u, directed connectable %u, random addr %u, ads enabled %u, adv type %u \n",
         gap_discoverable, gap_connectable, gap_bondable, gap_directed_connectable, gap_random, gap_advertisements, gap_adv_type());
-    printf("ADV: "); hexdump(adv_data, adv_data_len);
+    printf("ADV: "); printf_hexdump(adv_data, adv_data_len);
     printf("SM: %s, MITM protection %u, OOB data %u, key range [%u..16]\n",
         sm_io_capabilities, sm_mitm_protection, sm_have_oob_data, sm_min_key_size);
     printf("Default value: '%s'\n", att_default_value_long ? default_value_long : default_value_short);

example/libusb/gatt_browser.c

@@ -104,7 +104,7 @@ static void printUUID(uint8_t * uuid128, uint16_t uuid16){
 static void dump_advertising_report(advertising_report_t * e){
     printf("    * adv. event: evt-type %u, addr-type %u, addr %s, rssi %u, length adv %u, data: ", e->event_type,
            e->address_type, bd_addr_to_str(e->address), e->rssi, e->length);
-    hexdump(e->data, e->length);
+    printf_hexdump(e->data, e->length);
     
 }
 

example/libusb/spp_and_le_counter.c

@@ -178,7 +178,7 @@ static uint16_t att_read_callback(uint16_t con_handle, uint16_t att_handle, uint
 // write requests
 static int att_write_callback(uint16_t con_handle, uint16_t att_handle, uint16_t transaction_mode, uint16_t offset, uint8_t *buffer, uint16_t buffer_size){
     // printf("WRITE Callback, handle %04x, mode %u, offset %u, data: ", handle, transaction_mode, offset);
-    // hexdump(buffer, buffer_size);
+    // printf_hexdump(buffer, buffer_size);
     if (att_handle != ATT_CHARACTERISTIC_0000FF11_0000_1000_8000_00805F9B34FB_01_CLIENT_CONFIGURATION_HANDLE) return 0;
     le_notification_enabled = READ_BT_16(buffer, 0) == GATT_CLIENT_CHARACTERISTICS_CONFIGURATION_NOTIFICATION;
     return 0;

example/rfcomm-cat.c

@@ -68,7 +68,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 			
 		case RFCOMM_DATA_PACKET:
 			printf("Received RFCOMM data on channel id %u, size %u\n", channel, size);
-			hexdump(packet, size);
+			printf_hexdump(packet, size);
 			break;
 			
 		case HCI_EVENT_PACKET:

example/rfcomm-echo.c

@@ -146,7 +146,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 			
 		case RFCOMM_DATA_PACKET:
 			printf("Received RFCOMM data on channel id %u, size %u\n", channel, size);
-			hexdump(packet, size);
+			printf_hexdump(packet, size);
             bt_send_rfcomm(channel, packet, size);
 			break;
 			

example/rfcomm-test.c

@@ -150,7 +150,7 @@ void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint
 			
 		case RFCOMM_DATA_PACKET:
 			printf("Received RFCOMM data on channel id %u, size %u\n", channel, size);
-			hexdump(packet, size);
+			printf_hexdump(packet, size);
             bt_send_rfcomm(channel, packet, size);
 			break;
 			

include/btstack/utils.h

@@ -130,6 +130,7 @@ void swap56(const uint8_t  src[7],  uint8_t dst[7]);
 void swap64(const uint8_t  src[8],  uint8_t dst[8]);
 void swap128(const uint8_t src[16], uint8_t dst[16]);
 
+void printf_hexdump(const void *data, int size);
 void hexdump(const void *data, int size);
 void printUUID128(uint8_t *uuid);
 void log_key(const char * name, sm_key_t key);

src/hci_dump.c

@@ -171,7 +171,7 @@ void hci_dump_packet(uint8_t packet_type, uint8_t in, uint8_t *packet, uint16_t
                 default:
                     return;
             }
-            hexdump(packet, len);
+            printf_hexdump(packet, len);
             break;
         }
             

src/sdp_util.c

@@ -597,7 +597,7 @@ static int de_traversal_dump_data(uint8_t * element, de_type_t de_type, de_size_
                 break;
         }
         printf("len %u (0x%02x)\n", len, len);
-        hexdump(&element[pos], len);
+        printf_hexdump(&element[pos], len);
     } else {
         uint32_t value = 0;
         switch (de_size) {

src/utils.c

@@ -106,6 +106,15 @@ char char_for_nibble(int nibble){
     return '?';
 }
 
+void printf_hexdump(const void *data, int size){
+    if (size <= 0) return;
+    int i;
+    for (i=0; i<size;i++){
+        printf("%02X ", ((uint8_t *)data)[i]);
+    }
+    printf("\n");
+}
+
 void hexdump(const void *data, int size){
     char buffer[6*16+1];
     int i, j;

test/ble_client/advertising_data_parser.c

@@ -77,7 +77,7 @@ static hci_transport_t dummy_transport = {
 static void dump_ad_event(ad_event_t * e){
     printf(" * adv. event: evt-type %u, addr-type %u, addr %s, rssi %u, length adv %u, data: ", e->event_type,
            e->address_type, bd_addr_to_str(e->address), e->rssi, e->length);
-    hexdump(e->data, e->length);
+    printf_hexdump(e->data, e->length);
     
 }
 
@@ -98,7 +98,7 @@ void packet_handler(uint8_t packet_type, uint8_t *packet, uint16_t size){
 
     printf("\ndata: \n");
 
-    hexdump(packet, size);
+    printf_hexdump(packet, size);
 
     printf("\n");
 }

test/security_manager/security_manager.c

@@ -15,6 +15,7 @@
 #include "CppUTest/CommandLineTestRunner.h"
 
 #include <btstack/hci_cmds.h>
+#include <btstack/utils.h>
 
 #include "btstack_memory.h"
 #include "hci.h"
@@ -111,21 +112,14 @@ uint8_t * mock_packet_buffer(void);
 uint16_t mock_packet_buffer_len(void);
 void mock_clear_packet_buffer(void);
 
-void hexdump2(void const *data, int size){
-    int i;
-    for (i=0; i<size;i++){
-        printf("%02X ", ((uint8_t *)data)[i]);
-    }
-    printf("\n");
-}
 
 void CHECK_EQUAL_ARRAY(uint8_t * expected, uint8_t * actual, int size){
 	int i;
 	for (i=0; i<size; i++){
 		if (expected[i] != actual[i]) {
 			printf("offset %u wrong\n", i);
-			printf("expected: "); hexdump2(expected, size);
-			printf("actual:   "); hexdump2(actual, size);
+			printf("expected: "); printf_hexdump(expected, size);
+			printf("actual:   "); printf_hexdump(actual, size);
 		}
 		BYTES_EQUAL(expected[i], actual[i]);
 	}