Move avr drivers.

[bertos.git] / drv / twi.c

diff --git a/drv/twi.c b/drv/twi.c
old mode 100755 (executable)
new mode 100644 (file)
index d0c6537..0d03950
--- a/drv/twi.c
+++ b/drv/twi.c
@@ -1,8 +1,33 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \brief Driver for the AVR ATMega TWI (implementation)
@@ -15,6 +40,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2007/06/07 14:35:12  batt
+ *#* Merge from project_ks.
+ *#*
  *#* Revision 1.7  2006/07/19 12:56:26  bernie
  *#* Convert to new Doxygen style.
  *#*
@@ -41,9 +69,9 @@
 #include "twi.h"
 
 #include <cfg/debug.h>
-#include <cfg/cpu.h>
+#include <cpu/cpu.h>
 #include <cfg/macros.h> // BV()
-#include <hw.h>
+#include <hw_cpu.h>  /* CLOCK_FREQ */
 #include <appconfig.h>
 
 #include <compat/twi.h>
@@ -238,12 +266,12 @@ void twi_init(void)
                 * probably due to some unwanted interaction between the
                 * port pin and the TWI lines.
                 */
-#if defined(__AVR_ATmega64__)
+#if CPU_AVR_ATMEGA64 || CPU_AVR_ATMEGA128 || CPU_AVR_ATMEGA1281
                PORTD |= BV(PD0) | BV(PD1);
-               DDRD |= BV(PD0) | BV(PD1);
-#elif defined(__AVR_ATmega8__)
+               DDRD  |= BV(PD0) | BV(PD1);
+#elif CPU_AVR_ATMEGA8
                PORTC |= BV(PC4) | BV(PC5);
-               DDRC |= BV(PC4) | BV(PC5);
+               DDRC  |= BV(PC4) | BV(PC5);
 #else
                #error Unsupported architecture
 #endif