From: Antonio Ospite <ospite@studenti.unina.it>
Date: Thu, 12 Jan 2012 12:46:14 +0000 (+0100)
Subject: Split am7xxx functions and definitions
X-Git-Tag: v0.1.0~34
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/98446344ce24a7fee8f1609d4d4e655b136b7fbf
Split am7xxx functions and definitions
This is the base for the libam7xxx shared library.
---
diff --git a/Makefile b/Makefile
index 42bb562..514621b 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ all: picoproj
CFLAGS += -D_BSD_SOURCE # for htole32()
CFLAGS += -D_POSIX_C_SOURCE=2 # for getopt()
-picoproj: picoproj.o
+picoproj: picoproj.o am7xxx.o
install: picoproj
install -d $(DESTDIR)$(bindir)
diff --git a/am7xxx.c b/am7xxx.c
new file mode 100644
index 0000000..d81d1a8
--- /dev/null
+++ b/am7xxx.c
@@ -0,0 +1,197 @@
+/* am7xxx - communication with AM7xxx based USB Pico Projectors and DPFs
+ *
+ * Copyright (C) 2011 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <endian.h>
+#include <errno.h>
+
+#include "am7xxx.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);
+}
+
+static void dump_header(struct am7xxx_header *h)
+{
+ if (h == NULL)
+ return;
+
+ printf("packet_type: 0x%08x (%u)\n", h->packet_type, h->packet_type);
+ printf("unknown0: 0x%02hhx (%hhu)\n", h->unknown0, h->unknown0);
+ printf("header_len: 0x%02hhx (%hhu)\n", h->header_len, h->header_len);
+ printf("unknown2: 0x%02hhx (%hhu)\n", h->unknown2, h->unknown2);
+ printf("unknown3: 0x%02hhx (%hhu)\n", h->unknown3, h->unknown3);
+
+ switch(h->packet_type) {
+ case AM7XXX_PACKET_TYPE_IMAGE:
+ dump_image_header(&(h->header_data.image));
+ break;
+
+ default:
+ printf("Packet type not supported!\n");
+ break;
+ }
+
+ fflush(stdout);
+}
+
+static inline unsigned int in_80chars(unsigned int i)
+{
+ return ((i+1) % (80/3));
+}
+
+static void dump_buffer(uint8_t *buffer, unsigned int len)
+{
+ unsigned int i;
+
+ if (buffer == NULL || len == 0)
+ return;
+
+ for (i = 0; i < len; i++) {
+ printf("%02hhX%c", buffer[i], (in_80chars(i) && (i < len - 1)) ? ' ' : '\n');
+ }
+ fflush(stdout);
+}
+
+static int send_data(am7xxx_device dev, uint8_t *buffer, unsigned int len)
+{
+ int ret;
+ int transferred;
+
+ dump_buffer(buffer, len);
+
+ ret = libusb_bulk_transfer(dev, 1, buffer, len, &transferred, 0);
+ if (ret != 0 || (unsigned int)transferred != len) {
+ fprintf(stderr, "Error: ret: %d\ttransferred: %d (expected %u)\n",
+ ret, transferred, len);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int send_header(am7xxx_device dev, struct am7xxx_header *h)
+{
+ union {
+ struct am7xxx_header header;
+ uint8_t buffer[sizeof (struct am7xxx_header)];
+ } data;
+
+ data.header = *h;
+
+ return send_data(dev, data.buffer, sizeof (struct am7xxx_header));
+}
+
+am7xxx_device am7xxx_init(void)
+{
+ am7xxx_device dev;
+
+ libusb_init(NULL);
+ libusb_set_debug(NULL, 3);
+
+ dev = libusb_open_device_with_vid_pid(NULL,
+ AM7XXX_VENDOR_ID,
+ AM7XXX_PRODUCT_ID);
+ if (dev == NULL) {
+ errno = ENODEV;
+ perror("libusb_open_device_with_vid_pid");
+ goto out_libusb_exit;
+ }
+
+ libusb_set_configuration(dev, 1);
+ libusb_claim_interface(dev, 0);
+
+ return dev;
+
+out_libusb_exit:
+ libusb_exit(NULL);
+ return NULL;
+}
+
+void am7xxx_shutdown(am7xxx_device dev)
+{
+ if (dev) {
+ libusb_close(dev);
+ libusb_exit(NULL);
+ }
+}
+
+int am7xxx_send_image(am7xxx_device dev,
+ am7xxx_image_format format,
+ unsigned int width,
+ unsigned int height,
+ uint8_t *image,
+ unsigned int size)
+{
+ int ret;
+ struct am7xxx_header h = {
+ .packet_type = htole32(AM7XXX_PACKET_TYPE_IMAGE),
+ .unknown0 = 0x00,
+ .header_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),
+ },
+ },
+ };
+
+ 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;
+
+ if (image == NULL || size == 0)
+ return 0;
+
+ return send_data(dev, image, size);
+}
diff --git a/am7xxx.h b/am7xxx.h
new file mode 100644
index 0000000..d8d69d7
--- /dev/null
+++ b/am7xxx.h
@@ -0,0 +1,90 @@
+/* am7xxx - communication with AM7XXX based USB Pico Projectors and DPFs
+ *
+ * Copyright (C) 2011 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __AM7XXX_H
+#define __AM7XXX_H
+
+#include <stdint.h>
+#include <libusb-1.0/libusb.h>
+
+typedef libusb_device_handle *am7xxx_device;
+
+typedef enum {
+ AM7XXX_PACKET_TYPE_INIT = 0x01,
+ AM7XXX_PACKET_TYPE_IMAGE = 0x02,
+ AM7XXX_PACKET_TYPE_POWER = 0x04,
+ AM7XXX_PACKET_TYPE_UNKNOWN = 0x05,
+} am7xxx_packet_type;
+
+typedef enum {
+ AM7XXX_IMAGE_FORMAT_JPEG = 1,
+} am7xxx_image_format;
+
+typedef enum {
+ AM7XXX_POWER_OFF = 0,
+ AM7XXX_POWER_LOW = 1,
+ AM7XXX_POWER_MID = 2,
+ AM7XXX_POWER_HIGH = 3,
+} am7xxx_power_mode;
+
+struct am7xxx_image_header {
+ uint32_t format;
+ uint32_t width;
+ uint32_t height;
+ uint32_t image_size;
+};
+
+struct am7xxx_power_header {
+ uint32_t power_low;
+ uint32_t power_mid;
+ uint32_t power_high;
+};
+
+/*
+ * Examples of packet headers:
+ *
+ * Image header:
+ * 02 00 00 00 00 10 3e 10 01 00 00 00 20 03 00 00 e0 01 00 00 53 E8 00 00
+ *
+ * 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
+ */
+
+struct am7xxx_header {
+ uint32_t packet_type;
+ uint8_t unknown0;
+ uint8_t header_len;
+ uint8_t unknown2;
+ uint8_t unknown3;
+ union {
+ 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,
+ am7xxx_image_format format,
+ unsigned int width,
+ unsigned int height,
+ uint8_t *image,
+ unsigned int size);
+
+#endif /* __AM7XXX_H */
diff --git a/picoproj.c b/picoproj.c
index a5e5075..010d4d1 100644
--- a/picoproj.c
+++ b/picoproj.c
@@ -1,4 +1,4 @@
-/* picoproj - communication with AM7xxx based USB pico projectors
+/* picoproj - test program for libam7xxx
*
* Copyright (C) 2011 Antonio Ospite <ospite@studenti.unina.it>
*
@@ -18,214 +18,14 @@
#include <stdio.h>
#include <stdlib.h>
-#include <stdint.h>
#include <string.h>
-#include <endian.h>
-#include <errno.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include <libusb.h>
-
-#define AM7x01_VENDOR_ID 0x1de1
-#define AM7x01_PRODUCT_ID 0xc101
-
-static libusb_device_handle *dev;
-
-typedef enum {
- AM7x01_PACKET_TYPE_INIT = 0x01,
- AM7x01_PACKET_TYPE_IMAGE = 0x02,
- AM7x01_PACKET_TYPE_POWER = 0x04,
- AM7x01_PACKET_TYPE_UNKNOWN = 0x05,
-} am7x01_packet_type;
-
-typedef enum {
- AM7x01_IMAGE_FORMAT_JPEG = 1,
-} am7x01_image_format;
-
-typedef enum {
- AM7x01_POWER_OFF = 0,
- AM7x01_POWER_LOW = 1,
- AM7x01_POWER_MID = 2,
- AM7x01_POWER_HIGH = 3,
-} am7x01_power_mode;
-
-struct image_header {
- uint32_t format;
- uint32_t width;
- uint32_t height;
- uint32_t image_size;
-};
-
-struct power_header {
- uint32_t power_low;
- uint32_t power_mid;
- uint32_t power_high;
-};
-
-/*
- * Examples of packet headers:
- *
- * Image widget:
- * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- * +02|00|00|00|00|10|3e|10|01|00|00|00|20|03|00|00|e0|01|00|00|53|E8|00|00+
- * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- *
- * Brightness widget:
- * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- * +04|00|00|00|00|0c|ff|ff|00|00|00|00|00|00|00|00|00|00|00|00|00|00|00|00+
- * +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- */
-
-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
-};
-
-struct header {
- uint32_t packet_type;
- uint8_t unknown0;
- uint8_t header_len;
- uint8_t unknown2;
- uint8_t unknown3;
- union {
- struct image_header image;
- struct power_header power;
- } header_data;
-};
-
-
-static void dump_image_header(struct 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);
-}
-
-static void dump_header(struct header *h)
-{
- if (h == NULL)
- return;
-
- printf("packet_type: 0x%08x (%u)\n", h->packet_type, h->packet_type);
- printf("unknown0: 0x%02hhx (%hhu)\n", h->unknown0, h->unknown0);
- printf("header_len: 0x%02hhx (%hhu)\n", h->header_len, h->header_len);
- printf("unknown2: 0x%02hhx (%hhu)\n", h->unknown2, h->unknown2);
- printf("unknown3: 0x%02hhx (%hhu)\n", h->unknown3, h->unknown3);
-
- switch(h->packet_type) {
- case AM7x01_PACKET_TYPE_IMAGE:
- dump_image_header(&(h->header_data.image));
- break;
-
- default:
- printf("Packet type not supported!\n");
- break;
- }
-
- fflush(stdout);
-}
-
-static inline unsigned int in_80chars(unsigned int i)
-{
- return ((i+1) % (80/3));
-}
-
-static void dump_buffer(uint8_t *buffer, unsigned int len)
-{
- unsigned int i;
-
- if (buffer == NULL || len == 0)
- return;
-
- for (i = 0; i < len; i++) {
- printf("%02hhX%c", buffer[i], (in_80chars(i) && (i < len - 1)) ? ' ' : '\n');
- }
- fflush(stdout);
-}
-
-static int send_data(uint8_t *buffer, unsigned int len)
-{
- int ret;
- int transferred;
-
- dump_buffer(buffer, len);
-
- ret = libusb_bulk_transfer(dev, 1, buffer, len, &transferred, 0);
- if (ret != 0 || (unsigned int)transferred != len) {
- fprintf(stderr, "Error: ret: %d\ttransferred: %d (expected %u)\n",
- ret, transferred, len);
- return ret;
- }
-
- return 0;
-}
-
-static int send_header(struct header *h)
-{
- union {
- struct header header;
- uint8_t buffer[sizeof (struct header)];
- } data;
-
- data.header = *h;
-
- return send_data(data.buffer, sizeof (struct header));
-}
-
-static int send_image(am7x01_image_format format,
- unsigned int width,
- unsigned int height,
- uint8_t *image,
- unsigned int size)
-{
- int ret;
- struct header h = {
- .packet_type = htole32(AM7x01_PACKET_TYPE_IMAGE),
- .unknown0 = 0x00,
- .header_len = sizeof(struct image_header),
- .unknown2 = 0x3e,
- .unknown3 = 0x10,
- .header_data = {
- .image = {
- .format = htole32(format),
- .width = htole32(width),
- .height = htole32(height),
- .image_size = htole32(size),
- },
- },
- };
-
- dump_header(&h);
- printf("\n");
-
- printf("Dump Buffers\n");
- dump_buffer(reference_image_header, sizeof(struct header));
-
- ret = send_header(&h);
- if (ret < 0)
- return ret;
-
- if (image == NULL || size == 0)
- return 0;
-
- return send_data(image, size);
-}
+#include "am7xxx.h"
static void usage(char *name)
{
@@ -248,7 +48,8 @@ int main(int argc, char *argv[])
char filename[FILENAME_MAX] = {0};
int image_fd = -1;
- int format = AM7x01_IMAGE_FORMAT_JPEG;
+ am7xxx_device dev;
+ int format = AM7XXX_IMAGE_FORMAT_JPEG;
int width = 800;
int height = 480;
uint8_t *image = NULL;
@@ -310,25 +111,16 @@ int main(int argc, char *argv[])
}
}
- libusb_init(NULL);
- libusb_set_debug(NULL, 3);
-
- dev = libusb_open_device_with_vid_pid(NULL,
- AM7x01_VENDOR_ID,
- AM7x01_PRODUCT_ID);
+ dev = am7xxx_init();
if (dev == NULL) {
- errno = ENODEV;
- perror("libusb_open_device_with_vid_pid");
+ perror("am7xxx_init");
exit_code = EXIT_FAILURE;
- goto out_libusb_exit;
+ goto out_munmap;
}
- libusb_set_configuration(dev, 1);
- libusb_claim_interface(dev, 0);
-
- ret = send_image(format, width, height, image, size);
+ ret = am7xxx_send_image(dev, format, width, height, image, size);
if (ret < 0) {
- perror("send_image");
+ perror("am7xxx_send_image");
exit_code = EXIT_FAILURE;
goto cleanup;
}
@@ -336,11 +128,9 @@ int main(int argc, char *argv[])
exit_code = EXIT_SUCCESS;
cleanup:
- libusb_close(dev);
-
-out_libusb_exit:
- libusb_exit(NULL);
+ am7xxx_shutdown(dev);
+out_munmap:
if (image != NULL) {
ret = munmap(image, size);
if (ret < 0)