move debugging into read/write fns

1 files changed, 13 insertions, 14 deletions

diff --git a/dl3.c b/dl3.c
index 340a078..ddde8b3 100644
--- a/dl3.c
+++ b/dl3.c
@@ -161,18 +161,29 @@ static int write_to_usb(libusb_device_handle *handle, int endpoint_out,
 			libusb_clear_halt(handle, endpoint_out);
 		i++;
 	} while ((r == LIBUSB_ERROR_PIPE) && (i < 5));
+
+	printf("tx: %d:", *size);
+	for (i = 0; i < *size; i++) {
+		printf("%02x ", buf[i]);
+	}
+	printf("\n");
 	return r;
 }
 
 static int block_read_usb(libusb_device_handle *handle, int endpoint_in,
 			  uint8_t *buf, int *size)
 {
-	int r;
+	int r, i;
 
 	r = libusb_bulk_transfer(handle, endpoint_in, buf, 1024, size, 1000);
 	if (r < 0) {
 		printf("libusb_bulk_transfer failed: %s\n", libusb_error_name(r));
 	}
+	printf("rx: %d:", *size);
+	for (i = 0; i < *size; i++) {
+		printf("%02x ", buf[i]);
+	}
+	printf("\n");
 	return r;
 }
 
@@ -206,18 +217,12 @@ static int send_buffer(libusb_device_handle *handle, int endpoint_out, int endpo
 	r = block_read_usb(handle, endpoint_in, buf, &size);
 	if (r < 0)
 		return r;
-	printf(" rx %d\n", size);
-
-	for (i = 0; i < size; i++) {
-		printf("%02x ", buf[i]);
-	}
-	printf("\n");
 
 	r = block_read_usb(handle, endpoint_in, buf, &size);	
 	if (r < 0)
 		return r;
-	printf(" rx %d\n", size);
 
+	/* special cert print */
 	printf("{");
 	for (i = 0; i < size; i++) {
 		printf("0x%02x, ", buf[i]);
@@ -238,12 +243,6 @@ static int send_buffer(libusb_device_handle *handle, int endpoint_out, int endpo
 		r = block_read_usb(handle, endpoint_in, buf, &size);	
 		if (r < 0)
 			return r;
-		printf(" rx %d\n", size);
-		
-		for (i = 0; i < size; i++) {
-			printf("%02x ", buf[i]);
-		}
-		printf("\n");
 	} while (1);
 	return 0;
 }