[Cryptech-Commits] [sw/libhal] 01/02: Work around the fact that stm-fmc.h now pulls in CMSIS HAL symbols.

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

paul at psgd.org pushed a commit to branch master
in repository sw/libhal.

commit d20ac4036667e9cbf41c4a8011e53ca53a5a2a64
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Tue May 24 21:37:39 2016 -0400

    Work around the fact that stm-fmc.h now pulls in CMSIS HAL symbols.
---
 hal_io_fmc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hal_io_fmc.c b/hal_io_fmc.c
index 9dd3578..5742e56 100644
--- a/hal_io_fmc.c
+++ b/hal_io_fmc.c
@@ -37,6 +37,10 @@
 #include <stdint.h>
 
 #include "stm-fmc.h"
+
+/* stm32f4xx_hal_def.h and hal.h both define HAL_OK as an enum value */
+#define HAL_OK HAL_OKAY
+
 #include "hal.h"
 #include "hal_internal.h"