diff options
| author | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-21 17:03:19 +0100 |
|---|---|---|
| committer | Stephane D'Alu <sdalu@sdalu.com> | 2016-02-21 17:03:19 +0100 |
| commit | e9a1a01f90ab2dae92def1547c81ae778d690cdb (patch) | |
| tree | b588b1a09357599530841bedac2823486b8f12c9 /os/hal/src/hal_community.c | |
| parent | 709c28c9299e4464a0654443f87ce0180403fef8 (diff) | |
| parent | b634bd9beef41b5b141b994efa4ac3d55505d0c4 (diff) | |
| download | ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.tar.gz ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.tar.bz2 ChibiOS-Contrib-e9a1a01f90ab2dae92def1547c81ae778d690cdb.zip | |
Merge branch 'master' into rng
Added haltest
Conflicts:
os/hal/hal.mk
os/hal/include/hal_community.h
os/hal/src/hal_community.c
Diffstat (limited to 'os/hal/src/hal_community.c')
| -rw-r--r-- | os/hal/src/hal_community.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/os/hal/src/hal_community.c b/os/hal/src/hal_community.c index 210df69..4c48113 100644 --- a/os/hal/src/hal_community.c +++ b/os/hal/src/hal_community.c @@ -68,6 +68,14 @@ void halCommunityInit(void) { #if HAL_USE_RNG || defined(__DOXYGEN__)
rngInit();
#endif
+
+#if HAL_USE_USBH || defined(__DOXYGEN__)
+ usbhInit();
+#endif
+
+#if HAL_USE_TIMCAP || defined(__DOXYGEN__)
+ timcapInit();
+#endif
}
#endif /* HAL_USE_COMMUNITY */
|