tabs vs. space

git-svn-id: https://svn.spreadspace.org/avr/trunk@45 aa12f405-d877-488e-9caf-2d797e2a1cc7

2 files changed, 181 insertions, 181 deletions

diff --git a/lib/lufa-descriptor-usbserial.c b/lib/lufa-descriptor-usbserial.c
index 0199f49..6e9f022 100644
--- a/lib/lufa-descriptor-usbserial.c
+++ b/lib/lufa-descriptor-usbserial.c
@@ -46,7 +46,7 @@
  * port location).

  */

 #if (USE_INTERNAL_SERIAL == NO_DESCRIPTOR)

-	#warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

+  #warning USE_INTERNAL_SERIAL is not available on this AVR - please manually construct a device serial descriptor.

 #endif

 

 /** Device descriptor structure. This descriptor, located in FLASH memory, describes the overall

@@ -56,24 +56,24 @@
  */

 const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =

 {

-	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},

+  .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},

 

-	.USBSpecification       = VERSION_BCD(01.10),

-	.Class                  = CDC_CSCP_CDCClass,

-	.SubClass               = CDC_CSCP_NoSpecificSubclass,

-	.Protocol               = CDC_CSCP_NoSpecificProtocol,

+  .USBSpecification       = VERSION_BCD(01.10),

+  .Class                  = CDC_CSCP_CDCClass,

+  .SubClass               = CDC_CSCP_NoSpecificSubclass,

+  .Protocol               = CDC_CSCP_NoSpecificProtocol,

 

-	.Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,

+  .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,

 

-	.VendorID               = 0x03EB,

-	.ProductID              = 0x204B,

-	.ReleaseNumber          = VERSION_BCD(00.01),

+  .VendorID               = 0x03EB,

+  .ProductID              = 0x204B,

+  .ReleaseNumber          = VERSION_BCD(00.01),

 

-	.ManufacturerStrIndex   = 0x01,

-	.ProductStrIndex        = 0x02,

-	.SerialNumStrIndex      = USE_INTERNAL_SERIAL,

+  .ManufacturerStrIndex   = 0x01,

+  .ProductStrIndex        = 0x02,

+  .SerialNumStrIndex      = USE_INTERNAL_SERIAL,

 

-	.NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS

+  .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS

 };

 

 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage

@@ -83,107 +83,107 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
  */

 const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =

 {

-	.Config =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},

+  .Config =

+    {

+      .Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},

 

-			.TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),

-			.TotalInterfaces        = 2,

+      .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),

+      .TotalInterfaces        = 2,

 

-			.ConfigurationNumber    = 1,

-			.ConfigurationStrIndex  = NO_DESCRIPTOR,

+      .ConfigurationNumber    = 1,

+      .ConfigurationStrIndex  = NO_DESCRIPTOR,

 

-			.ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

+      .ConfigAttributes       = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_SELFPOWERED),

 

-			.MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

-		},

+      .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)

+    },

 

-	.CDC_CCI_Interface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

+  .CDC_CCI_Interface =

+    {

+      .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

-			.InterfaceNumber        = 0,

-			.AlternateSetting       = 0,

+      .InterfaceNumber        = 0,

+      .AlternateSetting       = 0,

 

-			.TotalEndpoints         = 1,

+      .TotalEndpoints         = 1,

 

-			.Class                  = CDC_CSCP_CDCClass,

-			.SubClass               = CDC_CSCP_ACMSubclass,

-			.Protocol               = CDC_CSCP_ATCommandProtocol,

+      .Class                  = CDC_CSCP_CDCClass,

+      .SubClass               = CDC_CSCP_ACMSubclass,

+      .Protocol               = CDC_CSCP_ATCommandProtocol,

 

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

+      .InterfaceStrIndex      = NO_DESCRIPTOR

+    },

 

-	.CDC_Functional_Header =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_Header,

+  .CDC_Functional_Header =

+    {

+      .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},

+      .Subtype                = CDC_DSUBTYPE_CSInterface_Header,

 

