From 3fb609d60480eefd5e43d48d13cb9f387c38cb0f Mon Sep 17 00:00:00 2001 From: asterix Date: Tue, 27 May 2008 17:20:07 +0000 Subject: [PATCH] Fix hw includes. Remove CVS logs. Reformat. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1401 38d2e660-2303-0410-9eaa-f027e97ec537 --- bertos/cpu/arm/drv/pwm_at91.h | 2 +- bertos/drv/mcp41.h | 2 +- bertos/drv/ntc.h | 20 +--------------- bertos/drv/phase.h | 43 +++-------------------------------- bertos/drv/pwm.h | 2 +- bertos/drv/thermo.c | 2 +- bertos/drv/thermo.h | 34 ++------------------------- 7 files changed, 10 insertions(+), 95 deletions(-) diff --git a/bertos/cpu/arm/drv/pwm_at91.h b/bertos/cpu/arm/drv/pwm_at91.h index 76c8b940..e86f5235 100644 --- a/bertos/cpu/arm/drv/pwm_at91.h +++ b/bertos/cpu/arm/drv/pwm_at91.h @@ -41,7 +41,7 @@ #ifndef DRV_PWM_AT91_H #define DRV_PWM_AT91_H -#include "pwm_map.h" +#include "hw/pwm_map.h" #include #include diff --git a/bertos/drv/mcp41.h b/bertos/drv/mcp41.h index e9dd60b6..827b903b 100644 --- a/bertos/drv/mcp41.h +++ b/bertos/drv/mcp41.h @@ -40,7 +40,7 @@ #ifndef DRV_MCP41_H #define DRV_MCP41_H -#include "mcp41_map.h" +#include "hw/mcp41_map.h" #include #include diff --git a/bertos/drv/ntc.h b/bertos/drv/ntc.h index 8267d51f..6aa72376 100644 --- a/bertos/drv/ntc.h +++ b/bertos/drv/ntc.h @@ -38,28 +38,10 @@ * \author Francesco Sacchi */ -/*#* - *#* $Log$ - *#* Revision 1.2 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.1 2005/11/04 17:59:47 bernie - *#* Import into DevLib. - *#* - *#* Revision 1.3 2005/06/10 08:56:47 batt - *#* Avoid calling DEG_T_TO_DEG(). - *#* - *#* Revision 1.2 2005/06/10 08:54:58 batt - *#* Rename deg_t conversion macros to accomplish coding standard. - *#* - *#* Revision 1.1 2005/05/24 09:17:58 batt - *#* Move drivers to top-level. - *#*/ - #ifndef DRV_NTC_H #define DRV_NTC_H -#include +#include "hw/ntc_map.h" #include #include diff --git a/bertos/drv/phase.h b/bertos/drv/phase.h index f4e760ea..9a2341e4 100644 --- a/bertos/drv/phase.h +++ b/bertos/drv/phase.h @@ -37,51 +37,14 @@ * \author Francesco Sacchi */ -/*#* - *#* $Log$ - *#* Revision 1.2 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.1 2005/11/04 18:06:44 bernie - *#* Import into DevLib. - *#* - *#* Revision 1.1 2005/05/24 09:17:58 batt - *#* Move drivers to top-level. - *#* - *#* Revision 1.9 2005/05/09 16:34:14 batt - *#* Change some function names to accomplish coding standard; Add debug phase_initialized; Change duty_t and power_t to uint16_t. - *#* - *#* Revision 1.8 2005/05/02 12:37:33 batt - *#* Split hw triac map in phase_map.h. - *#* - *#* Revision 1.7 2005/05/02 09:05:03 batt - *#* Rename duty_t and power_t in triac_duty_t and triac_power_t - *#* - *#* Revision 1.6 2005/04/28 15:10:11 batt - *#* Use timer API to add and set events. - *#* - *#* Revision 1.5 2005/04/28 12:04:46 batt - *#* Add some comments. - *#* - *#* Revision 1.4 2005/04/28 10:35:45 batt - *#* Complete phase_setpower. - *#* - *#* Revision 1.3 2005/04/27 19:23:40 batt - *#* Reformat. - *#* - *#* Revision 1.1 2005/04/27 17:13:56 batt - *#* Add triac phase control driver. - *#* - *#*/ - - #ifndef DRV_PHASE_H #define DRV_PHASE_H -#include -#include +#include "hw/phase_map.h" #include +#include + #define TRIAC_MAX_DUTY 100 #define TRIAC_MAX_POWER 100 #define TRIAC_POWER_K TRIAC_MAX_DUTY * (1 / sqrt(2 * TRIAC_MAX_POWER)) diff --git a/bertos/drv/pwm.h b/bertos/drv/pwm.h index 2648b01f..f60986eb 100644 --- a/bertos/drv/pwm.h +++ b/bertos/drv/pwm.h @@ -41,7 +41,7 @@ #ifndef DRV_PWM_H #define DRV_PWM_H -#include +#include "hw/pwm_map.h" #include #define PWM_MAX_DUTY ((pwm_duty_t)0xFFFF) diff --git a/bertos/drv/thermo.c b/bertos/drv/thermo.c index 3a535fb9..d8e2742e 100644 --- a/bertos/drv/thermo.c +++ b/bertos/drv/thermo.c @@ -38,7 +38,7 @@ * \author Francesco Sacchi */ -#include "thermo_map.h" +#include "hw/thermo_map.h" #include "hw/hw_thermo.h" #include diff --git a/bertos/drv/thermo.h b/bertos/drv/thermo.h index 693c086d..9fc20e0d 100644 --- a/bertos/drv/thermo.h +++ b/bertos/drv/thermo.h @@ -49,42 +49,12 @@ * */ -/*#* - *#* $Log$ - *#* Revision 1.3 2006/09/20 20:12:41 marco - *#* Names convention, MOD_* macros. - *#* - *#* Revision 1.2 2006/07/19 12:56:26 bernie - *#* Convert to new Doxygen style. - *#* - *#* Revision 1.1 2005/11/04 17:59:47 bernie - *#* Import into DevLib. - *#* - *#* Revision 1.2 2005/06/14 10:13:36 batt - *#* Better thermo errors handling. - *#* - *#* Revision 1.1 2005/05/24 09:17:58 batt - *#* Move drivers to top-level. - *#* - *#* Revision 1.4 2005/05/10 16:55:10 batt - *#* Add timeout to thermo-regulator; better thermo control handling; change thermo_getStatus() to thermo_status(). - *#* - *#* Revision 1.3 2005/05/10 09:26:54 batt - *#* Add thermo_getStatus for getting status/errors of thermo control. - *#* - *#* Revision 1.2 2005/05/09 19:18:40 batt - *#* Remove old logs. - *#* - *#* Revision 1.1 2005/05/09 16:40:44 batt - *#* Add thermo-control driver - *#*/ - - #ifndef DRV_THERMO_H #define DRV_THERMO_H +#include "hw/thermo_map.h" + #include -#include void thermo_init(void); -- 2.25.1