X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/3339bee3f62dbfa3586cc4db5201f7fc704ab037..6d8691adaf1b7f1ec3f443ebb5cf494f5981b235:/src/am7xxx.h

diff --git a/src/am7xxx.h b/src/am7xxx.h
index d8d69d7..49510eb 100644
--- a/src/am7xxx.h
+++ b/src/am7xxx.h
@@ -1,10 +1,10 @@
 /* am7xxx - communication with AM7XXX based USB Pico Projectors and DPFs
  *
- * Copyright (C) 2011  Antonio Ospite <ospite@studenti.unina.it>
+ * Copyright (C) 2012  Antonio Ospite <ospite@studenti.unina.it>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -22,6 +22,10 @@
 #include <stdint.h>
 #include <libusb-1.0/libusb.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef libusb_device_handle *am7xxx_device;
 
 typedef enum {
@@ -33,6 +37,7 @@ typedef enum {
 
 typedef enum {
 	AM7XXX_IMAGE_FORMAT_JPEG = 1,
+	AM7XXX_IMAGE_FORMAT_NV12 = 2,
 } am7xxx_image_format;
 
 typedef enum {
@@ -42,6 +47,13 @@ typedef enum {
 	AM7XXX_POWER_HIGH = 3,
 } am7xxx_power_mode;
 
+struct am7xxx_generic_header {
+	uint32_t field0;
+	uint32_t field1;
+	uint32_t field2;
+	uint32_t field3;
+};
+
 struct am7xxx_image_header {
 	uint32_t format;
 	uint32_t width;
@@ -65,19 +77,27 @@ struct am7xxx_power_header {
  * 04 00 00 00 00 0c ff ff 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  */
 
+/* The header size on the wire is known to be always 24 bytes, regardless of
+ * the memory configuration enforced by different architechtures or compilers
+ * for struct am7xxx_header
+ */
+#define AM7XXX_HEADER_WIRE_SIZE 24
+
 struct am7xxx_header {
 	uint32_t packet_type;
 	uint8_t unknown0;
-	uint8_t header_len;
+	uint8_t header_data_len;
 	uint8_t unknown2;
 	uint8_t unknown3;
 	union {
+		struct am7xxx_generic_header data;
 		struct am7xxx_image_header image;
 		struct am7xxx_power_header power;
 	} header_data;
 };
 
 am7xxx_device am7xxx_init(void);
+
 void am7xxx_shutdown(am7xxx_device dev);
 
 int am7xxx_send_image(am7xxx_device dev,
@@ -87,4 +107,8 @@ int am7xxx_send_image(am7xxx_device dev,
 		      uint8_t *image,
 		      unsigned int size);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* __AM7XXX_H */