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

diff --git a/bertos/cfg/cfg_i2c.h b/bertos/cfg/cfg_i2c.h
new file mode 100644 (file)
index 0000000..9ff37c4
--- /dev/null
+++ b/bertos/cfg/cfg_i2c.h
@@ -0,0 +1,48 @@
+/**
+ * \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 2008 Develer S.r.l. (http://www.develer.com/)
+ * All Rights Reserved.
+ * -->
+ *
+ * \brief Configuration file for I2C module.
+ *
+ * \version $Id$
+ *
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+#ifndef CFG_I2C_H
+#define CFG_I2C_H
+
+/// Comunication frequency
+#define CONFIG_I2C_FREQ  100000UL
+
+#endif /* CFG_I2C_H */
+
+

diff --git a/bertos/cfg/cfg_twi.h b/bertos/cfg/cfg_twi.h
deleted file mode 100644 (file)
index dbfffaf..0000000
--- a/bertos/cfg/cfg_twi.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * \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 2008 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
- * -->
- *
- * \brief Configuration file for TWI module.
- *
- * \version $Id$
- *
- * \author Daniele Basile <asterix@develer.com>
- */
-
-#ifndef CFG_TWI_H
-#define CFG_TWI_H
-
-/// Comunication frequency
-#define CONFIG_TWI_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 */
-
-

diff --git a/bertos/cpu/avr/drv/i2c_avr.c b/bertos/cpu/avr/drv/i2c_avr.c
index 80b97ad645b8ee63fe7b3f565baef06c0e92a3be..cd7a4ebf81e47e9355d2bfe33660fbcc5dce23d4 100644 (file)
--- 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;