aboutsummaryrefslogtreecommitdiffstats
path: root/demos/nil
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-09 08:11:22 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2013-09-09 08:11:22 +0000
commit69e460cf3d27b4604e1787b0525a547d8fb53110 (patch)
treeebd37bf6ec6b00a310bfc12c60cfb89430a71386 /demos/nil
parent2bb04cb0f5573f45ddc0de7cdc386519eed8583d (diff)
downloadChibiOS-69e460cf3d27b4604e1787b0525a547d8fb53110.tar.gz
ChibiOS-69e460cf3d27b4604e1787b0525a547d8fb53110.tar.bz2
ChibiOS-69e460cf3d27b4604e1787b0525a547d8fb53110.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6280 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/nil')
-rw-r--r--demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h1
-rw-r--r--demos/nil/NIL-STM32L152-DISCOVERY/mcuconf.h8
2 files changed, 5 insertions, 4 deletions
diff --git a/demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h b/demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h
index 6929b9c32..2dd58d1a9 100644
--- a/demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h
+++ b/demos/nil/NIL-STM32F373-STM32373C_EVAL/mcuconf.h
@@ -127,6 +127,7 @@
*/
#define STM32_I2C_USE_I2C1 FALSE
#define STM32_I2C_USE_I2C2 FALSE
+#define STM32_I2C_BUSY_TIMEOUT 50
#define STM32_I2C_I2C1_IRQ_PRIORITY 10
#define STM32_I2C_I2C2_IRQ_PRIORITY 10
#define STM32_I2C_I2C1_DMA_PRIORITY 1
diff --git a/demos/nil/NIL-STM32L152-DISCOVERY/mcuconf.h b/demos/nil/NIL-STM32L152-DISCOVERY/mcuconf.h
index 188b543eb..01cd9ee48 100644
--- a/demos/nil/NIL-STM32L152-DISCOVERY/mcuconf.h
+++ b/demos/nil/NIL-STM32L152-DISCOVERY/mcuconf.h
@@ -96,12 +96,12 @@
*/
#define STM32_I2C_USE_I2C1 FALSE
#define STM32_I2C_USE_I2C2 FALSE
+#define STM32_I2C_BUSY_TIMEOUT 50
#define STM32_I2C_I2C1_IRQ_PRIORITY 5
#define STM32_I2C_I2C2_IRQ_PRIORITY 5
#define STM32_I2C_I2C1_DMA_PRIORITY 3
#define STM32_I2C_I2C2_DMA_PRIORITY 3
-#define STM32_I2C_I2C1_DMA_ERROR_HOOK() chSysHalt()
-#define STM32_I2C_I2C2_DMA_ERROR_HOOK() chSysHalt()
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
/*
* ICU driver system settings.
@@ -145,7 +145,7 @@
#define STM32_SPI_SPI2_DMA_PRIORITY 1
#define STM32_SPI_SPI1_IRQ_PRIORITY 10
#define STM32_SPI_SPI2_IRQ_PRIORITY 10
-#define STM32_SPI_DMA_ERROR_HOOK(spip) chSysHalt()
+#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure")
/*
* UART driver system settings.
@@ -159,7 +159,7 @@
#define STM32_UART_USART1_DMA_PRIORITY 0
#define STM32_UART_USART2_DMA_PRIORITY 0
#define STM32_UART_USART3_DMA_PRIORITY 0
-#define STM32_UART_DMA_ERROR_HOOK(uartp) chSysHalt()
+#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure")
/*
* USB driver system settings.