Fixed incorrect definition of the HID_KEYBOARD_SC_RIGHT_ARROW constant in the HID...

[pub/USBasp.git] / Demos / Host / LowLevel / StillImageHost / StillImageHost.c

diff --git a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
index aa139e2..144acf3 100644 (file)
--- a/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
+++ b/Demos/Host/LowLevel/StillImageHost/StillImageHost.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -180,7 +180,7 @@ void StillImage_Task(void)
                        PIMA_SendBlock = (PIMA_Container_t)
                                {
                                        .DataLength    = PIMA_COMMAND_SIZE(0),
                        PIMA_SendBlock = (PIMA_Container_t)
                                {
                                        .DataLength    = PIMA_COMMAND_SIZE(0),

-                                       .Type          = CType_CommandBlock,
+                                       .Type          = PIMA_CONTAINER_CommandBlock,

                                        .Code          = PIMA_OPERATION_GETDEVICEINFO,
                                        .TransactionID = 0x00000000,
                                        .Params        = {},
                                        .Code          = PIMA_OPERATION_GETDEVICEINFO,
                                        .TransactionID = 0x00000000,
                                        .Params        = {},


@@ -252,7 +252,7 @@ void StillImage_Task(void)
                        }
 
                        /* Verify that the command completed successfully */
                        }
 
                        /* Verify that the command completed successfully */

-                       if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))
+                       if ((PIMA_ReceivedBlock.Type != PIMA_CONTAINER_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))

                        {
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);
 
                        {
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);
 


@@ -265,7 +265,7 @@ void StillImage_Task(void)
                        PIMA_SendBlock = (PIMA_Container_t)
                                {
                                        .DataLength    = PIMA_COMMAND_SIZE(1),
                        PIMA_SendBlock = (PIMA_Container_t)
                                {
                                        .DataLength    = PIMA_COMMAND_SIZE(1),

-                                       .Type          = CType_CommandBlock,
+                                       .Type          = PIMA_CONTAINER_CommandBlock,

                                        .Code          = PIMA_OPERATION_OPENSESSION,
                                        .TransactionID = 0x00000000,
                                        .Params        = {0x00000001},
                                        .Code          = PIMA_OPERATION_OPENSESSION,
                                        .TransactionID = 0x00000000,
                                        .Params        = {0x00000001},


@@ -284,7 +284,7 @@ void StillImage_Task(void)
                        }
 
                        /* Verify that the command completed successfully */
                        }
 
                        /* Verify that the command completed successfully */

-                       if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))
+                       if ((PIMA_ReceivedBlock.Type != PIMA_CONTAINER_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))

                        {
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);
 
                        {
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);
 


@@ -297,7 +297,7 @@ void StillImage_Task(void)
                        PIMA_SendBlock = (PIMA_Container_t)
                                {
                                        .DataLength    = PIMA_COMMAND_SIZE(1),
                        PIMA_SendBlock = (PIMA_Container_t)
                                {
                                        .DataLength    = PIMA_COMMAND_SIZE(1),

-                                       .Type          = CType_CommandBlock,
+                                       .Type          = PIMA_CONTAINER_CommandBlock,

                                        .Code          = PIMA_OPERATION_CLOSESESSION,
                                        .TransactionID = 0x00000001,
                                        .Params        = {0x00000001},
                                        .Code          = PIMA_OPERATION_CLOSESESSION,
                                        .TransactionID = 0x00000001,
                                        .Params        = {0x00000001},


@@ -316,7 +316,7 @@ void StillImage_Task(void)
                        }
 
                        /* Verify that the command completed successfully */
                        }
 
                        /* Verify that the command completed successfully */

-                       if ((PIMA_ReceivedBlock.Type != CType_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))
+                       if ((PIMA_ReceivedBlock.Type != PIMA_CONTAINER_ResponseBlock) || (PIMA_ReceivedBlock.Code != PIMA_RESPONSE_OK))

                        {
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);
 
                        {
                                ShowCommandError(PIMA_ReceivedBlock.Code, true);