I2C. Merged code from trunk.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/i2c_dev@3036 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 7 insertions, 6 deletions

diff --git a/os/hal/platforms/AVR/serial_lld.c b/os/hal/platforms/AVR/serial_lld.c
index f78abac18..a61d6b0c2 100644
--- a/os/hal/platforms/AVR/serial_lld.c
+++ b/os/hal/platforms/AVR/serial_lld.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -154,7 +155,7 @@ static void usart1_deinit(void) {
 /**

  * @brief   USART0 RX interrupt handler.

  *

- * @isr
+ * @isr

  */

 CH_IRQ_HANDLER(USART0_RX_vect) {

   uint8_t sra;

@@ -174,7 +175,7 @@ CH_IRQ_HANDLER(USART0_RX_vect) {
 /**

  * @brief   USART0 TX interrupt handler.

  *

- * @isr
+ * @isr

  */

 CH_IRQ_HANDLER(USART0_UDRE_vect) {

   msg_t b;

@@ -182,7 +183,7 @@ CH_IRQ_HANDLER(USART0_UDRE_vect) {
   CH_IRQ_PROLOGUE();

 

   chSysLockFromIsr();

-  b = sdRequestDataI(&SER1);

+  b = sdRequestDataI(&SD1);

   chSysUnlockFromIsr();

   if (b < Q_OK)

     UCSR0B &= ~(1 << UDRIE);

@@ -197,7 +198,7 @@ CH_IRQ_HANDLER(USART0_UDRE_vect) {
 /**

  * @brief   USART1 RX interrupt handler.

  *

- * @isr
+ * @isr

  */

 CH_IRQ_HANDLER(USART1_RX_vect) {

   uint8_t sra;

@@ -217,7 +218,7 @@ CH_IRQ_HANDLER(USART1_RX_vect) {
 /**

  * @brief   USART1 TX interrupt handler.

  *

- * @isr
+ * @isr

  */

 CH_IRQ_HANDLER(USART1_UDRE_vect) {

   msg_t b;