From de38efdc972e24ff7eb7a80ec40ad666e1f66bd1 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 24 Aug 2013 08:50:25 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6216 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- testhal/STM32F4xx/ADC/mcuconf.h | 5 ++--- testhal/STM32F4xx/CAN/mcuconf.h | 5 ++--- testhal/STM32F4xx/DMA_STORM/mcuconf.h | 5 ++--- testhal/STM32F4xx/EXT/mcuconf.h | 5 ++--- testhal/STM32F4xx/GPT/mcuconf.h | 5 ++--- testhal/STM32F4xx/I2C/mcuconf.h | 5 ++--- testhal/STM32F4xx/IRQ_STORM/mcuconf.h | 5 ++--- testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h | 5 ++--- testhal/STM32F4xx/PWM-ICU/mcuconf.h | 5 ++--- testhal/STM32F4xx/RTC/mcuconf.h | 5 ++--- testhal/STM32F4xx/SDC/mcuconf.h | 5 ++--- testhal/STM32F4xx/SPI/mcuconf.h | 5 ++--- testhal/STM32F4xx/UART/mcuconf.h | 5 ++--- testhal/STM32F4xx/USB_CDC/mcuconf.h | 5 ++--- 14 files changed, 28 insertions(+), 42 deletions(-) (limited to 'testhal/STM32F4xx') diff --git a/testhal/STM32F4xx/ADC/mcuconf.h b/testhal/STM32F4xx/ADC/mcuconf.h index dd12624ac..1b482ab1a 100644 --- a/testhal/STM32F4xx/ADC/mcuconf.h +++ b/testhal/STM32F4xx/ADC/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/CAN/mcuconf.h b/testhal/STM32F4xx/CAN/mcuconf.h index 9e6b55a96..5cc664ba5 100644 --- a/testhal/STM32F4xx/CAN/mcuconf.h +++ b/testhal/STM32F4xx/CAN/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/DMA_STORM/mcuconf.h b/testhal/STM32F4xx/DMA_STORM/mcuconf.h index 03e8ba816..e89e1abd0 100644 --- a/testhal/STM32F4xx/DMA_STORM/mcuconf.h +++ b/testhal/STM32F4xx/DMA_STORM/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/EXT/mcuconf.h b/testhal/STM32F4xx/EXT/mcuconf.h index 0ef90c517..111dcb990 100644 --- a/testhal/STM32F4xx/EXT/mcuconf.h +++ b/testhal/STM32F4xx/EXT/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/GPT/mcuconf.h b/testhal/STM32F4xx/GPT/mcuconf.h index 570b69f4a..202e09743 100644 --- a/testhal/STM32F4xx/GPT/mcuconf.h +++ b/testhal/STM32F4xx/GPT/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/I2C/mcuconf.h b/testhal/STM32F4xx/I2C/mcuconf.h index f577a9e77..3cd35c6c9 100644 --- a/testhal/STM32F4xx/I2C/mcuconf.h +++ b/testhal/STM32F4xx/I2C/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 TRUE #define STM32_I2C_USE_I2C2 TRUE #define STM32_I2C_USE_I2C3 TRUE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/IRQ_STORM/mcuconf.h b/testhal/STM32F4xx/IRQ_STORM/mcuconf.h index a1290a249..b5597bde6 100644 --- a/testhal/STM32F4xx/IRQ_STORM/mcuconf.h +++ b/testhal/STM32F4xx/IRQ_STORM/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h b/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h index a1290a249..b5597bde6 100644 --- a/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h +++ b/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/PWM-ICU/mcuconf.h b/testhal/STM32F4xx/PWM-ICU/mcuconf.h index 4ff4bd0ce..b492450ab 100644 --- a/testhal/STM32F4xx/PWM-ICU/mcuconf.h +++ b/testhal/STM32F4xx/PWM-ICU/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/RTC/mcuconf.h b/testhal/STM32F4xx/RTC/mcuconf.h index 77aaa1b61..d6499e99a 100644 --- a/testhal/STM32F4xx/RTC/mcuconf.h +++ b/testhal/STM32F4xx/RTC/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/SDC/mcuconf.h b/testhal/STM32F4xx/SDC/mcuconf.h index 174a9fe20..4ea0f59cf 100644 --- a/testhal/STM32F4xx/SDC/mcuconf.h +++ b/testhal/STM32F4xx/SDC/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/SPI/mcuconf.h b/testhal/STM32F4xx/SPI/mcuconf.h index 839a0d38d..26d037dd9 100644 --- a/testhal/STM32F4xx/SPI/mcuconf.h +++ b/testhal/STM32F4xx/SPI/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/UART/mcuconf.h b/testhal/STM32F4xx/UART/mcuconf.h index 960ea4e2d..0c728db6c 100644 --- a/testhal/STM32F4xx/UART/mcuconf.h +++ b/testhal/STM32F4xx/UART/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. diff --git a/testhal/STM32F4xx/USB_CDC/mcuconf.h b/testhal/STM32F4xx/USB_CDC/mcuconf.h index 35fdaf411..3a81db0e7 100644 --- a/testhal/STM32F4xx/USB_CDC/mcuconf.h +++ b/testhal/STM32F4xx/USB_CDC/mcuconf.h @@ -139,6 +139,7 @@ #define STM32_I2C_USE_I2C1 FALSE #define STM32_I2C_USE_I2C2 FALSE #define STM32_I2C_USE_I2C3 FALSE +#define STM32_I2C_BUSY_TIMEOUT 50 #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 0) #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) #define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) @@ -151,9 +152,7 @@ #define STM32_I2C_I2C1_DMA_PRIORITY 3 #define STM32_I2C_I2C2_DMA_PRIORITY 3 #define STM32_I2C_I2C3_DMA_PRIORITY 3 -#define STM32_I2C_I2C1_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C2_DMA_ERROR_HOOK() osalSysHalt("DMA failure") -#define STM32_I2C_I2C3_DMA_ERROR_HOOK() osalSysHalt("DMA failure") +#define STM32_I2C_DMA_ERROR_HOOK(i2cp) chSysHalt("DMA failure") /* * ICU driver system settings. -- cgit v1.2.3