X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/cb779e3d7d32d7c43e0a45bb526de0a04135b0c7..a95d2241851a4877189b11854f25ff65b6a2b411:/LUFA/Drivers/Peripheral/Serial.c

diff --git a/LUFA/Drivers/Peripheral/Serial.c b/LUFA/Drivers/Peripheral/Serial.c
index cb1fd38e4..99af2000c 100644
--- a/LUFA/Drivers/Peripheral/Serial.c
+++ b/LUFA/Drivers/Peripheral/Serial.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] 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
   software and its documentation for any purpose is hereby granted
@@ -30,25 +30,59 @@
 
 #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)
 	{
-		Serial_TxByte(CurrByte);
+		Serial_SendByte(CurrByte);
 		FlashStringPtr++;
 	}
 }
 
-void Serial_TxString(const char* StringPtr)
+void Serial_SendString(const char* StringPtr)
 {
 	uint8_t CurrByte;
 
 	while ((CurrByte = *StringPtr) != 0x00)
 	{
-		Serial_TxByte(CurrByte);
+		Serial_SendByte(CurrByte);
 		StringPtr++;
 	}
 }
 
+void Serial_SendData(const uint8_t* Buffer, uint16_t Length)
+{
+	while (Length--)
+	  Serial_SendByte(*(Buffer++));
+}