-			.CDCSpecification       = VERSION_BCD(01.10),

-		},

+      .CDCSpecification       = VERSION_BCD(01.10),

+    },

 

-	.CDC_Functional_ACM =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

+  .CDC_Functional_ACM =

+    {

+      .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},

+      .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

 

-			.Capabilities           = 0x06,

-		},

+      .Capabilities           = 0x06,

+    },

 

-	.CDC_Functional_Union =

-		{

-			.Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},

-			.Subtype                = CDC_DSUBTYPE_CSInterface_Union,

+  .CDC_Functional_Union =

+    {

+      .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},

+      .Subtype                = CDC_DSUBTYPE_CSInterface_Union,

 

-			.MasterInterfaceNumber  = 0,

-			.SlaveInterfaceNumber   = 1,

-		},

+      .MasterInterfaceNumber  = 0,

+      .SlaveInterfaceNumber   = 1,

+    },

 

-	.CDC_NotificationEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

+  .CDC_NotificationEndpoint =

+    {

+      .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

-			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM),

-			.Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_NOTIFICATION_EPSIZE,

-			.PollingIntervalMS      = 0xFF

-		},

+      .EndpointAddress        = (ENDPOINT_DIR_IN | CDC_NOTIFICATION_EPNUM),

+      .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

+      .EndpointSize           = CDC_NOTIFICATION_EPSIZE,

+      .PollingIntervalMS      = 0xFF

+    },

 

-	.CDC_DCI_Interface =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

+  .CDC_DCI_Interface =

+    {

+      .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},

 

-			.InterfaceNumber        = 1,

-			.AlternateSetting       = 0,

+      .InterfaceNumber        = 1,

+      .AlternateSetting       = 0,

 

-			.TotalEndpoints         = 2,

+      .TotalEndpoints         = 2,

 

-			.Class                  = CDC_CSCP_CDCDataClass,

-			.SubClass               = CDC_CSCP_NoDataSubclass,

-			.Protocol               = CDC_CSCP_NoDataProtocol,

+      .Class                  = CDC_CSCP_CDCDataClass,

+      .SubClass               = CDC_CSCP_NoDataSubclass,

+      .Protocol               = CDC_CSCP_NoDataProtocol,

 

-			.InterfaceStrIndex      = NO_DESCRIPTOR

-		},

+      .InterfaceStrIndex      = NO_DESCRIPTOR

+    },

 

-	.CDC_DataOutEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

+  .CDC_DataOutEndpoint =

+    {

+      .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

-			.EndpointAddress        = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM),

-			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_TXRX_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		},

+      .EndpointAddress        = (ENDPOINT_DIR_OUT | CDC_RX_EPNUM),

+      .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

+      .EndpointSize           = CDC_TXRX_EPSIZE,

+      .PollingIntervalMS      = 0x01

+    },

 

-	.CDC_DataInEndpoint =

-		{

-			.Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

+  .CDC_DataInEndpoint =

+    {

+      .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},

 

-			.EndpointAddress        = (ENDPOINT_DIR_IN | CDC_TX_EPNUM),

-			.Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

-			.EndpointSize           = CDC_TXRX_EPSIZE,

-			.PollingIntervalMS      = 0x01

-		}

+      .EndpointAddress        = (ENDPOINT_DIR_IN | CDC_TX_EPNUM),

+      .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),

+      .EndpointSize           = CDC_TXRX_EPSIZE,

+      .PollingIntervalMS      = 0x01

+    }

 };

 

 /** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests

@@ -192,9 +192,9 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
  */

 const USB_Descriptor_String_t PROGMEM LanguageString =

 {

-	.Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

+  .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},

 

-	.UnicodeString          = {LANGUAGE_ID_ENG}

+  .UnicodeString          = {LANGUAGE_ID_ENG}

 };

 

 /** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable

@@ -203,9 +203,9 @@ const USB_Descriptor_String_t PROGMEM LanguageString =
  */

 const USB_Descriptor_String_t PROGMEM ManufacturerString =

 {

-	.Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

+  .Header                 = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},

 

