Add svn:eol-style property to source files, so that the line endings are correctly converted to the target system's native end of line style.

1 files changed, 242 insertions, 242 deletions

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
index 9b4efb679..780b2b273 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
@@ -1,242 +1,242 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2010.

-              

-  dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com

-*/

-

-/*

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

-  Copyright 2010  Matthias Hullin (lufa [at] matthias [dot] hullin [dot] net)

-

-  Permission to use, copy, modify, distribute, and sell this 

-  software and its documentation for any purpose is hereby granted

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

-  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 

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *

- *  Main source file for the MassStorageKeyboard demo. This file contains the main tasks of

- *  the demo and is responsible for the initial application hardware configuration.

- */

-

-#include "MassStorageKeyboard.h"

-	

-/** LUFA Mass Storage Class driver interface configuration and state information. This structure is

- *  passed to all Mass Storage Class driver functions, so that multiple instances of the same class

- *  within a device can be differentiated from one another.

- */

-USB_ClassInfo_MS_Device_t Disk_MS_Interface =

-	{

-		.Config =

-			{

-				.InterfaceNumber           = 0,

-

-				.DataINEndpointNumber      = MASS_STORAGE_IN_EPNUM,

-				.DataINEndpointSize        = MASS_STORAGE_IO_EPSIZE,

-				.DataINEndpointDoubleBank  = false,

-

-				.DataOUTEndpointNumber     = MASS_STORAGE_OUT_EPNUM,

-				.DataOUTEndpointSize       = MASS_STORAGE_IO_EPSIZE,

-				.DataOUTEndpointDoubleBank = false,

-

-				.TotalLUNs                 = TOTAL_LUNS,

-			},

-	};

-

-/** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */

-uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)];

-

-/** LUFA HID Class driver interface configuration and state information. This structure is

- *  passed to all HID Class driver functions, so that multiple instances of the same class

- *  within a device can be differentiated from one another.

- */

-USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =

- 	{

-		.Config =

-			{

-				.InterfaceNumber              = 1,

-

-				.ReportINEndpointNumber       = KEYBOARD_EPNUM,

-				.ReportINEndpointSize         = KEYBOARD_EPSIZE,

-				.ReportINEndpointDoubleBank   = false,

-

-				.PrevReportINBuffer           = PrevKeyboardHIDReportBuffer,

-				.PrevReportINBufferSize       = sizeof(PrevKeyboardHIDReportBuffer),

-			},

-    };

-

-/** Main program entry point. This routine contains the overall program flow, including initial

- *  setup of all components and the main program loop.

- */

-int main(void)

-{

-	SetupHardware();

-

-	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

-	sei();

-

-	for (;;)

-	{

-		MS_Device_USBTask(&Disk_MS_Interface);

-		HID_Device_USBTask(&Keyboard_HID_Interface);

-		USB_USBTask();

-	}

-}

-

-/** Configures the board hardware and chip peripherals for the demo's functionality. */

-void SetupHardware(void)

-{

-	/* Disable watchdog if enabled by bootloader/fuses */

-	MCUSR &= ~(1 << WDRF);

-	wdt_disable();

-

-	/* Disable clock division */

-	clock_prescale_set(clock_div_1);

-

-	/* Hardware Initialization */

-	LEDs_Init();

-	Joystick_Init();

-	Buttons_Init();

-	SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);

-	Dataflash_Init();

-	USB_Init();

-

-	/* Clear Dataflash sector protections, if enabled */

-	DataflashManager_ResetDataflashProtections();

-}

-

-/** Event handler for the library USB Connection event. */

-void EVENT_USB_Device_Connect(void)

-{

-	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

-}

-

-/** Event handler for the library USB Disconnection event. */

-void EVENT_USB_Device_Disconnect(void)

-{

-	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

-}

-

-/** Event handler for the library USB Configuration Changed event. */

-void EVENT_USB_Device_ConfigurationChanged(void)

