Merge pull request #99 from pl4nkton/stm32_fixes

Stm32 fixes

4 files changed, 23 insertions, 19 deletions

diff --git a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h
index f0d4c65..f4837f5 100644
--- a/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h
+++ b/os/hal/ports/STM32/LLD/FSMCv1/hal_fsmc.h
@@ -230,6 +230,9 @@ typedef struct {
      defined(STM32F7))
 #define  FSMC_BCR_CCLKEN          ((uint32_t)1 << 20)
 #endif
+#if (defined(STM32F7))
+#define FSMC_BCR_WFDIS            ((uint32_t)1 << 21)
+#endif
 
 /*===========================================================================*/
 /* Driver pre-compile time settings.                                         */
diff --git a/os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.c b/os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.c
index ffc4992..6138481 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.c
+++ b/os/hal/ports/STM32/LLD/TIMv1/hal_qei_lld.c
@@ -194,24 +194,24 @@ void qei_lld_start(QEIDriver *qeip) {
 #endif

   }

    /* Timer configuration.*/

-  qeip->tim->CR1  = 0;                      /* Initially stopped.           */

+  qeip->tim->CR1  = 0;                      /* Initially stopped. */

   qeip->tim->CR2  = 0;

   qeip->tim->PSC  = 0;

   qeip->tim->DIER = 0;

-  qeip->tim->ARR   = 0xFFFF;

+  qeip->tim->ARR  = 0xFFFF;

 

   /* Set Capture Compare 1 and Capture Compare 2 as input. */

    qeip->tim->CCMR1 |= TIM_CCMR1_CC1S_0 | TIM_CCMR1_CC2S_0;

 

   if (qeip->config->mode == QEI_MODE_QUADRATURE) {

     if (qeip->config->resolution == QEI_BOTH_EDGES)

-      qeip->tim->SMCR  = TIM_SMCR_SMS_1 | TIM_SMCR_SMS_0;

+      qeip->tim->SMCR = TIM_SMCR_SMS_1 | TIM_SMCR_SMS_0;

     else

-      qeip->tim->SMCR  = TIM_SMCR_SMS_0;

+      qeip->tim->SMCR = TIM_SMCR_SMS_0;

   } else {

     /* Direction/Clock mode.

      * Direction input on TI1, Clock input on TI2. */

-    qeip->tim->SMCR  = TIM_SMCR_SMS_0;

+    qeip->tim->SMCR = TIM_SMCR_SMS_0;

   }

 

   if (qeip->config->dirinv == QEI_DIRINV_TRUE)