-	.UnicodeString          = L"Dean Camera"

+  .UnicodeString          = L"Dean Camera"

 };

 

 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,

@@ -214,9 +214,9 @@ const USB_Descriptor_String_t PROGMEM ManufacturerString =
  */

 const USB_Descriptor_String_t PROGMEM ProductString =

 {

-	.Header                 = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},

+  .Header                 = {.Size = USB_STRING_LEN(23), .Type = DTYPE_String},

 

-	.UnicodeString          = L"LUFA USB-RS232 Adapter"

+  .UnicodeString          = L"LUFA USB-RS232 Adapter"

 };

 

 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"

@@ -229,43 +229,43 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                                     const uint8_t wIndex,

                                     const void** const DescriptorAddress)

 {

-	const uint8_t  DescriptorType   = (wValue >> 8);

-	const uint8_t  DescriptorNumber = (wValue & 0xFF);

-

-	const void* Address = NULL;

-	uint16_t    Size    = NO_DESCRIPTOR;

-

-	switch (DescriptorType)

-	{

-		case DTYPE_Device:

-			Address = &DeviceDescriptor;

-			Size    = sizeof(USB_Descriptor_Device_t);

-			break;

-		case DTYPE_Configuration:

-			Address = &ConfigurationDescriptor;

-			Size    = sizeof(USB_Descriptor_Configuration_t);

-			break;

-		case DTYPE_String:

-			switch (DescriptorNumber)

-			{

-				case 0x00:

-					Address = &LanguageString;

-					Size    = pgm_read_byte(&LanguageString.Header.Size);

-					break;

-				case 0x01:

-					Address = &ManufacturerString;

-					Size    = pgm_read_byte(&ManufacturerString.Header.Size);

-					break;

-				case 0x02:

-					Address = &ProductString;

-					Size    = pgm_read_byte(&ProductString.Header.Size);

-					break;

-			}

-

-			break;

-	}

-

-	*DescriptorAddress = Address;

-	return Size;

+  const uint8_t  DescriptorType   = (wValue >> 8);

+  const uint8_t  DescriptorNumber = (wValue & 0xFF);

+

+  const void* Address = NULL;

+  uint16_t    Size    = NO_DESCRIPTOR;

+

+  switch (DescriptorType)

+  {

+    case DTYPE_Device:

+      Address = &DeviceDescriptor;

+      Size    = sizeof(USB_Descriptor_Device_t);

+      break;

+    case DTYPE_Configuration:

+      Address = &ConfigurationDescriptor;

+      Size    = sizeof(USB_Descriptor_Configuration_t);

+      break;

+    case DTYPE_String:

+      switch (DescriptorNumber)

+      {

+        case 0x00:

+          Address = &LanguageString;

+          Size    = pgm_read_byte(&LanguageString.Header.Size);

+          break;

+        case 0x01:

+          Address = &ManufacturerString;

+          Size    = pgm_read_byte(&ManufacturerString.Header.Size);

+          break;

+        case 0x02:

+          Address = &ProductString;

+          Size    = pgm_read_byte(&ProductString.Header.Size);

+          break;

+      }

+

+      break;

+  }

+

+  *DescriptorAddress = Address;

+  return Size;

 }

 

diff --git a/lib/lufa-descriptor-usbserial.h b/lib/lufa-descriptor-usbserial.h
index 0146524..97afd41 100644
--- a/lib/lufa-descriptor-usbserial.h
+++ b/lib/lufa-descriptor-usbserial.h
@@ -36,54 +36,54 @@
 #ifndef _DESCRIPTORS_H_

 #define _DESCRIPTORS_H_

 

-	/* Includes: */

-		#include <avr/pgmspace.h>

-

-		#include <LUFA/Drivers/USB/USB.h>

-

-	/* Macros: */

-		/** Endpoint number of the CDC device-to-host notification IN endpoint. */

