X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Fser_avr.c;h=9014cccf5fdbc7168079b4176fd4963a3c8b6faf;hb=f236c8017e2e0398805eedfa05d4b26e7c707a8e;hp=e7513590143820ddaab6898bffd5bb0f6b3435fe;hpb=86cf322544e9546782ee25606ccd2f1dbb50c39b;p=bertos.git

diff --git a/drv/ser_avr.c b/drv/ser_avr.c
index e7513590..9014cccf 100755
--- a/drv/ser_avr.c
+++ b/drv/ser_avr.c
@@ -38,6 +38,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.15  2004/09/14 21:05:36  bernie
+ *#* Use debug.h instead of kdebug.h; Use new AVR pin names; Spelling fixes.
+ *#*
  *#* Revision 1.14  2004/09/06 21:50:00  bernie
  *#* Spelling fixes.
  *#*
@@ -81,7 +84,7 @@
 #include "config.h"
 #include "hw.h"  /* Required for bus macros overrides */
 
-#include <drv/kdebug.h>
+#include <debug.h>
 #include <drv/timer.h>
 #include <mware/fifobuf.h>
 
@@ -220,9 +223,9 @@
 /* SPI port and pin configuration */
 #define SPI_PORT      PORTB
 #define SPI_DDR       DDRB
-#define SPI_SCK_BIT   PORTB1
-#define SPI_MOSI_BIT  PORTB2
-#define SPI_MISO_BIT  PORTB3
+#define SPI_SCK_BIT   PB1
+#define SPI_MOSI_BIT  PB2
+#define SPI_MISO_BIT  PB3
 
 /* USART registers definitions */
 #if defined(__AVR_ATmega64__) || defined(__AVR_ATmega128__)
@@ -706,7 +709,7 @@ SIGNAL(SIG_UART1_TRANS)
  * Serial 0 RX complete interrupt handler.
  *
  * This handler is interruptible.
- * Interrupt are re-enabled as soon as recv complete interrupt is
+ * Interrupt are reenabled as soon as recv complete interrupt is
  * disabled. Using INTERRUPT() is troublesome when the serial
  * is heavily loaded, because an interrupt could be retriggered
  * when executing the handler prologue before RXCIE is disabled.
@@ -746,7 +749,7 @@ SIGNAL(SIG_UART0_RECV)
 #endif
 	}
 
-	/* Re-enable receive complete int */
+	/* Reenable receive complete int */
 	//DISABLE_INTS;
 	//UCSR0B |= BV(RXCIE);
 
@@ -760,7 +763,7 @@ SIGNAL(SIG_UART0_RECV)
  * Serial 1 RX complete interrupt handler.
  *
  * This handler is interruptible.
- * Interrupt are re-enabled as soon as recv complete interrupt is
+ * Interrupt are reenabled as soon as recv complete interrupt is
  * disabled. Using INTERRUPT() is troublesome when the serial
  * is heavily loaded, because an interrupt could be retriggered
  * when executing the handler prologue before RXCIE is disabled.