From 6923bfe0dd9c0e6217819249255e5560bbfe1fb7 Mon Sep 17 00:00:00 2001
From: batt <batt@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 6 Oct 2008 17:21:43 +0000
Subject: [PATCH] Merged from external project: 	********** 	r22402 | batt
 | 2008-10-02 11:30:26 +0200 (Thu, 02 Oct 2008) | 1 line

	Rename i2c cfg module.
	**********


git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1871 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/cfg/{cfg_twi.h => cfg_i2c.h} | 18 +++++-------------
 bertos/cpu/avr/drv/i2c_avr.c        |  2 +-
 2 files changed, 6 insertions(+), 14 deletions(-)
 rename bertos/cfg/{cfg_twi.h => cfg_i2c.h} (83%)

diff --git a/bertos/cfg/cfg_twi.h b/bertos/cfg/cfg_i2c.h
similarity index 83%
rename from bertos/cfg/cfg_twi.h
rename to bertos/cfg/cfg_i2c.h
index dbfffafe..9ff37c4e 100644
--- a/bertos/cfg/cfg_twi.h
+++ b/bertos/cfg/cfg_i2c.h
@@ -30,27 +30,19 @@
  * All Rights Reserved.
  * -->
  *
- * \brief Configuration file for TWI module.
+ * \brief Configuration file for I2C module.
  *
  * \version $Id$
  *
  * \author Daniele Basile <asterix@develer.com>
  */
 
-#ifndef CFG_TWI_H
-#define CFG_TWI_H
+#ifndef CFG_I2C_H
+#define CFG_I2C_H
 
 /// Comunication frequency
-#define CONFIG_TWI_FREQ  100000UL
+#define CONFIG_I2C_FREQ  100000UL
 
-/**
-  * TWI start timeout.
-  * For how many milliseconds the twi_start
-  * should try to get an ACK before returning error.
-  *
-  */
-#define CONFIG_TWI_START_TIMEOUT 100
-
-#endif /* CFG_TWI_H */
+#endif /* CFG_I2C_H */
 
 
diff --git a/bertos/cpu/avr/drv/i2c_avr.c b/bertos/cpu/avr/drv/i2c_avr.c
index 80b97ad6..cd7a4ebf 100644
--- a/bertos/cpu/avr/drv/i2c_avr.c
+++ b/bertos/cpu/avr/drv/i2c_avr.c
@@ -107,7 +107,7 @@ bool i2c_start_w(uint8_t id)
 			kprintf("!TW_MT_SLA_(N)ACK: %x\n", TWSR);
 			break;
 		}
-		else if (timer_clock() - start > ms_to_ticks(CONFIG_TWI_START_TIMEOUT))
+		else if (timer_clock() - start > ms_to_ticks(CONFIG_I2C_START_TIMEOUT))
 		{
 			kprintf("Timeout on TWI_MT_START\n");
 			break;
-- 
2.25.1