projects
/
libam7xxx.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
am7xxx: factor out a send_command() function
[libam7xxx.git]
/
examples
/
picoproj.c
diff --git
a/examples/picoproj.c
b/examples/picoproj.c
index
54cbedf
..
9128538
100644
(file)
--- a/
examples/picoproj.c
+++ b/
examples/picoproj.c
@@
-28,6
+28,7
@@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
+#include <errno.h>
#include "am7xxx.h"
#include "am7xxx.h"
@@
-35,6
+36,7
@@
static void usage(char *name)
{
printf("usage: %s [OPTIONS]\n\n", name);
printf("OPTIONS:\n");
{
printf("usage: %s [OPTIONS]\n\n", name);
printf("OPTIONS:\n");
+ printf("\t-d <index>\t\tthe device index (default is 0)\n");
printf("\t-f <filename>\t\tthe image file to upload\n");
printf("\t-F <format>\t\tthe image format to use (default is JPEG)\n");
printf("\t\t\t\tSUPPORTED FORMATS:\n");
printf("\t-f <filename>\t\tthe image file to upload\n");
printf("\t-F <format>\t\tthe image format to use (default is JPEG)\n");
printf("\t\t\t\tSUPPORTED FORMATS:\n");
@@
-57,7
+59,6
@@
static void usage(char *name)
int main(int argc, char *argv[])
{
int ret;
int main(int argc, char *argv[])
{
int ret;
- int exit_code = EXIT_SUCCESS;
int opt;
char filename[FILENAME_MAX] = {0};
int opt;
char filename[FILENAME_MAX] = {0};
@@
-66,17
+67,26
@@
int main(int argc, char *argv[])
am7xxx_context *ctx;
am7xxx_device *dev;
int log_level = AM7XXX_LOG_INFO;
am7xxx_context *ctx;
am7xxx_device *dev;
int log_level = AM7XXX_LOG_INFO;
- am7xxx_power_mode power_mode = AM7XXX_POWER_LOW;
- am7xxx_zoom_mode zoom = AM7XXX_ZOOM_ORIGINAL;
+ int device_index = 0;
+ int power_mode = AM7XXX_POWER_LOW;
+ int zoom = AM7XXX_ZOOM_ORIGINAL;
int format = AM7XXX_IMAGE_FORMAT_JPEG;
int width = 800;
int height = 480;
unsigned char *image;
int format = AM7XXX_IMAGE_FORMAT_JPEG;
int width = 800;
int height = 480;
unsigned char *image;
-
unsigned in
t size;
+
off_
t size;
am7xxx_device_info device_info;
am7xxx_device_info device_info;
- while ((opt = getopt(argc, argv, "f:F:l:p:z:W:H:h")) != -1) {
+ while ((opt = getopt(argc, argv, "
d:
f:F:l:p:z:W:H:h")) != -1) {
switch (opt) {
switch (opt) {
+ case 'd':
+ device_index = atoi(optarg);
+ if (device_index < 0) {
+ fprintf(stderr, "Unsupported device index\n");
+ ret = -EINVAL;
+ goto out;
+ }
+ break;
case 'f':
if (filename[0] != '\0')
fprintf(stderr, "Warning: image file already specified\n");
case 'f':
if (filename[0] != '\0')
fprintf(stderr, "Warning: image file already specified\n");
@@
-93,7
+103,8
@@
int main(int argc, char *argv[])
break;
default:
fprintf(stderr, "Unsupported format\n");
break;
default:
fprintf(stderr, "Unsupported format\n");
- exit(EXIT_FAILURE);
+ ret = -EINVAL;
+ goto out;
}
break;
case 'l':
}
break;
case 'l':
@@
-116,7
+127,8
@@
int main(int argc, char *argv[])
default:
fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
default:
fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
- exit(EXIT_FAILURE);
+ ret = -EINVAL;
+ goto out;
}
break;
case 'z':
}
break;
case 'z':
@@
-131,48
+143,53
@@
int main(int argc, char *argv[])
default:
fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",
AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
default:
fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n",
AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
- exit(EXIT_FAILURE);
+ ret = -EINVAL;
+ goto out;
}
break;
case 'W':
width = atoi(optarg);
if (width < 0) {
fprintf(stderr, "Unsupported width\n");
}
break;
case 'W':
width = atoi(optarg);
if (width < 0) {
fprintf(stderr, "Unsupported width\n");
- exit(EXIT_FAILURE);
+ ret = -EINVAL;
+ goto out;
}
break;
case 'H':
height = atoi(optarg);
if (height < 0) {
fprintf(stderr, "Unsupported height\n");
}
break;
case 'H':
height = atoi(optarg);
if (height < 0) {
fprintf(stderr, "Unsupported height\n");
- exit(EXIT_FAILURE);
+ ret = -EINVAL;
+ goto out;
}
break;
case 'h':
usage(argv[0]);
}
break;
case 'h':
usage(argv[0]);
-
exit(EXIT_SUCCESS)
;
-
break
;
+
ret = 0
;
+
goto out
;
default: /* '?' */
usage(argv[0]);
default: /* '?' */
usage(argv[0]);
- exit(EXIT_FAILURE);
+ ret = -EINVAL;
+ goto out;
}
}
if (filename[0] == '\0') {
}
}
if (filename[0] == '\0') {
- fprintf(stderr, "An image file MUST be specified.\n");
- exit_code = EXIT_FAILURE;
+ fprintf(stderr, "An image file MUST be specified with the -f option.\n\n");
+ usage(argv[0]);
+ ret = -EINVAL;
goto out;
}
image_fp = fopen(filename, "rb");
if (image_fp == NULL) {
perror("fopen");
goto out;
}
image_fp = fopen(filename, "rb");
if (image_fp == NULL) {
perror("fopen");
-
exit_code = EXIT_FAILURE
;
+
ret = -EINVAL
;
goto out;
}
goto out;
}
- if (fstat(fileno(image_fp), &st) < 0) {
+ ret = fstat(fileno(image_fp), &st);
+ if (ret < 0) {
perror("fstat");
perror("fstat");
- exit_code = EXIT_FAILURE;
goto out_close_image_fp;
}
size = st.st_size;
goto out_close_image_fp;
}
size = st.st_size;
@@
-180,11
+197,11
@@
int main(int argc, char *argv[])
image = malloc(size * sizeof(unsigned char));
if (image == NULL) {
perror("malloc");
image = malloc(size * sizeof(unsigned char));
if (image == NULL) {
perror("malloc");
-
exit_code = EXIT_FAILURE
;
+
ret = -ENOMEM
;
goto out_close_image_fp;
}
goto out_close_image_fp;
}
- ret = fread(image, size, 1, image_fp);
+ ret =
(int)
fread(image, size, 1, image_fp);
if (ret != 1) {
if (feof(image_fp))
fprintf(stderr, "Unexpected end of file.\n");
if (ret != 1) {
if (feof(image_fp))
fprintf(stderr, "Unexpected end of file.\n");
@@
-193,13
+210,14
@@
int main(int argc, char *argv[])
else
fprintf(stderr, "Unexpected error condition.\n");
else
fprintf(stderr, "Unexpected error condition.\n");
+ if (ret >= 0)
+ ret = -EINVAL;
goto out_free_image;
}
ret = am7xxx_init(&ctx);
if (ret < 0) {
perror("am7xxx_init");
goto out_free_image;
}
ret = am7xxx_init(&ctx);
if (ret < 0) {
perror("am7xxx_init");
- exit_code = EXIT_FAILURE;
goto out_free_image;
}
goto out_free_image;
}
@@
-208,29
+226,24
@@
int main(int argc, char *argv[])
ret = am7xxx_open_device(ctx, &dev, 0);
if (ret < 0) {
perror("am7xxx_open_device");
ret = am7xxx_open_device(ctx, &dev, 0);
if (ret < 0) {
perror("am7xxx_open_device");
- exit_code = EXIT_FAILURE;
goto cleanup;
}
goto cleanup;
}
-
ret = am7xxx_close_device(dev);
if (ret < 0) {
perror("am7xxx_close_device");
ret = am7xxx_close_device(dev);
if (ret < 0) {
perror("am7xxx_close_device");
- exit_code = EXIT_FAILURE;
goto cleanup;
}
goto cleanup;
}
- ret = am7xxx_open_device(ctx, &dev,
0
);
+ ret = am7xxx_open_device(ctx, &dev,
device_index
);
if (ret < 0) {
perror("am7xxx_open_device");
if (ret < 0) {
perror("am7xxx_open_device");
- exit_code = EXIT_FAILURE;
goto cleanup;
}
ret = am7xxx_get_device_info(dev, &device_info);
if (ret < 0) {
perror("am7xxx_get_device_info");
goto cleanup;
}
ret = am7xxx_get_device_info(dev, &device_info);
if (ret < 0) {
perror("am7xxx_get_device_info");
- exit_code = EXIT_FAILURE;
goto cleanup;
}
printf("Native resolution: %dx%d\n",
goto cleanup;
}
printf("Native resolution: %dx%d\n",
@@
-239,34
+252,34
@@
int main(int argc, char *argv[])
ret = am7xxx_set_zoom_mode(dev, zoom);
if (ret < 0) {
perror("am7xxx_set_zoom_mode");
ret = am7xxx_set_zoom_mode(dev, zoom);
if (ret < 0) {
perror("am7xxx_set_zoom_mode");
- exit_code = EXIT_FAILURE;
goto cleanup;
}
ret = am7xxx_set_power_mode(dev, power_mode);
if (ret < 0) {
perror("am7xxx_set_power_mode");
goto cleanup;
}
ret = am7xxx_set_power_mode(dev, power_mode);
if (ret < 0) {
perror("am7xxx_set_power_mode");
- exit_code = EXIT_FAILURE;
goto cleanup;
}
/* When setting AM7XXX_ZOOM_TEST don't display the actual image */
goto cleanup;
}
/* When setting AM7XXX_ZOOM_TEST don't display the actual image */
- if (zoom == AM7XXX_ZOOM_TEST)
+ if (zoom == AM7XXX_ZOOM_TEST) {
+ printf("AM7XXX_ZOOM_TEST requested, not sending actual image.\n");
goto cleanup;
goto cleanup;
-
+ }
if ((unsigned int)width > device_info.native_width ||
(unsigned int)height > device_info.native_height)
if ((unsigned int)width > device_info.native_width ||
(unsigned int)height > device_info.native_height)
- fprintf(stderr, "WARNING: image not fitting the native resolution, it may be displayed wrongly!\n");
+ fprintf(stderr,
+ "WARNING: image is %dx%d, not fitting the native resolution, it may be displayed wrongly!\n",
+ width, height);
- ret = am7xxx_send_image(dev, format, width, height, image, size);
+ ret = am7xxx_send_image(dev, format, width, height, image,
(unsigned int)
size);
if (ret < 0) {
perror("am7xxx_send_image");
if (ret < 0) {
perror("am7xxx_send_image");
- exit_code = EXIT_FAILURE;
goto cleanup;
}
goto cleanup;
}
-
exit_code = EXIT_SUCCESS
;
+
ret = 0
;
cleanup:
am7xxx_shutdown(ctx);
cleanup:
am7xxx_shutdown(ctx);
@@
-275,10
+288,9
@@
out_free_image:
free(image);
out_close_image_fp:
free(image);
out_close_image_fp:
- ret = fclose(image_fp);
- if (ret == EOF)
+ if (fclose(image_fp) == EOF)
perror("fclose");
out:
perror("fclose");
out:
-
exit(exit_code)
;
+
return ret
;
}
}
projects / libam7xxx.git / blobdiff