@@ -230,7 +230,7 @@ void qei_lld_start(QEIDriver *qeip) {
 void qei_lld_stop(QEIDriver *qeip) {

 

   if (qeip->state == QEI_READY) {

-    qeip->tim->CR1  = 0;                    /* Timer disabled.              */

+    qeip->tim->CR1 = 0;                    /* Timer disabled. */

 

     /* Clock deactivation.*/

 #if STM32_QEI_USE_TIM1

@@ -275,7 +275,7 @@ void qei_lld_stop(QEIDriver *qeip) {
  */

 void qei_lld_enable(QEIDriver *qeip) {

 

-  qeip->tim->CR1 = TIM_CR1_CEN;            /* Timer enabled.               */

+  qeip->tim->CR1 = TIM_CR1_CEN;            /* Timer enabled. */

 }

 

 /**

@@ -287,7 +287,7 @@ void qei_lld_enable(QEIDriver *qeip) {
  */

 void qei_lld_disable(QEIDriver *qeip) {

 

-  qeip->tim->CR1 = 0;                    /* Timer disabled.              */

+  qeip->tim->CR1 = 0;                    /* Timer disabled. */

 }

 

 #endif /* HAL_USE_QEI */

diff --git a/os/hal/src/usbh/hal_usbh_debug.c b/os/hal/src/usbh/hal_usbh_debug.c
index 9f17189..51ca166 100644
--- a/os/hal/src/usbh/hal_usbh_debug.c
+++ b/os/hal/src/usbh/hal_usbh_debug.c
@@ -111,7 +111,7 @@ static char *ftoa(char *p, double num, unsigned long precision, bool dot) {
 static inline void _put(char c) {
 	input_queue_t *iqp = &USBH_DEBUG_USBHD.iq;
 
-	if (chIQIsFullI(iqp))
+	if (iqIsFullI(iqp))
 		return;
 
 	iqp->q_counter++;
@@ -407,8 +407,8 @@ void usbDbgReset(void) {
 	const char *msg = "\r\n\r\n==== DEBUG OUTPUT RESET ====\r\n";
 
 	syssts_t sts = chSysGetStatusAndLockX();
-	chIQResetI(&USBH_DEBUG_USBHD.iq);
-	chOQResetI(&USBH_DEBUG_SD.oqueue);
+	iqResetI(&USBH_DEBUG_USBHD.iq);
+	oqResetI(&USBH_DEBUG_SD.oqueue);
 	while (*msg) {
 		*USBH_DEBUG_SD.oqueue.q_wrptr++ = *msg++;
 		USBH_DEBUG_SD.oqueue.q_counter--;
@@ -478,7 +478,7 @@ static void usb_debug_thread(void *p) {
 
 	chRegSetThreadName("USBH_DBG");
 	while (true) {
-		msg_t c = chIQGet(&host->iq);
+		msg_t c = iqGet(&host->iq);
 		if (c < 0) goto reset;
 
 		if (state == 0) {
@@ -491,16 +491,16 @@ static void usb_debug_thread(void *p) {
 			uint32_t hfnum;
 
 			hfir = c;
-			c = chIQGet(&host->iq); if (c < 0) goto reset;
+			c = iqGet(&host->iq); if (c < 0) goto reset;
 			hfir |= c << 8;
 
-			c = chIQGet(&host->iq); if (c < 0) goto reset;
+			c = iqGet(&host->iq); if (c < 0) goto reset;
 			hfnum = c;
-			c = chIQGet(&host->iq); if (c < 0) goto reset;
+			c = iqGet(&host->iq); if (c < 0) goto reset;
 			hfnum |= c << 8;
-			c = chIQGet(&host->iq); if (c < 0) goto reset;
+			c = iqGet(&host->iq); if (c < 0) goto reset;
 			hfnum |= c << 16;
-			c = chIQGet(&host->iq); if (c < 0) goto reset;
+			c = iqGet(&host->iq); if (c < 0) goto reset;
 			hfnum |= c << 24;
 
 			uint32_t f = hfnum & 0xffff;
@@ -508,7 +508,7 @@ static void usb_debug_thread(void *p) {
 			chprintf((BaseSequentialStream *)&USBH_DEBUG_SD, "%05d.%03d  ", f, p);
 
 			while (true) {
-				c = chIQGet(&host->iq); if (c < 0) goto reset;
+				c = iqGet(&host->iq); if (c < 0) goto reset;
 				if (!c) {
 					sdPut(&USBH_DEBUG_SD, '\r');
 					sdPut(&USBH_DEBUG_SD, '\n');
@@ -528,7 +528,7 @@ reset:
 void usbDbgInit(USBHDriver *host) {
 	if (host != &USBH_DEBUG_USBHD)
 		return;
-	chIQObjectInit(&USBH_DEBUG_USBHD.iq, USBH_DEBUG_USBHD.dbg_buff, sizeof(USBH_DEBUG_USBHD.dbg_buff), 0, 0);
+	iqObjectInit(&USBH_DEBUG_USBHD.iq, USBH_DEBUG_USBHD.dbg_buff, sizeof(USBH_DEBUG_USBHD.dbg_buff), 0, 0);
 	chThdCreateStatic(USBH_DEBUG_USBHD.waDebug, sizeof(USBH_DEBUG_USBHD.waDebug), NORMALPRIO, usb_debug_thread, &USBH_DEBUG_USBHD);
 }
 #endif
diff --git a/os/hal/src/usbh/hal_usbh_hub.c b/os/hal/src/usbh/hal_usbh_hub.c
index 7fdcef1..56257b2 100644
--- a/os/hal/src/usbh/hal_usbh_hub.c
+++ b/os/hal/src/usbh/hal_usbh_hub.c
@@ -15,6 +15,7 @@
     limitations under the License.
 */
 
+#include <string.h>
 #include "hal.h"
 #include "hal_usbh.h"
 #include "usbh/internal.h"