TODO: remove the entry about multi-device support

[libam7xxx.git] / src / picoproj.c

diff --git a/src/picoproj.c b/src/picoproj.c
index f8eb5bc..db27573 100644 (file)
--- a/src/picoproj.c
+++ b/src/picoproj.c
@@ -50,7 +50,8 @@ int main(int argc, char *argv[])
        char filename[FILENAME_MAX] = {0};
        int image_fd;
        struct stat st;
        char filename[FILENAME_MAX] = {0};
        int image_fd;
        struct stat st;

-       am7xxx_device dev;
+       am7xxx_context *ctx;
+       am7xxx_device *dev;

        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        int width = 800;
        int height = 480;
        int format = AM7XXX_IMAGE_FORMAT_JPEG;
        int width = 800;
        int height = 480;


@@ -130,13 +131,35 @@ int main(int argc, char *argv[])
                goto out_close_image_fd;
        }
 
                goto out_close_image_fd;
        }
 

-       dev = am7xxx_init();
-       if (dev == NULL) {
+       ret = am7xxx_init(&ctx);
+       if (ret < 0) {

                perror("am7xxx_init");
                exit_code = EXIT_FAILURE;
                goto out_munmap;
        }
 
                perror("am7xxx_init");
                exit_code = EXIT_FAILURE;
                goto out_munmap;
        }
 

+       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, 0);
+       if (ret < 0) {
+               perror("am7xxx_open_device");
+               exit_code = EXIT_FAILURE;
+               goto cleanup;
+       }
+

        ret = am7xxx_get_device_info(dev, &native_width, &native_height, &unknown0, &unknown1);
        if (ret < 0) {
                perror("am7xxx_get_info");
        ret = am7xxx_get_device_info(dev, &native_width, &native_height, &unknown0, &unknown1);
        if (ret < 0) {
                perror("am7xxx_get_info");


@@ -164,7 +187,7 @@ int main(int argc, char *argv[])
        exit_code = EXIT_SUCCESS;
 
 cleanup:
        exit_code = EXIT_SUCCESS;
 
 cleanup:

-       am7xxx_shutdown(dev);
+       am7xxx_shutdown(ctx);

 
 out_munmap:
        ret = munmap(image, size);
 
 out_munmap:
        ret = munmap(image, size);