From f58b90fce4022247d31d68ba1c0d3a620a9071d8 Mon Sep 17 00:00:00 2001
From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Wed, 21 May 2008 08:54:49 +0000
Subject: [PATCH] Fix hw include. Reformat.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1316 38d2e660-2303-0410-9eaa-f027e97ec537
---
 bertos/cpu/arm/drv/pwm_at91.c |  5 +++--
 bertos/cpu/arm/drv/ser_at91.c | 13 ++++++++-----
 bertos/cpu/avr/drv/sipo.h     |  3 ++-
 bertos/drv/buzzerled.h        |  2 +-
 bertos/drv/lcd_hd44_test.c    |  2 +-
 bertos/drv/phase.c            |  2 +-
 bertos/drv/spi_bitbang.c      |  2 +-
 bertos/drv/stepper.c          | 12 +++++++-----
 bertos/drv/thermo.c           |  8 ++++----
 bertos/drv/timer_test.c       | 15 ++++++++++++---
 10 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/bertos/cpu/arm/drv/pwm_at91.c b/bertos/cpu/arm/drv/pwm_at91.c
index b1fda46f..9bba617d 100644
--- a/bertos/cpu/arm/drv/pwm_at91.c
+++ b/bertos/cpu/arm/drv/pwm_at91.c
@@ -39,14 +39,15 @@
  */
 
 #include "pwm_at91.h"
+#include "hw_cpu.h"
 
-#include <hw/hw_cpu.h>
+#include "appconfig.h"
 
 #include <cfg/macros.h>
 #include <cfg/debug.h>
+
 #include <io/arm.h>
 
-#include "appconfig.h"
 
 /**
  * Register structure for pwm driver.
diff --git a/bertos/cpu/arm/drv/ser_at91.c b/bertos/cpu/arm/drv/ser_at91.c
index 19f36df8..bc1555c2 100644
--- a/bertos/cpu/arm/drv/ser_at91.c
+++ b/bertos/cpu/arm/drv/ser_at91.c
@@ -38,19 +38,22 @@
  * \author Daniele Basile <asterix@develer.com>
  */
 
+#include "hw_ser.h"  /* Required for bus macros overrides */
+#include "hw_cpu.h"  /* CLOCK_FREQ */
+
+#include <cfg/debug.h>
+
+#include <appconfig.h>
+
 #include <io/arm.h>
 
 #include <cpu/attr.h>
+
 #include <drv/ser.h>
 #include <drv/ser_p.h>
 
-#include <hw/hw_ser.h>  /* Required for bus macros overrides */
-#include <hw/hw_cpu.h>  /* CLOCK_FREQ */
-
 #include <mware/fifobuf.h>
-#include <cfg/debug.h>
 
-#include <appconfig.h>
 
 #define SERIRQ_PRIORITY 4 ///< default priority for serial irqs.
 
diff --git a/bertos/cpu/avr/drv/sipo.h b/bertos/cpu/avr/drv/sipo.h
index 15df226a..4c0fdfa6 100644
--- a/bertos/cpu/avr/drv/sipo.h
+++ b/bertos/cpu/avr/drv/sipo.h
@@ -41,8 +41,9 @@
 #ifndef SIPO_H
 #define SIPO_H
 
+#include "hw_sipo.h"
+
 #include <avr/io.h>
-#include <hw/hw_sipo.h>
 
 void sipo_init(void);
 void sipo_putchar(uint8_t c);
diff --git a/bertos/drv/buzzerled.h b/bertos/drv/buzzerled.h
index a9f0b000..c5c97d96 100644
--- a/bertos/drv/buzzerled.h
+++ b/bertos/drv/buzzerled.h
@@ -50,7 +50,7 @@
  *  an enumarator for each device, plus a special symbol NUM_BLDS containing the
  *  number of devices.
  */
-#include <hw/hw_buzzerled.h>
+#include "hw_buzzerled.h"
 
 
 /* Include hw-level implementation. This allows inlining of bld_set, which in turns
diff --git a/bertos/drv/lcd_hd44_test.c b/bertos/drv/lcd_hd44_test.c
index 412e43e9..65107b85 100644
--- a/bertos/drv/lcd_hd44_test.c
+++ b/bertos/drv/lcd_hd44_test.c
@@ -37,7 +37,7 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-#include <hw/hw_lcd.h>
+#include "hw_lcd.h"
 
 #include <cfg/arch_config.h>
 
diff --git a/bertos/drv/phase.c b/bertos/drv/phase.c
index 39eadf47..b56aa61d 100644
--- a/bertos/drv/phase.c
+++ b/bertos/drv/phase.c
@@ -37,7 +37,7 @@
  */
 
 
-#include <hw/hw_phase.h>
+#include "hw_phase.h"
 
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
diff --git a/bertos/drv/spi_bitbang.c b/bertos/drv/spi_bitbang.c
index 10a23889..f0251316 100644
--- a/bertos/drv/spi_bitbang.c
+++ b/bertos/drv/spi_bitbang.c
@@ -41,7 +41,7 @@
 
 
 #include "spi_bitbang.h"
-#include <hw/hw_spi.h>
+#include "hw_spi.h"
 
 #include <cfg/module.h>
 #include <cpu/irq.h>
diff --git a/bertos/drv/stepper.c b/bertos/drv/stepper.c
index 716b094f..39fa288f 100644
--- a/bertos/drv/stepper.c
+++ b/bertos/drv/stepper.c
@@ -18,18 +18,20 @@
 
 #include "stepper.h"
 
+#include "hw_stepper.h"
+#include "hw_sensor.h"
+
+#include "appconfig.h"
+
 #include <cfg/debug.h>
+
 #include <kern/proc.h>
+
 #include <algo/ramp.h>
 #include <drv/stepper_at91.h>
 
-#include <hw/hw_stepper.h>
-#include <hw/hw_sensor.h>
-
 #include <string.h>  // memset
 
-#include "appconfig.h"
-
 /**
  * \name Motor timings
  * \{
diff --git a/bertos/drv/thermo.c b/bertos/drv/thermo.c
index f9dd86cf..cfc1014f 100644
--- a/bertos/drv/thermo.c
+++ b/bertos/drv/thermo.c
@@ -38,17 +38,17 @@
  * \author Francesco Sacchi <batt@develer.com>
  */
 
-#include <hw/thermo_map.h>
-#include <hw/hw_thermo.h>
+#include "thermo_map.h"
+#include "hw_thermo.h"
 
 #include <cfg/module.h>
+#include <cfg/macros.h>
+#include <cfg/debug.h>
 
 #include <drv/thermo.h>
 #include <drv/timer.h>
 #include <drv/ntc.h>
 
-#include <cfg/macros.h>
-#include <cfg/debug.h>
 
 
 /** Interval at which thermo control is performed. */
diff --git a/bertos/drv/timer_test.c b/bertos/drv/timer_test.c
index 170105de..3e9338a8 100644
--- a/bertos/drv/timer_test.c
+++ b/bertos/drv/timer_test.c
@@ -36,9 +36,18 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-#include "timer.c"
-#include "mware/event.c"
-#include "os/hptime.c"
+#ifdef _TEST
+	#include "timer.c"
+	#include "mware/event.c"
+	#include "os/hptime.c"
+
+#else
+	#include <drv/timer.c>
+	#include <mware/event.c>
+	#include <drv/wdt.h>
+
+#endif
+
 
 static void timer_test_constants(void)
 {
-- 
2.25.1