Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Demos / Device / Incomplete / Sideshow / Sideshow.c

diff --git a/Demos/Device/Incomplete/Sideshow/Sideshow.c b/Demos/Device/Incomplete/Sideshow/Sideshow.c
index e99a26b..09076e1 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Sideshow.c
+++ b/Demos/Device/Incomplete/Sideshow/Sideshow.c
@@ -1,21 +1,21 @@
 /*
              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 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -36,12 +36,12 @@
        externally connected interactive display. Upon enumeration, this will
        appear as a new SideShow device which can have gadgets loaded onto
        it.
        externally connected interactive display. Upon enumeration, this will
        appear as a new SideShow device which can have gadgets loaded onto
        it.

-       
+

        Note that while the incoming content is buffered in packet struct
        form, the data is not actually displayed. It is left to the user to
        write sufficient code to read out the packed data for display to a
        screen.
        Note that while the incoming content is buffered in packet struct
        form, the data is not actually displayed. It is left to the user to
        write sufficient code to read out the packed data for display to a
        screen.

-       
+

        Installed gadgets can be accessed through the InstalledApplications
        array, with entries that have their InUse flag set being active. As
        only the active content is displayed on the device due to memory
        Installed gadgets can be accessed through the InstalledApplications
        array, with entries that have their InUse flag set being active. As
        only the active content is displayed on the device due to memory


@@ -59,7 +59,7 @@ int main(void)
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();

-       
+

        for (;;)
        {
                SideShow_Task();
        for (;;)
        {
                SideShow_Task();


@@ -76,11 +76,14 @@ void SetupHardware(void)
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);

-       
+

        /* Hardware Initialization */
        LEDs_Init();
        USB_Init();
        /* Hardware Initialization */
        LEDs_Init();
        USB_Init();

-       SerialStream_Init(9600, false);
+       Serial_Init(9600, false);
+
+       /* Create a stdio stream for the serial port for stdin and stdout */
+       Serial_CreateStream(NULL);

 }
 
 void EVENT_USB_Device_Connect(void)
 }
 
 void EVENT_USB_Device_Connect(void)


@@ -95,40 +98,35 @@ void EVENT_USB_Device_Disconnect(void)
 
 void EVENT_USB_Device_ConfigurationChanged(void)
 {
 
 void EVENT_USB_Device_ConfigurationChanged(void)
 {

-       LEDs_SetAllLEDs(LEDMASK_USB_READY);
+       bool ConfigSuccess = true;

 
 

-       /* Setup Sideshow In and Out Endpoints */
-       if (!(Endpoint_ConfigureEndpoint(SIDESHOW_IN_EPNUM, EP_TYPE_BULK,
-                                            ENDPOINT_DIR_IN, SIDESHOW_IO_EPSIZE,
-                                        ENDPOINT_BANK_SINGLE)))
-       {
-               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-       }
+       /* Setup Sideshow Data Endpoints */
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(SIDESHOW_IN_EPNUM,  EP_TYPE_BULK, ENDPOINT_DIR_IN,
+                                                   SIDESHOW_IO_EPSIZE, ENDPOINT_BANK_SINGLE);
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(SIDESHOW_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT,
+                                                   SIDESHOW_IO_EPSIZE, ENDPOINT_BANK_SINGLE);

 
 

-       if (!(Endpoint_ConfigureEndpoint(SIDESHOW_OUT_EPNUM, EP_TYPE_BULK,
-                                            ENDPOINT_DIR_OUT, SIDESHOW_IO_EPSIZE,
-                                        ENDPOINT_BANK_SINGLE)))
-       {
-               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-       }
+       /* Indicate endpoint configuration success or failure */
+       LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);

 }
 
 }
 

-void EVENT_USB_Device_UnhandledControlRequest(void)
+void EVENT_USB_Device_ControlRequest(void)

 {
        switch (USB_ControlRequest.bRequest)
        {
                case REQ_GetOSFeatureDescriptor:
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE))
                        {
 {
        switch (USB_ControlRequest.bRequest)
        {
                case REQ_GetOSFeatureDescriptor:
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_VENDOR | REQREC_DEVICE))
                        {

-                               void*    DescriptorPointer;
-                               uint16_t DescriptorSize = USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,
-                                                                                    &DescriptorPointer, &DescriptorSize);
+                               const void* DescriptorPointer;
+                               uint16_t    DescriptorSize = USB_GetOSFeatureDescriptor(USB_ControlRequest.wValue,
+                                                                                       USB_ControlRequest.wIndex,
+                                                                                       &DescriptorPointer);

 
                                if (DescriptorSize == NO_DESCRIPTOR)
                                  return;
 
                                if (DescriptorSize == NO_DESCRIPTOR)
                                  return;

-                               
+

                                Endpoint_ClearSETUP();
                                Endpoint_ClearSETUP();

-                               
+

                                Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);
                                Endpoint_ClearOUT();
                        }
                                Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);
                                Endpoint_ClearOUT();
                        }


@@ -136,7 +134,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                        break;
        }
 }
                        break;
        }
 }

-       
+

 void SideShow_Task(void)
 {
        /* Device must be connected and configured for the task to run */
 void SideShow_Task(void)
 {
        /* Device must be connected and configured for the task to run */


@@ -145,7 +143,7 @@ void SideShow_Task(void)
 
        /* Select the SideShow data out endpoint */
        Endpoint_SelectEndpoint(SIDESHOW_OUT_EPNUM);
 
        /* Select the SideShow data out endpoint */
        Endpoint_SelectEndpoint(SIDESHOW_OUT_EPNUM);

-       
+

        /* Check to see if a new SideShow message has been received */
        if (Endpoint_IsReadWriteAllowed())
        {
        /* Check to see if a new SideShow message has been received */
        if (Endpoint_IsReadWriteAllowed())
        {


@@ -153,3 +151,4 @@ void SideShow_Task(void)
                Sideshow_ProcessCommandPacket();
        }
 }
                Sideshow_ProcessCommandPacket();
        }
 }

+