tabs vs. space

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

1 files changed, 115 insertions, 115 deletions

diff --git a/usb-serial/usb-serial.c b/usb-serial/usb-serial.c
index a4d578b..f9c3afc 100644
--- a/usb-serial/usb-serial.c
+++ b/usb-serial/usb-serial.c
@@ -103,24 +103,24 @@ static uint8_t      USARTtoUSB_Buffer_Data[128];
  *  within a device can be differentiated from one another.

  */

 USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =

-	{

-		.Config =

-			{

-				.ControlInterfaceNumber         = 0,

+  {

+    .Config =

+      {

+        .ControlInterfaceNumber         = 0,

 

-				.DataINEndpointNumber           = CDC_TX_EPNUM,

-				.DataINEndpointSize             = CDC_TXRX_EPSIZE,

-				.DataINEndpointDoubleBank       = false,

+        .DataINEndpointNumber           = CDC_TX_EPNUM,

+        .DataINEndpointSize             = CDC_TXRX_EPSIZE,

+        .DataINEndpointDoubleBank       = false,

 

-				.DataOUTEndpointNumber          = CDC_RX_EPNUM,

-				.DataOUTEndpointSize            = CDC_TXRX_EPSIZE,

-				.DataOUTEndpointDoubleBank      = false,

+        .DataOUTEndpointNumber          = CDC_RX_EPNUM,

+        .DataOUTEndpointSize            = CDC_TXRX_EPSIZE,

+        .DataOUTEndpointDoubleBank      = false,

 

-				.NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,

-				.NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,

-				.NotificationEndpointDoubleBank = false,

-			},

-	};

+        .NotificationEndpointNumber     = CDC_NOTIFICATION_EPNUM,

+        .NotificationEndpointSize       = CDC_NOTIFICATION_EPSIZE,

+        .NotificationEndpointDoubleBank = false,

+      },

+  };

 

 

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

@@ -128,69 +128,69 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
  */

 int main(void)

 {

-	SetupHardware();

-

-	RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));

-	RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));

-

-	sei();

-

-	for (;;)

-	{

-		/* Only try to read in bytes from the CDC interface if the transmit buffer is not full */

-		if (!(RingBuffer_IsFull(&USBtoUSART_Buffer)))

-		{

-			int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);

-

-			/* Read bytes from the USB OUT endpoint into the USART transmit buffer */

-			if (!(ReceivedByte < 0))

-			  RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);

-		}

-

-		/* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */

-		uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);

-		if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75)))

-		{

-			/* Clear flush timer expiry flag */

-			TIFR0 |= (1 << TOV0);

-

-			/* Read bytes from the USART receive buffer into the USB IN endpoint */

-			while (BufferCount--)

-			{

-				/* Try to send the next byte of data to the host, abort if there is an error without dequeuing */

-				if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,

-				                        RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)

-				{

-					break;

-				}

-

-				/* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */

-				RingBuffer_Remove(&USARTtoUSB_Buffer);

-			}

-		}

-

-		/* Load the next byte from the USART transmit buffer into the USART */

-		if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))

-		  Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));

-

-		CDC_Device_USBTask(&VirtualSerial_CDC_Interface);

-		USB_USBTask();

-	}

+  SetupHardware();

+

+  RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));

+  RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));

+

+  sei();

+

+  for (;;)

+  {

+    /* Only try to read in bytes from the CDC interface if the transmit buffer is not full */

+    if (!(RingBuffer_IsFull(&USBtoUSART_Buffer)))

+    {

+      int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);

+

+      /* Read bytes from the USB OUT endpoint into the USART transmit buffer */

+      if (!(ReceivedByte < 0))

+        RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);

+    }

+

+    /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */

+    uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);

+    if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75)))

+    {

+      /* Clear flush timer expiry flag */

+      TIFR0 |= (1 << TOV0);

+

+      /* Read bytes from the USART receive buffer into the USB IN endpoint */

+      while (BufferCount--)

+      {

+        /* Try to send the next byte of data to the host, abort if there is an error without dequeuing */

+        if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,

+                                RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)

+        {

+          break;

+        }

+

+        /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */

+        RingBuffer_Remove(&USARTtoUSB_Buffer);

+      }

+    }

+

+    /* Load the next byte from the USART transmit buffer into the USART */

+    if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))

+      Serial_SendByte(RingBuffer_Remove(&USBtoUSART_Buffer));

+

