diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-28 12:14:06 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-09-28 12:14:06 +0000 |
| commit | 713670043a1edb714461fc83c2b8817f3db99961 (patch) | |
| tree | 9c45545908c0ad14ad8e136e34de00867fc569a7 /Demos/Host/ClassDriver/StillImageHost | |
| parent | 800485bd95de4287006a0d0aa099bc510e929531 (diff) | |
| download | lufa-713670043a1edb714461fc83c2b8817f3db99961.tar.gz lufa-713670043a1edb714461fc83c2b8817f3db99961.tar.bz2 lufa-713670043a1edb714461fc83c2b8817f3db99961.zip | |
Move out many of the common class driver constants into grouped enums, to make them more managable.
Add new CDC descriptor structs to the CDC class driver, so that the CDC demos can use human readable field names.
Rename prefix for Still Image Host class driver functions from "SImage_" to "SI_" to remain consistent with the rest of the driver.
Diffstat (limited to 'Demos/Host/ClassDriver/StillImageHost')
| -rw-r--r-- | Demos/Host/ClassDriver/StillImageHost/StillImageHost.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c index 152639fef..f5d1b23fd 100644 --- a/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c +++ b/Demos/Host/ClassDriver/StillImageHost/StillImageHost.c @@ -86,8 +86,8 @@ int main(void) break; } - if (SImage_Host_ConfigurePipes(&DigitalCamera_SI_Interface, - ConfigDescriptorSize, ConfigDescriptorData) != SI_ENUMERROR_NoError) + if (SI_Host_ConfigurePipes(&DigitalCamera_SI_Interface, + ConfigDescriptorSize, ConfigDescriptorData) != SI_ENUMERROR_NoError) { puts_P(PSTR("Attached Device Not a Valid Still Image Class Device.\r\n")); LEDs_SetAllLEDs(LEDMASK_USB_ERROR); @@ -110,7 +110,7 @@ int main(void) case HOST_STATE_Configured: puts_P(PSTR("Opening Session...\r\n")); - if (SImage_Host_OpenSession(&DigitalCamera_SI_Interface) != PIPE_RWSTREAM_NoError) + if (SI_Host_OpenSession(&DigitalCamera_SI_Interface) != PIPE_RWSTREAM_NoError) { puts_P(PSTR("Could not open PIMA session.\r\n")); USB_HostState = HOST_STATE_WaitForDeviceRemoval; @@ -119,8 +119,8 @@ int main(void) puts_P(PSTR("Turning off Device...\r\n")); - SImage_Host_SendCommand(&DigitalCamera_SI_Interface, 0x1013, 0, NULL); - if (SImage_Host_ReceiveResponse(&DigitalCamera_SI_Interface)) + SI_Host_SendCommand(&DigitalCamera_SI_Interface, 0x1013, 0, NULL); + if (SI_Host_ReceiveResponse(&DigitalCamera_SI_Interface)) { puts_P(PSTR("Could not turn off device.\r\n")); USB_HostState = HOST_STATE_WaitForDeviceRemoval; @@ -131,7 +131,7 @@ int main(void) puts_P(PSTR("Closing Session...\r\n")); - if (SImage_Host_CloseSession(&DigitalCamera_SI_Interface) != PIPE_RWSTREAM_NoError) + if (SI_Host_CloseSession(&DigitalCamera_SI_Interface) != PIPE_RWSTREAM_NoError) { puts_P(PSTR("Could not close PIMA session.\r\n")); USB_HostState = HOST_STATE_WaitForDeviceRemoval; @@ -143,7 +143,7 @@ int main(void) break; } - SImage_Host_USBTask(&DigitalCamera_SI_Interface); + SI_Host_USBTask(&DigitalCamera_SI_Interface); USB_USBTask(); } } |