X-Git-Url: https://git.ao2.it/libam7xxx.git/blobdiff_plain/d0baf1a9e4095176e46f6a8858de420669aea97a..refs/heads/master:/examples/picoproj.c?ds=inline diff --git a/examples/picoproj.c b/examples/picoproj.c index b5ce593..2069799 100644 --- a/examples/picoproj.c +++ b/examples/picoproj.c @@ -1,10 +1,10 @@ /* picoproj - test program for libam7xxx * - * Copyright (C) 2012 Antonio Ospite + * Copyright (C) 2012-2014 Antonio Ospite * * 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 2 of the License, or + * 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, @@ -28,6 +28,7 @@ #include #include #include +#include #include "am7xxx.h" @@ -46,8 +47,8 @@ static void usage(char *name) AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO); printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n"); printf("\t\t\t\t the slave connector to be plugged in.\n"); - printf("\t-z \t\tthe display zoom mode, between %d (original) and %d (test)\n", - AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST); + printf("\t-z \t\tthe display zoom mode, between %d (original) and %d (tele)\n", + AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE); printf("\t-W \tthe width of the image to upload\n"); printf("\t-H \tthe height of the image to upload\n"); printf("\t-h \t\t\tthis help message\n"); @@ -58,7 +59,6 @@ static void usage(char *name) int main(int argc, char *argv[]) { int ret; - int exit_code = EXIT_SUCCESS; int opt; char filename[FILENAME_MAX] = {0}; @@ -83,7 +83,8 @@ int main(int argc, char *argv[]) device_index = atoi(optarg); if (device_index < 0) { fprintf(stderr, "Unsupported device index\n"); - exit(EXIT_FAILURE); + ret = -EINVAL; + goto out; } break; case 'f': @@ -102,7 +103,8 @@ int main(int argc, char *argv[]) break; default: fprintf(stderr, "Unsupported format\n"); - exit(EXIT_FAILURE); + ret = -EINVAL; + goto out; } break; case 'l': @@ -125,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); - exit(EXIT_FAILURE); + ret = -EINVAL; + goto out; } break; case 'z': @@ -135,53 +138,59 @@ int main(int argc, char *argv[]) case AM7XXX_ZOOM_H: case AM7XXX_ZOOM_H_V: case AM7XXX_ZOOM_TEST: + case AM7XXX_ZOOM_TELE: fprintf(stdout, "Zoom: %d\n", zoom); break; default: fprintf(stderr, "Invalid zoom mode value, must be between %d and %d\n", - AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST); - exit(EXIT_FAILURE); + AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TELE); + ret = -EINVAL; + goto out; } 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"); - exit(EXIT_FAILURE); + ret = -EINVAL; + goto out; } break; case 'h': usage(argv[0]); - exit(EXIT_SUCCESS); + ret = 0; + goto out; default: /* '?' */ usage(argv[0]); - exit(EXIT_FAILURE); + ret = -EINVAL; + goto out; } } if (filename[0] == '\0') { fprintf(stderr, "An image file MUST be specified with the -f option.\n\n"); usage(argv[0]); - exit_code = EXIT_FAILURE; + ret = -EINVAL; goto out; } image_fp = fopen(filename, "rb"); if (image_fp == NULL) { perror("fopen"); - exit_code = EXIT_FAILURE; + ret = -EINVAL; goto out; } - if (fstat(fileno(image_fp), &st) < 0) { + ret = fstat(fileno(image_fp), &st); + if (ret < 0) { perror("fstat"); - exit_code = EXIT_FAILURE; goto out_close_image_fp; } size = st.st_size; @@ -189,11 +198,11 @@ int main(int argc, char *argv[]) image = malloc(size * sizeof(unsigned char)); if (image == NULL) { perror("malloc"); - exit_code = EXIT_FAILURE; + ret = -ENOMEM; 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"); @@ -202,13 +211,14 @@ int main(int argc, char *argv[]) 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"); - exit_code = EXIT_FAILURE; goto out_free_image; } @@ -217,28 +227,24 @@ int main(int argc, char *argv[]) ret = am7xxx_open_device(ctx, &dev, 0); if (ret < 0) { perror("am7xxx_open_device"); - exit_code = EXIT_FAILURE; goto cleanup; } ret = am7xxx_close_device(dev); if (ret < 0) { perror("am7xxx_close_device"); - exit_code = EXIT_FAILURE; goto cleanup; } ret = am7xxx_open_device(ctx, &dev, device_index); 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"); - exit_code = EXIT_FAILURE; goto cleanup; } printf("Native resolution: %dx%d\n", @@ -247,14 +253,12 @@ int main(int argc, char *argv[]) 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"); - exit_code = EXIT_FAILURE; goto cleanup; } @@ -273,11 +277,10 @@ int main(int argc, char *argv[]) ret = am7xxx_send_image(dev, format, width, height, image, (unsigned int)size); if (ret < 0) { perror("am7xxx_send_image"); - exit_code = EXIT_FAILURE; goto cleanup; } - exit_code = EXIT_SUCCESS; + ret = 0; cleanup: am7xxx_shutdown(ctx); @@ -286,10 +289,9 @@ out_free_image: free(image); out_close_image_fp: - ret = fclose(image_fp); - if (ret == EOF) + if (fclose(image_fp) == EOF) perror("fclose"); out: - exit(exit_code); + return ret; }