diff options
| author | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2010-02-23 01:03:27 +0000 |
|---|---|---|
| committer | Dean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28> | 2010-02-23 01:03:27 +0000 |
| commit | f349e542ba64e398236463d79e6ab49aa967690a (patch) | |
| tree | 092c11a135f245a63fe3f3ae4391f1b0eeb9dab8 /LUFA/Drivers/Peripheral/AVR8 | |
| parent | bd2f6cc305e22f88e18ec5fe64c0a65228f4bc04 (diff) | |
Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin.
Fix broken AVR8 Serial peripheral driver.
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1150 d5102386-fcda-11dd-9fdb-3debd5008f28
Diffstat (limited to 'LUFA/Drivers/Peripheral/AVR8')
| -rw-r--r-- | LUFA/Drivers/Peripheral/AVR8/SPI.h | 1 | ||||
| -rw-r--r-- | LUFA/Drivers/Peripheral/AVR8/Serial.h | 26 | ||||
| -rw-r--r-- | LUFA/Drivers/Peripheral/AVR8/TWI.h | 2 |
3 files changed, 23 insertions, 6 deletions
diff --git a/LUFA/Drivers/Peripheral/AVR8/SPI.h b/LUFA/Drivers/Peripheral/AVR8/SPI.h index 3440cc9f..f466162b 100644 --- a/LUFA/Drivers/Peripheral/AVR8/SPI.h +++ b/LUFA/Drivers/Peripheral/AVR8/SPI.h @@ -51,6 +51,7 @@ #define __SPI_AVR8_H__
/* Includes: */
+ #include <avr/io.h>
#include <stdbool.h>
/* Preprocessor Checks: */
diff --git a/LUFA/Drivers/Peripheral/AVR8/Serial.h b/LUFA/Drivers/Peripheral/AVR8/Serial.h index 282528bb..0421dea7 100644 --- a/LUFA/Drivers/Peripheral/AVR8/Serial.h +++ b/LUFA/Drivers/Peripheral/AVR8/Serial.h @@ -80,7 +80,7 @@ */
static inline bool Serial_IsCharReceived(void);
#else
- #define Serial_IsCharReceived() /* TODO */
+ #define Serial_IsCharReceived() ((UCSR1A & (1 << RXC1)) ? true : false)
#endif
/* Inline Functions: */
@@ -92,13 +92,27 @@ */
static inline void Serial_Init(const uint32_t BaudRate, const bool DoubleSpeed)
{
- // TODO
+ UCSR1A = (DoubleSpeed ? (1 << U2X1) : 0);
+ UCSR1B = ((1 << TXEN1) | (1 << RXEN1));
+ UCSR1C = ((1 << UCSZ11) | (1 << UCSZ10));
+
+ DDRD |= (1 << 3);
+ PORTD |= (1 << 2);
+
+ UBRR1 = (DoubleSpeed ? SERIAL_2X_UBBRVAL(BaudRate) : SERIAL_UBBRVAL(BaudRate));
}
/** Turns off the USART driver, disabling and returning used hardware to their default configuration. */
static inline void Serial_ShutDown(void)
{
- // TODO
+ UCSR1A = 0;
+ UCSR1B = 0;
+ UCSR1C = 0;
+
+ DDRD &= ~(1 << 3);
+ PORTD &= ~(1 << 2);
+
+ UBRR1 = 0;
}
/** Transmits a given byte through the USART.
@@ -107,7 +121,8 @@ */
static inline void Serial_TxByte(const char DataByte)
{
- // TODO
+ while (!(UCSR1A & (1 << UDRE1)));
+ UDR1 = DataByte;
}
/** Receives a byte from the USART.
@@ -116,7 +131,8 @@ */
static inline uint8_t Serial_RxByte(void)
{
- // TODO
+ while (!(UCSR1A & (1 << RXC1)));
+ return UDR1;
}
/* Disable C linkage for C++ Compilers: */
diff --git a/LUFA/Drivers/Peripheral/AVR8/TWI.h b/LUFA/Drivers/Peripheral/AVR8/TWI.h index 673f1b07..d169b823 100644 --- a/LUFA/Drivers/Peripheral/AVR8/TWI.h +++ b/LUFA/Drivers/Peripheral/AVR8/TWI.h @@ -37,7 +37,7 @@ */
/** \ingroup Group_TWI
- * @defgroup Group_TWI_AVR8 Series U4, U6 and U7 Model TWI Driver
+ * @defgroup Group_TWI_AVR8 8-Bit AVR TWI Driver
*
* Master mode TWI driver for the 8-Bit AVRs containing a hardware TWI module.
*
|