Update projects using FatFS and PetiteFatFS to the latest library versions.

[pub/USBasp.git] / LUFA / Drivers / Peripheral / Serial.c

diff --git a/LUFA/Drivers/Peripheral/Serial.c b/LUFA/Drivers/Peripheral/Serial.c
index 0d97e28..99af200 100644 (file)
--- a/LUFA/Drivers/Peripheral/Serial.c
+++ b/LUFA/Drivers/Peripheral/Serial.c
@@ -1,21 +1,21 @@
 /*
              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  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 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

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

   all copies and that both that the copyright notice and this
   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 
+  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 without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -30,24 +30,59 @@
 
 #include "Serial.h"
 
 
 #include "Serial.h"
 

-void Serial_TxString_P(const char *FlashStringPtr)
+FILE USARTSerialStream;
+
+int Serial_putchar(char DataByte,
+                   FILE *Stream)
+{
+       (void)Stream;
+
+       Serial_SendByte(DataByte);
+       return 0;
+}
+
+int Serial_getchar(FILE *Stream)
+{
+       (void)Stream;
+
+       if (!(Serial_IsCharReceived()))
+         return _FDEV_EOF;
+
+       return Serial_ReceiveByte();
+}
+
+int Serial_getchar_Blocking(FILE *Stream)
+{
+       (void)Stream;
+
+       while (!(Serial_IsCharReceived()));
+       return Serial_ReceiveByte();
+}
+
+void Serial_SendString_P(const char* FlashStringPtr)

 {
        uint8_t CurrByte;
 
        while ((CurrByte = pgm_read_byte(FlashStringPtr)) != 0x00)
        {
 {
        uint8_t CurrByte;
 
        while ((CurrByte = pgm_read_byte(FlashStringPtr)) != 0x00)
        {

-               Serial_TxByte(CurrByte);
+               Serial_SendByte(CurrByte);

                FlashStringPtr++;
        }
 }
 
                FlashStringPtr++;
        }
 }
 

-void Serial_TxString(const char *StringPtr)
+void Serial_SendString(const char* StringPtr)

 {
        uint8_t CurrByte;
 
        while ((CurrByte = *StringPtr) != 0x00)
        {
 {
        uint8_t CurrByte;
 
        while ((CurrByte = *StringPtr) != 0x00)
        {

-               Serial_TxByte(CurrByte);
+               Serial_SendByte(CurrByte);

                StringPtr++;
        }
 }
                StringPtr++;
        }
 }

+
+void Serial_SendData(const uint8_t* Buffer, uint16_t Length)
+{
+       while (Length--)
+         Serial_SendByte(*(Buffer++));
+}