-{

-	LEDs_SetAllLEDs(LEDMASK_USB_READY);

-

-	if (!(MS_Device_ConfigureEndpoints(&Disk_MS_Interface)))

-	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-

-	if (!(HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface)))

-	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-

-	USB_Device_EnableSOFEvents();

-}

-

-/** Event handler for the library USB Unhandled Control Request event. */

-void EVENT_USB_Device_UnhandledControlRequest(void)

-{

-	MS_Device_ProcessControlRequest(&Disk_MS_Interface);

-	HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);

-}

-

-/** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed.

- *

- *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface configuration structure being referenced

- */

-bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)

-{

-	bool CommandSuccess;

-	

-	LEDs_SetAllLEDs(LEDMASK_USB_BUSY);

-	CommandSuccess = SCSI_DecodeSCSICommand(MSInterfaceInfo);

-	LEDs_SetAllLEDs(LEDMASK_USB_READY);

-	

-	return CommandSuccess;

-}

-

-/** Event handler for the USB device Start Of Frame event. */

-void EVENT_USB_Device_StartOfFrame(void)

-{

-    HID_Device_MillisecondElapsed(&Keyboard_HID_Interface);

-}

-

-/** HID class driver callback function for the creation of HID reports to the host.

- *

- *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced

- *  \param[in,out] ReportID  Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID

- *  \param[in] ReportType  Type of the report to create, either REPORT_ITEM_TYPE_In or REPORT_ITEM_TYPE_Feature

- *  \param[out] ReportData  Pointer to a buffer where the created report should be stored

- *  \param[out] ReportSize  Number of bytes written in the report (or zero if no report is to be sent

- *

- *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent

- */

-bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,

-                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)

-{

-	USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;

-	

-	uint8_t JoyStatus_LCL    = Joystick_GetStatus();

-	uint8_t ButtonStatus_LCL = Buttons_GetStatus();

-

-	KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;

-

-	if (JoyStatus_LCL & JOY_UP)

-	  KeyboardReport->KeyCode[0] = 0x04; // A

-	else if (JoyStatus_LCL & JOY_DOWN)

-	  KeyboardReport->KeyCode[0] = 0x05; // B

-

-	if (JoyStatus_LCL & JOY_LEFT)

-	  KeyboardReport->KeyCode[0] = 0x06; // C

-	else if (JoyStatus_LCL & JOY_RIGHT)

-	  KeyboardReport->KeyCode[0] = 0x07; // D

-

-	if (JoyStatus_LCL & JOY_PRESS)

-	  KeyboardReport->KeyCode[0] = 0x08; // E

-	  

-	if (ButtonStatus_LCL & BUTTONS_BUTTON1)

-	  KeyboardReport->KeyCode[0] = 0x09; // F

-	

-	*ReportSize = sizeof(USB_KeyboardReport_Data_t);

-	return false;

-}

-

-/** HID class driver callback function for the processing of HID reports from the host.

- *

- *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced

- *  \param[in] ReportID  Report ID of the received report from the host

- *  \param[in] ReportData  Pointer to a buffer where the created report has been stored

- *  \param[in] ReportSize  Size in bytes of the received HID report

- */

-void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,

-                                          const void* ReportData, const uint16_t ReportSize)

-{

-	uint8_t  LEDMask   = LEDS_NO_LEDS;

-	uint8_t* LEDReport = (uint8_t*)ReportData;

-

-	if (*LEDReport & HID_KEYBOARD_LED_NUMLOCK)

-	  LEDMask |= LEDS_LED1;

-	

-	if (*LEDReport & HID_KEYBOARD_LED_CAPSLOCK)

-	  LEDMask |= LEDS_LED3;

-

-	if (*LEDReport & HID_KEYBOARD_LED_SCROLLLOCK)

-	  LEDMask |= LEDS_LED4;

-	  

-	LEDs_SetAllLEDs(LEDMask);

-}

-

