Merged from external project:

[bertos.git] / bertos / cpu / avr / drv / twi_avr.h

diff --git a/bertos/cpu/avr/drv/twi_avr.h b/bertos/cpu/avr/drv/twi_avr.h
index 1ff8929266401467cec1dc025f270fd8976e4e32..2d496df7e228d3372c07b4f8991002495f13e225 100644 (file)
--- a/bertos/cpu/avr/drv/twi_avr.h
+++ b/bertos/cpu/avr/drv/twi_avr.h
@@ -38,33 +38,18 @@
  * \brief Driver for the AVR ATMega TWI (interface)
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.5  2006/07/19 12:56:26  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.4  2006/03/20 17:49:49  bernie
- *#* Make the TWI driver more generic to work with devices other than EEPROMS.
- *#*
- *#* Revision 1.3  2005/04/11 19:10:28  bernie
- *#* Include top-level headers from cfg/ subdir.
- *#*
- *#* Revision 1.2  2005/02/18 11:19:52  bernie
- *#* Update copyright info.
- *#*
- *#*/
-#ifndef DRV_TWI_H
-#define DRV_TWI_H
+#ifndef DRV_I2C_H
+#define DRV_I2C_H
 
 #include <cfg/compiler.h>
 
-bool twi_start_w(uint8_t id);
-bool twi_start_r(uint8_t id);
-void twi_stop(void);
-bool twi_put(const uint8_t data);
-bool twi_send(const void *_buf, size_t count);
-int twi_get(bool ack);
-bool twi_recv(void *_buf, size_t count);
-void twi_init(void);
+bool i2c_start_w(uint8_t id);
+bool i2c_start_r(uint8_t id);
+void i2c_stop(void);
+bool i2c_put(const uint8_t data);
+bool i2c_send(const void *_buf, size_t count);
+int i2c_get(bool ack);
+bool i2c_recv(void *_buf, size_t count);
+void i2c_init(void);
 
-#endif /* DRV_EEPROM_H */
+#endif /* DRV_I2C_H */