usbh: cleanup

3 files changed, 18 insertions, 17 deletions

diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_stm32_otg.h b/os/hal/ports/STM32/LLD/USBHv1/hal_stm32_otg.h
index b88e620..a0594a3 100644
--- a/os/hal/ports/STM32/LLD/USBHv1/hal_stm32_otg.h
+++ b/os/hal/ports/STM32/LLD/USBHv1/hal_stm32_otg.h
@@ -1,5 +1,5 @@
 /*
-    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
  */
 
 
-#ifndef HAL_STM32_OTG_H_
-#define HAL_STM32_OTG_H_
+#ifndef HAL_STM32_OTG_H
+#define HAL_STM32_OTG_H
 
 /**
  * @brief   Number of the implemented endpoints in OTG_FS.
@@ -571,7 +571,7 @@ typedef struct {
 #define HCCHAR_EPDIR            (1U<<15)    /**< Endpoint direction.        */
 #define HCCHAR_EPNUM_MASK       (15U<<11)   /**< Endpoint number mask.      */
 #define HCCHAR_EPNUM(n)         ((n)<<11)   /**< Endpoint number value.     */
-#define HCCHAR_MPS_MASK         (0x7FFU<<0)    /**< Maximum packet size mask.  */
+#define HCCHAR_MPS_MASK         (0x7FFU<<0) /**< Maximum packet size mask.  */
 #define HCCHAR_MPS(n)           ((n)<<0)    /**< Maximum packet size value. */
 /** @} */
 
@@ -590,6 +590,7 @@ typedef struct {
                                                  interrupt.                 */
 #define HCINT_STALL             (1U<<3)     /**< STALL response received
                                                  interrupt.                 */
+#define HCINT_AHBERR            (1U<<2)     /**< AHB error interrupt.       */
 #define HCINT_CHH               (1U<<1)     /**< Channel halted.            */
 #define HCINT_XFRC              (1U<<0)     /**< Transfer completed.        */
 /** @} */
@@ -611,7 +612,7 @@ typedef struct {
                                                  interrupt mask.            */
 #define HCINTMSK_STALLM         (1U<<3)     /**< STALL response received
                                                  interrupt mask.            */
-#define HCINTMSK_AHBERRM        (1U<<2)
+#define HCINTMSK_AHBERRM        (1U<<2)     /**< AHB error interrupt mask.  */
 #define HCINTMSK_CHHM           (1U<<1)     /**< Channel halted mask.       */
 #define HCINTMSK_XFRCM          (1U<<0)     /**< Transfer completed mask.   */
 /** @} */
@@ -924,6 +925,6 @@ typedef struct {
  */
 #define OTG_HS                      ((stm32_otg_t *)OTG_HS_ADDR)
 
-#endif /* _STM32_OTG_H_ */
+#endif /* STM32_OTG_H */
 
 /** @} */
diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
index 3abab1c..0618d83 100644
--- a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
+++ b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
@@ -59,7 +59,7 @@ static void otg_rxfifo_flush(USBHDriver *usbp);
 static void otg_txfifo_flush(USBHDriver *usbp, uint32_t fifo);
 
 /*===========================================================================*/
-/* Little helper functions.	    	                                 		 */
+/* Little helper functions.                                                  */
 /*===========================================================================*/
 static inline void _move_to_pending_queue(usbh_ep_t *ep) {
 	list_move_tail(&ep->node, ep->pending_list);
@@ -84,7 +84,7 @@ static inline void _transfer_completed(usbh_ep_t *ep, usbh_urb_t *urb, usbh_urbs
 #endif
 
 /*===========================================================================*/
-/* Functions called from many places.                                 		 */
+/* Functions called from many places.                                        */
 /*===========================================================================*/
 static void _transfer_completedI(usbh_ep_t *ep, usbh_urb_t *urb, usbh_urbstatus_t status) {
 	osalDbgCheckClassI();
@@ -487,7 +487,7 @@ static uint32_t _write_packet(struct list_head *list, uint32_t space_available)
 
 
 /*===========================================================================*/
-/* API.					   	    	                                 		 */
+/* API.                                                                      */
 /*===========================================================================*/
 
 void usbh_lld_ep_object_init(usbh_ep_t *ep) {
@@ -614,7 +614,7 @@ bool usbh_lld_urb_abort(usbh_urb_t *urb, usbh_urbstatus_t status) {
 
 
 /*===========================================================================*/
-/* Channel Interrupts.   	    	                                 		 */
+/* Channel Interrupts.                                                       */
 /*===========================================================================*/
 
 //CTRL(IN)	CTRL(OUT)	INT(IN)		INT(OUT)	BULK(IN)	BULK(OUT)	ISO(IN)		ISO(OUT)
@@ -951,7 +951,7 @@ static inline void _hcint_int(USBHDriver *host) {
 
 
 /*===========================================================================*/
-/* Host interrupts.			   	                                     		 */
+/* Host interrupts.                                                          */
 /*===========================================================================*/
 static inline void _sof_int(USBHDriver *host) {
 	udbg("SOF");
@@ -1214,7 +1214,7 @@ static void usb_lld_serve_interrupt(USBHDriver *host) {
 
 
 /*===========================================================================*/
-/* Interrupt handlers.   	    	                                 		 */
+/* Interrupt handlers.                                                       */
 /*===========================================================================*/
 
 #if STM32_USBH_USE_OTG1
@@ -1239,7 +1239,7 @@ OSAL_IRQ_HANDLER(STM32_OTG2_HANDLER) {
 
 
 /*===========================================================================*/
-/* Initialization functions.   	                                     		 */
+/* Initialization functions.                                                 */
 /*===========================================================================*/
 static void otg_core_reset(USBHDriver *usbp) {
   stm32_otg_t *const otgp = usbp->otg;
@@ -1450,7 +1450,7 @@ void usbh_lld_start(USBHDriver *usbh) {
 }
 
 /*===========================================================================*/
-/* Root Hub request handler.   	                                     		 */
+/* Root Hub request handler.                                                 */
 /*===========================================================================*/
 usbh_urbstatus_t usbh_lld_root_hub_request(USBHDriver *usbh, uint8_t bmRequestType, uint8_t bRequest,
 		uint16_t wvalue, uint16_t windex, uint16_t wlength, uint8_t *buf) {
diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h
index 5c0ac40..15413b4 100644
--- a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h
+++ b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.h
@@ -15,8 +15,8 @@
     limitations under the License.
 */
 
-#ifndef HAL_USBH_LLD_H_
-#define HAL_USBH_LLD_H_
+#ifndef HAL_USBH_LLD_H
+#define HAL_USBH_LLD_H
 
 #include "hal.h"
 
@@ -150,4 +150,4 @@ uint8_t usbh_lld_roothub_get_statuschange_bitmap(USBHDriver *usbh);
 
 #endif
 
-#endif /* HAL_USBH_LLD_H_ */
+#endif /* HAL_USBH_LLD_H */