aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/platforms/Win32
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-11-01 17:29:56 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2010-11-01 17:29:56 +0000
commitd8be44136c1e6d02ee105ac0791f9e6732551fec (patch)
tree31636040799a284f1f3b650f4ece699f4cf5ad7b /os/hal/platforms/Win32
parente1f07aa7c670e670890698ba99df7c07fb78cb5a (diff)
downloadChibiOS-d8be44136c1e6d02ee105ac0791f9e6732551fec.tar.gz
ChibiOS-d8be44136c1e6d02ee105ac0791f9e6732551fec.tar.bz2
ChibiOS-d8be44136c1e6d02ee105ac0791f9e6732551fec.zip
Fixed bug 3100946, renamed HAL switches removing the CH_ part.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2326 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/platforms/Win32')
-rw-r--r--os/hal/platforms/Win32/hal_lld.c4
-rw-r--r--os/hal/platforms/Win32/pal_lld.c4
-rw-r--r--os/hal/platforms/Win32/pal_lld.h4
-rw-r--r--os/hal/platforms/Win32/serial_lld.c4
-rw-r--r--os/hal/platforms/Win32/serial_lld.h4
5 files changed, 10 insertions, 10 deletions
diff --git a/os/hal/platforms/Win32/hal_lld.c b/os/hal/platforms/Win32/hal_lld.c
index afbbae39e..51781b94c 100644
--- a/os/hal/platforms/Win32/hal_lld.c
+++ b/os/hal/platforms/Win32/hal_lld.c
@@ -42,7 +42,7 @@ static LARGE_INTEGER slice;
* @brief PAL setup.
* @details Digital I/O ports static configuration as defined in @p board.h.
*/
-#if CH_HAL_USE_PAL || defined(__DOXYGEN__)
+#if HAL_USE_PAL || defined(__DOXYGEN__)
const PALConfig pal_default_config = {
{0, 0, 0},
{0, 0, 0}
@@ -91,7 +91,7 @@ void hal_lld_init(void) {
void ChkIntSources(void) {
LARGE_INTEGER n;
-#if CH_HAL_USE_SERIAL
+#if HAL_USE_SERIAL
if (sd_lld_interrupt_pending()) {
if (chSchIsRescRequiredExI())
chSchDoRescheduleI();
diff --git a/os/hal/platforms/Win32/pal_lld.c b/os/hal/platforms/Win32/pal_lld.c
index 378557780..54ff76100 100644
--- a/os/hal/platforms/Win32/pal_lld.c
+++ b/os/hal/platforms/Win32/pal_lld.c
@@ -28,7 +28,7 @@
#include "ch.h"
#include "hal.h"
-#if CH_HAL_USE_PAL || defined(__DOXYGEN__)
+#if HAL_USE_PAL || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver exported variables. */
@@ -93,6 +93,6 @@ void _pal_lld_setgroupmode(ioportid_t port,
}
}
-#endif /* CH_HAL_USE_PAL */
+#endif /* HAL_USE_PAL */
/** @} */
diff --git a/os/hal/platforms/Win32/pal_lld.h b/os/hal/platforms/Win32/pal_lld.h
index 2c1955766..b353f2a52 100644
--- a/os/hal/platforms/Win32/pal_lld.h
+++ b/os/hal/platforms/Win32/pal_lld.h
@@ -28,7 +28,7 @@
#ifndef _PAL_LLD_H_
#define _PAL_LLD_H_
-#if CH_HAL_USE_PAL || defined(__DOXYGEN__)
+#if HAL_USE_PAL || defined(__DOXYGEN__)
/*===========================================================================*/
/* Unsupported modes and specific modes */
@@ -196,7 +196,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_PAL */
+#endif /* HAL_USE_PAL */
#endif /* _PAL_LLD_H_ */
diff --git a/os/hal/platforms/Win32/serial_lld.c b/os/hal/platforms/Win32/serial_lld.c
index 43c7b331a..30e479055 100644
--- a/os/hal/platforms/Win32/serial_lld.c
+++ b/os/hal/platforms/Win32/serial_lld.c
@@ -27,7 +27,7 @@
#include "ch.h"
#include "hal.h"
-#if CH_HAL_USE_SERIAL || defined(__DOXYGEN__)
+#if HAL_USE_SERIAL || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver exported variables. */
@@ -258,6 +258,6 @@ bool_t sd_lld_interrupt_pending(void) {
outint(&SD1) || outint(&SD2);
}
-#endif /* CH_HAL_USE_SERIAL */
+#endif /* HAL_USE_SERIAL */
/** @} */
diff --git a/os/hal/platforms/Win32/serial_lld.h b/os/hal/platforms/Win32/serial_lld.h
index 37f96e13b..79a5994f2 100644
--- a/os/hal/platforms/Win32/serial_lld.h
+++ b/os/hal/platforms/Win32/serial_lld.h
@@ -28,7 +28,7 @@
#ifndef _SERIAL_LLD_H_
#define _SERIAL_LLD_H_
-#if CH_HAL_USE_SERIAL || defined(__DOXYGEN__)
+#if HAL_USE_SERIAL || defined(__DOXYGEN__)
/*===========================================================================*/
/* Driver pre-compile time settings. */
@@ -148,7 +148,7 @@ extern "C" {
}
#endif
-#endif /* CH_HAL_USE_SERIAL */
+#endif /* HAL_USE_SERIAL */
#endif /* _SERIAL_LLD_H_ */