Fixed ISR definition conflict in the XPLAIN bridge between the software UART and...

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

diff --git a/LUFA/Drivers/Peripheral/Serial.c b/LUFA/Drivers/Peripheral/Serial.c
index e1c7449..b1141de 100644 (file)
--- a/LUFA/Drivers/Peripheral/Serial.c
+++ b/LUFA/Drivers/Peripheral/Serial.c
@@ -1,65 +1,53 @@
-/*\r
-             LUFA Library\r
-     Copyright (C) Dean Camera, 2009.\r
-              \r
-  dean [at] fourwalledcubicle [dot] com\r
-      www.fourwalledcubicle.com\r
-*/\r
-\r
-/*\r
-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
-  software without specific, written prior permission.\r
-\r
-  The author disclaim all warranties with regard to this\r
-  software, including all implied warranties of merchantability\r
-  and fitness.  In no event shall the author be liable for any\r
-  special, indirect or consequential damages or any damages\r
-  whatsoever resulting from loss of use, data or profits, whether\r
-  in an action of contract, negligence or other tortious action,\r
-  arising out of or in connection with the use or performance of\r
-  this software.\r
-*/\r
-\r
-#include "Serial.h"\r
-\r
-void Serial_Init(const uint32_t BaudRate, const bool DoubleSpeed)\r
-{\r
-       UCSR1A = ((DoubleSpeed) ? (1 << U2X1) : 0);\r
-       UCSR1B = ((1 << RXEN1)  | (1 << TXEN1));\r
-       UCSR1C = ((1 << UCSZ11) | (1 << UCSZ10));\r
-       \r
-       DDRD  |= (1 << 3);      \r
-       PORTD |= (1 << 2);\r
-       \r
-       UBRR1  = SERIAL_UBBRVAL(BaudRate);\r
-}\r
-\r
-void Serial_TxString_P(const char *FlashStringPtr)\r
-{\r
-       uint8_t CurrByte;\r
-\r
-       while ((CurrByte = pgm_read_byte(FlashStringPtr)) != 0x00)\r
-       {\r
-               Serial_TxByte(CurrByte);\r
-               FlashStringPtr++;\r
-       }\r
-}\r
-\r
-void Serial_TxString(const char *StringPtr)\r
-{\r
-       uint8_t CurrByte;\r
-\r
-       while ((CurrByte = *StringPtr) != 0x00)\r
-       {\r
-               Serial_TxByte(CurrByte);\r
-               StringPtr++;\r
-       }\r
-}\r
+/*
+             LUFA Library
+     Copyright (C) Dean Camera, 2010.
+              
+  dean [at] fourwalledcubicle [dot] com
+      www.fourwalledcubicle.com
+*/
+
+/*
+  Copyright 2010  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
+  without fee, provided that the above copyright notice appear in 
+  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 
+  software without specific, written prior permission.
+
+  The author disclaim all warranties with regard to this
+  software, including all implied warranties of merchantability
+  and fitness.  In no event shall the author be liable for any
+  special, indirect or consequential damages or any damages
+  whatsoever resulting from loss of use, data or profits, whether
+  in an action of contract, negligence or other tortious action,
+  arising out of or in connection with the use or performance of
+  this software.
+*/
+
+#include "Serial.h"
+
+void Serial_TxString_P(const char* FlashStringPtr)
+{
+       uint8_t CurrByte;
+
+       while ((CurrByte = pgm_read_byte(FlashStringPtr)) != 0x00)
+       {
+               Serial_TxByte(CurrByte);
+               FlashStringPtr++;
+       }
+}
+
+void Serial_TxString(const char* StringPtr)
+{
+       uint8_t CurrByte;
+
+       while ((CurrByte = *StringPtr) != 0x00)
+       {
+               Serial_TxByte(CurrByte);
+               StringPtr++;
+       }
+}