split usb rw fns out

1 files changed, 65 insertions, 44 deletions

diff --git a/dl3.c b/dl3.c
index b35d24c..a2d9a53 100644
--- a/dl3.c
+++ b/dl3.c
@@ -261,54 +261,62 @@ static void decode_cert(const unsigned char *buf, int len)
 #endif
 	printf("ret is %d\n", ret);
 }
-static int send_buffer(libusb_device_handle *handle, int endpoint_out, int endpoint_in)
-{
-	unsigned char buf[1024];
-	int r, i = 0;
-	int size;
-
-	memset(buf, 0, 255);
-#if 0
-	buf[2] = 0x1c;
-	buf[4] = 0x02;
-	buf[8] = 0x25;
-	buf[16] = 0x05;
-#endif
-
-	buf[2] = 0x0c;
-	buf[4] = 0x01;
 
-	do {
-		r = libusb_bulk_transfer(handle, endpoint_out, buf, 16, &size, 1000);
-		if (r == LIBUSB_ERROR_PIPE)
-			libusb_clear_halt(handle, endpoint_out);
-		i++;
-	} while ((r == LIBUSB_ERROR_PIPE) && (i < 5));
-
-	buf[2] = 0x1c;
-	buf[4] = 0x02;
-	buf[8] = 0x25;
-	buf[16] = 0x05;
-
-	do {
-		r = libusb_bulk_transfer(handle, endpoint_out, buf, 32, &size, 1000);
+static int write_to_usb(libusb_device_handle *handle, int endpoint_out,
+			const uint8_t *buf, int len, int *size)
+{
+	int i = 0, r;
+  	do {
+		r = libusb_bulk_transfer(handle, endpoint_out, buf, len, size, 1000);
 		if (r == LIBUSB_ERROR_PIPE)
 			libusb_clear_halt(handle, endpoint_out);
 		i++;
 	} while ((r == LIBUSB_ERROR_PIPE) && (i < 5));
+	return r;
+}
 
-	do {
-		r = libusb_bulk_transfer(handle, endpoint_out, buf0, 84, &size, 1000);
-		if (r == LIBUSB_ERROR_PIPE)
-			libusb_clear_halt(handle, endpoint_out);
-		i++;
-	} while ((r == LIBUSB_ERROR_PIPE) && (i < 5));
+static int block_read_usb(libusb_device_handle *handle, int endpoint_in,
+			  uint8_t *buf, int *size)
+{
+	int r;
 
-	r = libusb_bulk_transfer(handle, endpoint_in, buf, 38, &size, 1000);
+	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));
-		return;
 	}
+	return r;
+}
+
+static int send_buffer(libusb_device_handle *handle, int endpoint_out, int endpoint_in)
+{
+	unsigned char buf[1024];
+	int r, i = 0;
+	int size;
+	int len2, len;
+
+	dl3_empty_packet(buf, &len);
+	r = write_to_usb(handle, endpoint_out, buf, len, &size);
+	if (r != 0)
+		return r;
+
+	dl3_msg2_hdr25(buf, &len);
+	r = write_to_usb(handle, endpoint_out, buf, len, &size);
+	if (r != 0)
+		return r;
+
+	memset(buf, 0, 1024);
+	dl3_msg2_hdr04(buf, &len);
+	len2 = len;
+	dl3_packet_hdcp_ake_init(&buf[len], &len);
+	len2 += len;
+	len2 = ROUND_TO_4(len2);
+	r = write_to_usb(handle, endpoint_out, buf, len2, &size);
+	if (r != 0)
+		return r;
+
+	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++) {
@@ -316,11 +324,9 @@ static int send_buffer(libusb_device_handle *handle, int endpoint_out, int endpo
 	}
 	printf("\n");
 
-	r = libusb_bulk_transfer(handle, endpoint_in, buf, 546, &size, 1000);
-	if (r < 0) {
-		printf("libusb_bulk_transfer failed: %s\n", libusb_error_name(r));
-		return;
-	}
+	r = block_read_usb(handle, endpoint_in, buf, &size);	
+	if (r < 0)
+		return r;
 	printf(" rx %d\n", size);
 
 	printf("{");
@@ -333,8 +339,23 @@ static int send_buffer(libusb_device_handle *handle, int endpoint_out, int endpo
 
 	decode_cert(buf, size);
 
-	return 0;
+	dl3_packet_hdcp_ake_no_stored_km(buf, &len);
+	len = ROUND_TO_4(len);
+	r = write_to_usb(handle, endpoint_out, buf, len, &size);
+	if (r != 0)
+		return r;
 
+	do {
+		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;
 }