+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2010  Matthias Hullin (lufa [at] matthias [dot] hullin [dot] net)
+
+  Permission to use, copy, modify, distribute, and sell this 
+  software and its documentation for any purpose is hereby granted
+  without fee, provided that the above copyright notice appear in 
+  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 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+/** \file
+ *
+ *  Main source file for the MassStorageKeyboard demo. This file contains the main tasks of
+ *  the demo and is responsible for the initial application hardware configuration.
+ */
+
+#include "MassStorageKeyboard.h"
+	
+/** LUFA Mass Storage Class driver interface configuration and state information. This structure is
+ *  passed to all Mass Storage Class driver functions, so that multiple instances of the same class
+ *  within a device can be differentiated from one another.
+ */
+USB_ClassInfo_MS_Device_t Disk_MS_Interface =
+	{
+		.Config =
+			{
+				.InterfaceNumber           = 0,
+
+				.DataINEndpointNumber      = MASS_STORAGE_IN_EPNUM,
+				.DataINEndpointSize        = MASS_STORAGE_IO_EPSIZE,
+				.DataINEndpointDoubleBank  = false,
+
+				.DataOUTEndpointNumber     = MASS_STORAGE_OUT_EPNUM,
+				.DataOUTEndpointSize       = MASS_STORAGE_IO_EPSIZE,
+				.DataOUTEndpointDoubleBank = false,
+
+				.TotalLUNs                 = TOTAL_LUNS,
+			},
+	};
+
+/** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */
+uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)];
+
+/** LUFA HID Class driver interface configuration and state information. This structure is
+ *  passed to all HID Class driver functions, so that multiple instances of the same class
+ *  within a device can be differentiated from one another.
+ */
+USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =
+ 	{
+		.Config =
+			{
+				.InterfaceNumber              = 1,
+
+				.ReportINEndpointNumber       = KEYBOARD_EPNUM,
+				.ReportINEndpointSize         = KEYBOARD_EPSIZE,
+				.ReportINEndpointDoubleBank   = false,
+
+				.PrevReportINBuffer           = PrevKeyboardHIDReportBuffer,
+				.PrevReportINBufferSize       = sizeof(PrevKeyboardHIDReportBuffer),
+			},
+    };
+
+/** Main program entry point. This routine contains the overall program flow, including initial
+ *  setup of all components and the main program loop.
+ */
+int main(void)
+{
+	SetupHardware();
+
+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+	sei();
+
+	for (;;)
+	{
+		MS_Device_USBTask(&Disk_MS_Interface);
+		HID_Device_USBTask(&Keyboard_HID_Interface);
+		USB_USBTask();
+	}
+}
+
+/** Configures the board hardware and chip peripherals for the demo's functionality. */
+void SetupHardware(void)
+{
+	/* Disable watchdog if enabled by bootloader/fuses */
+	MCUSR &= ~(1 << WDRF);
+	wdt_disable();
+
+	/* Disable clock division */
+	clock_prescale_set(clock_div_1);
+
+	/* Hardware Initialization */
+	LEDs_Init();
+	Joystick_Init();
+	Buttons_Init();
+	SPI_Init(SPI_SPEED_FCPU_DIV_2 | SPI_SCK_LEAD_FALLING | SPI_SAMPLE_TRAILING | SPI_MODE_MASTER);
+	Dataflash_Init();
+	USB_Init();
+
+	/* Clear Dataflash sector protections, if enabled */
+	DataflashManager_ResetDataflashProtections();
+}
+
+/** Event handler for the library USB Connection event. */
+void EVENT_USB_Device_Connect(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+}
+
+/** Event handler for the library USB Disconnection event. */
+void EVENT_USB_Device_Disconnect(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
+}
+
+/** Event handler for the library USB Configuration Changed event. */
+void EVENT_USB_Device_ConfigurationChanged(void)
+{
+	LEDs_SetAllLEDs(LEDMASK_USB_READY);
+
+	if (!(MS_Device_ConfigureEndpoints(&Disk_MS_Interface)))
+	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+
+	if (!(HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface)))
+	  LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+
+	USB_Device_EnableSOFEvents();
+}
+
+/** Event handler for the library USB Unhandled Control Request event. */
+void EVENT_USB_Device_UnhandledControlRequest(void)
+{
+	MS_Device_ProcessControlRequest(&Disk_MS_Interface);
+	HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
+}
+
+/** Mass Storage class driver callback function the reception of SCSI commands from the host, which must be processed.
+ *
+ *  \param[in] MSInterfaceInfo  Pointer to the Mass Storage class interface configuration structure being referenced
+ */
+bool CALLBACK_MS_Device_SCSICommandReceived(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
+{
+	bool CommandSuccess;
+	
+	LEDs_SetAllLEDs(LEDMASK_USB_BUSY);
+	CommandSuccess = SCSI_DecodeSCSICommand(MSInterfaceInfo);
+	LEDs_SetAllLEDs(LEDMASK_USB_READY);
+	
+	return CommandSuccess;
+}
+
+/** Event handler for the USB device Start Of Frame event. */
+void EVENT_USB_Device_StartOfFrame(void)
+{
+    HID_Device_MillisecondElapsed(&Keyboard_HID_Interface);
+}
+
+/** HID class driver callback function for the creation of HID reports to the host.
+ *
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
+ *  \param[in,out] ReportID  Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID
+ *  \param[in] ReportType  Type of the report to create, either REPORT_ITEM_TYPE_In or REPORT_ITEM_TYPE_Feature
+ *  \param[out] ReportData  Pointer to a buffer where the created report should be stored
+ *  \param[out] ReportSize  Number of bytes written in the report (or zero if no report is to be sent
+ *
+ *  \return Boolean true to force the sending of the report, false to let the library determine if it needs to be sent
+ */
+bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, uint8_t* const ReportID,
+                                         const uint8_t ReportType, void* ReportData, uint16_t* ReportSize)
+{
+	USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;
+	
+	uint8_t JoyStatus_LCL    = Joystick_GetStatus();
+	uint8_t ButtonStatus_LCL = Buttons_GetStatus();
+
+	KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
+
+	if (JoyStatus_LCL & JOY_UP)
+	  KeyboardReport->KeyCode[0] = 0x04; // A
+	else if (JoyStatus_LCL & JOY_DOWN)
+	  KeyboardReport->KeyCode[0] = 0x05; // B
+
+	if (JoyStatus_LCL & JOY_LEFT)
+	  KeyboardReport->KeyCode[0] = 0x06; // C
+	else if (JoyStatus_LCL & JOY_RIGHT)
+	  KeyboardReport->KeyCode[0] = 0x07; // D
+
+	if (JoyStatus_LCL & JOY_PRESS)
+	  KeyboardReport->KeyCode[0] = 0x08; // E
+	  
+	if (ButtonStatus_LCL & BUTTONS_BUTTON1)
+	  KeyboardReport->KeyCode[0] = 0x09; // F
+	
+	*ReportSize = sizeof(USB_KeyboardReport_Data_t);
+	return false;
+}
+
+/** HID class driver callback function for the processing of HID reports from the host.
+ *
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
+ *  \param[in] ReportID  Report ID of the received report from the host
+ *  \param[in] ReportData  Pointer to a buffer where the created report has been stored
+ *  \param[in] ReportSize  Size in bytes of the received HID report
+ */
+void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo, const uint8_t ReportID,
+                                          const void* ReportData, const uint16_t ReportSize)
+{
+	uint8_t  LEDMask   = LEDS_NO_LEDS;
+	uint8_t* LEDReport = (uint8_t*)ReportData;
+
+	if (*LEDReport & HID_KEYBOARD_LED_NUMLOCK)
+	  LEDMask |= LEDS_LED1;
+	
+	if (*LEDReport & HID_KEYBOARD_LED_CAPSLOCK)
+	  LEDMask |= LEDS_LED3;
+
+	if (*LEDReport & HID_KEYBOARD_LED_SCROLLLOCK)
+	  LEDMask |= LEDS_LED4;
+	  
+	LEDs_SetAllLEDs(LEDMask);
+}
+