-		#define CDC_NOTIFICATION_EPNUM         2

-

-		/** Endpoint number of the CDC device-to-host data IN endpoint. */

-		#define CDC_TX_EPNUM                   3

-

-		/** Endpoint number of the CDC host-to-device data OUT endpoint. */

-		#define CDC_RX_EPNUM                   4

-

-		/** Size in bytes of the CDC device-to-host notification IN endpoint. */

-		#define CDC_NOTIFICATION_EPSIZE        8

-

-		/** Size in bytes of the CDC data IN and OUT endpoints. */

-		#define CDC_TXRX_EPSIZE                16

-

-	/* Type Defines: */

-		/** Type define for the device configuration descriptor structure. This must be defined in the

-		 *  application code, as the configuration descriptor contains several sub-descriptors which

-		 *  vary between devices, and which describe the device's usage to the host.

-		 */

-		typedef struct

-		{

-			USB_Descriptor_Configuration_Header_t    Config;

-

-			// CDC Command Interface

-			USB_Descriptor_Interface_t               CDC_CCI_Interface;

-			USB_CDC_Descriptor_FunctionalHeader_t    CDC_Functional_Header;

-			USB_CDC_Descriptor_FunctionalACM_t       CDC_Functional_ACM;

-			USB_CDC_Descriptor_FunctionalUnion_t     CDC_Functional_Union;

-			USB_Descriptor_Endpoint_t                CDC_NotificationEndpoint;

-

-			// CDC Data Interface

-			USB_Descriptor_Interface_t               CDC_DCI_Interface;

-			USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;

-			USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;

-		} USB_Descriptor_Configuration_t;

-

-	/* Function Prototypes: */

-		uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

-		                                    const uint8_t wIndex,

-		                                    const void** const DescriptorAddress)

-		                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

+  /* Includes: */

+    #include <avr/pgmspace.h>

+

+    #include <LUFA/Drivers/USB/USB.h>

+

+  /* Macros: */

+    /** Endpoint number of the CDC device-to-host notification IN endpoint. */

+    #define CDC_NOTIFICATION_EPNUM         2

+

+    /** Endpoint number of the CDC device-to-host data IN endpoint. */

+    #define CDC_TX_EPNUM                   3

+

+    /** Endpoint number of the CDC host-to-device data OUT endpoint. */

+    #define CDC_RX_EPNUM                   4

+

+    /** Size in bytes of the CDC device-to-host notification IN endpoint. */

+    #define CDC_NOTIFICATION_EPSIZE        8

+

+    /** Size in bytes of the CDC data IN and OUT endpoints. */

+    #define CDC_TXRX_EPSIZE                16

+

+  /* Type Defines: */

+    /** Type define for the device configuration descriptor structure. This must be defined in the

+     *  application code, as the configuration descriptor contains several sub-descriptors which

+     *  vary between devices, and which describe the device's usage to the host.

+     */

+    typedef struct

+    {

+      USB_Descriptor_Configuration_Header_t    Config;

+

+      // CDC Command Interface

+      USB_Descriptor_Interface_t               CDC_CCI_Interface;

+      USB_CDC_Descriptor_FunctionalHeader_t    CDC_Functional_Header;

+      USB_CDC_Descriptor_FunctionalACM_t       CDC_Functional_ACM;

+      USB_CDC_Descriptor_FunctionalUnion_t     CDC_Functional_Union;

+      USB_Descriptor_Endpoint_t                CDC_NotificationEndpoint;

+

+      // CDC Data Interface

+      USB_Descriptor_Interface_t               CDC_DCI_Interface;

+      USB_Descriptor_Endpoint_t                CDC_DataOutEndpoint;

+      USB_Descriptor_Endpoint_t                CDC_DataInEndpoint;

+    } USB_Descriptor_Configuration_t;

+

+  /* Function Prototypes: */

+    uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,

+                                        const uint8_t wIndex,

+                                        const void** const DescriptorAddress)

+                                        ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);

 

 #endif