Fix additional void pointer arithmetic in the class driver RNDIS demo.

[pub/USBasp.git] / LUFA / Drivers / Peripheral / XMEGA / Serial_XMEGA.c

diff --git a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
index c7dcd61..b7a39d3 100644 (file)
--- a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
+++ b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2013.
+     Copyright (C) Dean Camera, 2015.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2013  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2015  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


@@ -91,23 +91,26 @@ void Serial_SendData(USART_t* const USART,
                      const void* Buffer,
                      uint16_t Length)
 {
                      const void* Buffer,
                      uint16_t Length)
 {

+       uint8_t* CurrByte = (uint8_t*)Buffer;
+

        while (Length--)
        while (Length--)

-         Serial_SendByte(USART, *((uint8_t*)Buffer++));
+         Serial_SendByte(USART, *(CurrByte++));

 }
 
 }
 

-void Serial_CreateStream(FILE* Stream)
+void Serial_CreateStream(USART_t* USART, FILE* Stream)

 {
        if (!(Stream))
        {
                Stream = &USARTSerialStream;
                stdin  = Stream;
                stdout = Stream;
 {
        if (!(Stream))
        {
                Stream = &USARTSerialStream;
                stdin  = Stream;
                stdout = Stream;

-       }
+    }

 
 

-       *Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
+    *Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
+    fdev_set_udata(Stream, USART);

 }
 
 }
 

-void Serial_CreateBlockingStream(FILE* Stream)
+void Serial_CreateBlockingStream(USART_t* USART, FILE* Stream)

 {
        if (!(Stream))
        {
 {
        if (!(Stream))
        {


@@ -116,7 +119,8 @@ void Serial_CreateBlockingStream(FILE* Stream)
                stdout = Stream;
        }
 
                stdout = Stream;
        }
 

-       *Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar_Blocking, _FDEV_SETUP_RW);
+    *Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar_Blocking, _FDEV_SETUP_RW);
+    fdev_set_udata(Stream, USART);

 }
 
 #endif
 }
 
 #endif