+    CDC_Device_USBTask(&VirtualSerial_CDC_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 watchdog if enabled by bootloader/fuses */

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

+  wdt_disable();

 

   cpu_init();

   led_init();

-	USB_Init();

+  USB_Init();

 

-	/* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */

-	TCCR0B = (1 << CS02);

+  /* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */

+  TCCR0B = (1 << CS02);

 }

 

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

@@ -208,9 +208,9 @@ void EVENT_USB_Device_Disconnect(void)
 /** Event handler for the library USB Configuration Changed event. */

 void EVENT_USB_Device_ConfigurationChanged(void)

 {

-	bool ConfigSuccess = true;

+  bool ConfigSuccess = true;

 

-	ConfigSuccess &= CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);

+  ConfigSuccess &= CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);

 

   led_toggle();

   _delay_ms(10);

@@ -220,7 +220,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 /** Event handler for the library USB Control Request reception event. */

 void EVENT_USB_Device_ControlRequest(void)

 {

-	CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);

+  CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);

 }

 

 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer

@@ -228,10 +228,10 @@ void EVENT_USB_Device_ControlRequest(void)
  */

 ISR(USART1_RX_vect, ISR_BLOCK)

 {

-	uint8_t ReceivedByte = UDR1;

+  uint8_t ReceivedByte = UDR1;

 

-	if (USB_DeviceState == DEVICE_STATE_Configured)

-	  RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);

+  if (USB_DeviceState == DEVICE_STATE_Configured)

+    RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);

 }

 

 /** Event handler for the CDC Class driver Line Encoding Changed event.

@@ -240,45 +240,45 @@ ISR(USART1_RX_vect, ISR_BLOCK)
  */

 void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)

 {

-	uint8_t ConfigMask = 0;

-

-	switch (CDCInterfaceInfo->State.LineEncoding.ParityType)

-	{

-		case CDC_PARITY_Odd:

-			ConfigMask = ((1 << UPM11) | (1 << UPM10));

-			break;

-		case CDC_PARITY_Even:

-			ConfigMask = (1 << UPM11);

-			break;

-	}

-

-	if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)

-	  ConfigMask |= (1 << USBS1);

-

-	switch (CDCInterfaceInfo->State.LineEncoding.DataBits)

-	{

-		case 6:

-			ConfigMask |= (1 << UCSZ10);

-			break;

-		case 7:

-			ConfigMask |= (1 << UCSZ11);

-			break;

-		case 8:

-			ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));

-			break;

-	}

-

-	/* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */

-	UCSR1B = 0;

-	UCSR1A = 0;

-	UCSR1C = 0;

-

-	/* Set the new baud rate before configuring the USART */

-	UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);

-

-	/* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */

-	UCSR1C = ConfigMask;

-	UCSR1A = (1 << U2X1);

-	UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));

+  uint8_t ConfigMask = 0;

+

+  switch (CDCInterfaceInfo->State.LineEncoding.ParityType)

+  {

+    case CDC_PARITY_Odd:

+      ConfigMask = ((1 << UPM11) | (1 << UPM10));

+      break;

+    case CDC_PARITY_Even:

+      ConfigMask = (1 << UPM11);

+      break;

+  }

+

+  if (CDCInterfaceInfo->State.LineEncoding.CharFormat == CDC_LINEENCODING_TwoStopBits)

+    ConfigMask |= (1 << USBS1);

+

+  switch (CDCInterfaceInfo->State.LineEncoding.DataBits)

+  {

+    case 6:

+      ConfigMask |= (1 << UCSZ10);

+      break;

+    case 7:

+      ConfigMask |= (1 << UCSZ11);

+      break;

+    case 8:

+      ConfigMask |= ((1 << UCSZ11) | (1 << UCSZ10));

+      break;

+  }

+

+  /* Must turn off USART before reconfiguring it, otherwise incorrect operation may occur */

+  UCSR1B = 0;

+  UCSR1A = 0;

+  UCSR1C = 0;

+

+  /* Set the new baud rate before configuring the USART */

+  UBRR1  = SERIAL_2X_UBBRVAL(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS);

+

+  /* Reconfigure the USART in double speed mode for a wider baud rate range at the expense of accuracy */

+  UCSR1C = ConfigMask;

+  UCSR1A = (1 << U2X1);

+  UCSR1B = ((1 << RXCIE1) | (1 << TXEN1) | (1 << RXEN1));

 }