X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/b9a31ad87f63016dc9f914f61ab06606a948aa90..b162f59656e930be8826a0202b994c3cc4835882:/src/am7xxx.c

diff --git a/src/am7xxx.c b/src/am7xxx.c
index ecef379..483eaf7 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -17,38 +17,25 @@
  */
 
 #include <stdio.h>
-#include <endian.h>
+#include <stdlib.h>
 #include <errno.h>
 
 #include "am7xxx.h"
+#include "serialize.h"
 
 #define AM7XXX_VENDOR_ID  0x1de1
 #define AM7XXX_PRODUCT_ID 0xc101
 
-#if 1
-static uint8_t reference_image_header[] = {
-	0x02, 0x00, 0x00, 0x00,
-	0x00,
-	0x10,
-	0x3e,
-	0x10,
-	0x01, 0x00, 0x00, 0x00,
-	0x20, 0x03, 0x00, 0x00,
-	0xe0, 0x01, 0x00, 0x00,
-	0x53, 0xE8, 0x00, 0x00
-};
-#endif
-
 static void dump_image_header(struct am7xxx_image_header *i)
 {
 	if (i == NULL)
 		return;
 
 	printf("Image header:\n");
-	printf("format:      0x%08x (%u)\n", i->format, i->format);
-	printf("width:       0x%08x (%u)\n", i->width, i->width);
-	printf("height:      0x%08x (%u)\n", i->height, i->height);
-	printf("image size:  0x%08x (%u)\n", i->image_size, i->image_size);
+	printf("\tformat:     0x%08x (%u)\n", i->format, i->format);
+	printf("\twidth:      0x%08x (%u)\n", i->width, i->width);
+	printf("\theight:     0x%08x (%u)\n", i->height, i->height);
+	printf("\timage size: 0x%08x (%u)\n", i->image_size, i->image_size);
 }
 
 static void dump_header(struct am7xxx_header *h)
@@ -77,6 +64,8 @@ static void dump_header(struct am7xxx_header *h)
 
 static inline unsigned int in_80chars(unsigned int i)
 {
+	/* The 3 below is the length of "xx " where xx is the hex string
+	 * representation of a byte */
 	return ((i+1) % (80/3));
 }
 
@@ -98,7 +87,10 @@ static int send_data(am7xxx_device dev, uint8_t *buffer, unsigned int len)
 	int ret;
 	int transferred;
 
+#if DEBUG
 	dump_buffer(buffer, len);
+	printf("\n");
+#endif
 
 	ret = libusb_bulk_transfer(dev, 1, buffer, len, &transferred, 0);
 	if (ret != 0 || (unsigned int)transferred != len) {
@@ -110,16 +102,44 @@ static int send_data(am7xxx_device dev, uint8_t *buffer, unsigned int len)
 	return 0;
 }
 
+static void serialize_header(struct am7xxx_header *h, uint8_t *buffer)
+{
+	uint8_t **buffer_iterator = &buffer;
+
+	put_le32(h->packet_type, buffer_iterator);
+	put_8(h->unknown0, buffer_iterator);
+	put_8(h->header_data_len, buffer_iterator);
+	put_8(h->unknown2, buffer_iterator);
+	put_8(h->unknown3, buffer_iterator);
+	put_le32(h->header_data.data.field0, buffer_iterator);
+	put_le32(h->header_data.data.field1, buffer_iterator);
+	put_le32(h->header_data.data.field2, buffer_iterator);
+	put_le32(h->header_data.data.field3, buffer_iterator);
+}
+
 static int send_header(am7xxx_device dev, struct am7xxx_header *h)
 {
-	union {
-		struct am7xxx_header header;
-		uint8_t buffer[sizeof (struct am7xxx_header)];
-	} data;
+	uint8_t *buffer;
+	int ret;
 
-	data.header = *h;
+#if DEBUG
+	dump_header(h);
+	printf("\n");
+#endif
+
+	buffer = calloc(AM7XXX_HEADER_WIRE_SIZE, 1);
+	if (buffer == NULL) {
+		perror("calloc buffer");
+		return -ENOMEM;
+	}
+
+	serialize_header(h, buffer);
+	ret = send_data(dev, buffer, AM7XXX_HEADER_WIRE_SIZE);
+	if (ret < 0)
+		fprintf(stderr, "send_header: failed to send data.\n");
 
-	return send_data(dev, data.buffer, sizeof (struct am7xxx_header));
+	free(buffer);
+	return ret;
 }
 
 am7xxx_device am7xxx_init(void)
@@ -165,27 +185,21 @@ int am7xxx_send_image(am7xxx_device dev,
 {
 	int ret;
 	struct am7xxx_header h = {
-		.packet_type     = htole32(AM7XXX_PACKET_TYPE_IMAGE),
+		.packet_type     = AM7XXX_PACKET_TYPE_IMAGE,
 		.unknown0        = 0x00,
 		.header_data_len = sizeof(struct am7xxx_image_header),
 		.unknown2        = 0x3e,
 		.unknown3        = 0x10,
 		.header_data = {
 			.image = {
-				.format     = htole32(format),
-				.width      = htole32(width),
-				.height     = htole32(height),
-				.image_size = htole32(size),
+				.format     = format,
+				.width      = width,
+				.height     = height,
+				.image_size = size,
 			},
 		},
 	};
 
-	dump_header(&h);
-	printf("\n");
-
-	printf("Dump Buffers\n");
-	dump_buffer(reference_image_header, sizeof(struct am7xxx_header));
-
 	ret = send_header(dev, &h);
 	if (ret < 0)
 		return ret;