diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-01-30 19:18:26 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2011-01-30 19:18:26 +0000 |
| commit | 22781883e073a764779a36fe1a0b02baf8f946a0 (patch) | |
| tree | b9a5f809075416413e9f323b18b4120f516e5917 /os/hal/src/hal.c | |
| parent | 5e31d55f748df66a6fef7570b4c11947e360d3fa (diff) | |
| download | ChibiOS-22781883e073a764779a36fe1a0b02baf8f946a0.tar.gz ChibiOS-22781883e073a764779a36fe1a0b02baf8f946a0.tar.bz2 ChibiOS-22781883e073a764779a36fe1a0b02baf8f946a0.zip | |
Merged the USB branch and made the needed adjustments, not tested yet.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2695 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/src/hal.c')
| -rw-r--r-- | os/hal/src/hal.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/os/hal/src/hal.c b/os/hal/src/hal.c index 0913ad7a4..bfbaa3e84 100644 --- a/os/hal/src/hal.c +++ b/os/hal/src/hal.c @@ -81,11 +81,17 @@ void halInit(void) { #if HAL_USE_SPI || defined(__DOXYGEN__)
spiInit();
#endif
+#if HAL_USE_UART || defined(__DOXYGEN__)
+ uartInit();
+#endif
+#if HAL_USE_USB || defined(__DOXYGEN__)
+ usbInit();
+#endif
#if HAL_USE_MMC_SPI || defined(__DOXYGEN__)
mmcInit();
#endif
-#if HAL_USE_UART || defined(__DOXYGEN__)
- uartInit();
+#if HAL_USE_SERIAL_USB || defined(__DOXYGEN__)
+ sduInit();
#endif
/* Board specific initialization.*/
boardInit();
|