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

[pub/USBasp.git] / Projects / RelayBoard / RelayBoard.c

diff --git a/Projects/RelayBoard/RelayBoard.c b/Projects/RelayBoard/RelayBoard.c
index 7bba1ba..7edcb14 100644 (file)
--- a/Projects/RelayBoard/RelayBoard.c
+++ b/Projects/RelayBoard/RelayBoard.c
@@ -1,14 +1,14 @@
 /*
              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  OBinou (obconseil [at] gmail [dot] com)
 */
 
 /*
   Copyright 2010  OBinou (obconseil [at] gmail [dot] com)

-  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


@@ -44,7 +44,7 @@
 int main(void)
 {
        SetupHardware();
 int main(void)
 {
        SetupHardware();

-       
+

        sei();
 
        for (;;)
        sei();
 
        for (;;)


@@ -69,8 +69,8 @@ void SetupHardware(void)
        PORTC &= ~ALL_RELAYS;
 }
 
        PORTC &= ~ALL_RELAYS;
 }
 

-/** Event handler for the library USB Unhandled Control Packet event. */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)

 {
     const uint8_t SerialNumber[5] = { 0, 0, 0, 0, 1 };
        uint8_t ControlData[2]        = { 0, 0 };
 {
     const uint8_t SerialNumber[5] = { 0, 0, 0, 0, 1 };
        uint8_t ControlData[2]        = { 0, 0 };


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

-                       
+

                        break;
                case 0x01:
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
                        break;
                case 0x01:
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))


@@ -130,7 +130,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                                ControlData[1] = (PORTC & RELAY4) ? 2 : 3;
                                                break;
                                }
                                                ControlData[1] = (PORTC & RELAY4) ? 2 : 3;
                                                break;
                                }

-                               
+

                                if (ControlData[1])
                                  Endpoint_Write_Control_Stream_LE(ControlData, sizeof(ControlData));
 
                                if (ControlData[1])
                                  Endpoint_Write_Control_Stream_LE(ControlData, sizeof(ControlData));
 


@@ -140,3 +140,4 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                        break;
        }
 }
                        break;
        }
 }

+