Fix TemperatureDataLogger - sample tick timer wasn't being initialized in the correct...

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

diff --git a/LUFA/Drivers/Peripheral/Serial.c b/LUFA/Drivers/Peripheral/Serial.c
index e1c7449..43f9011 100644 (file)
--- a/LUFA/Drivers/Peripheral/Serial.c
+++ b/LUFA/Drivers/Peripheral/Serial.c
@@ -9,13 +9,13 @@
 /*\r
   Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\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
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all 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 without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -30,18 +30,6 @@
 \r
 #include "Serial.h"\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
 void Serial_TxString_P(const char *FlashStringPtr)\r
 {\r
        uint8_t CurrByte;\r