# HG changeset patch
# User jeandet
# Date 2014-03-03 20:13:48
# Node ID f7519daa5469d2ed0796f3c73716991ca1285998
# Parent  9fa0b042767202c5bed773c6f10778f5fae0413d

Sync

diff --git a/Doxyfile b/Doxyfile
--- a/Doxyfile
+++ b/Doxyfile
@@ -774,40 +774,7 @@ INPUT_ENCODING         = UTF-8
 # *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
 # *.qsf, *.as and *.js.
 
-FILE_PATTERNS          = *.c \
-                         *.cc \
-                         *.cxx \
-                         *.cpp \
-                         *.c++ \
-                         *.d \
-                         *.java \
-                         *.ii \
-                         *.ixx \
-                         *.ipp \
-                         *.i++ \
-                         *.inl \
-                         *.h \
-                         *.hh \
-                         *.hxx \
-                         *.hpp \
-                         *.h++ \
-                         *.idl \
-                         *.odl \
-                         *.cs \
-                         *.php \
-                         *.php3 \
-                         *.inc \
-                         *.m \
-                         *.markdown \
-                         *.md \
-                         *.mm \
-                         *.dox \
-                         *.py \
-                         *.f90 \
-                         *.f \
-                         *.for \
-                         *.vhd \
-                         *.vhdl
+FILE_PATTERNS          = *.h
 
 # The RECURSIVE tag can be used to specify whether or not subdirectories should
 # be searched for input files as well.
diff --git a/include/PERIPHERALS/uart.h b/include/PERIPHERALS/uart.h
--- a/include/PERIPHERALS/uart.h
+++ b/include/PERIPHERALS/uart.h
@@ -64,7 +64,7 @@ A simple example to read or writes on ua
 extern "C" {
 #endif
 
-/**
+/*!
  * @brief uart handle
  *
  * uart_t is the handle type you will use for all uart related functions.
@@ -132,12 +132,10 @@ typedef enum uartstopbits_t
 
 
 
-/**
- * @brief Uart open function
- *
- * This function opens the given uart, it should turn it ON iff needed and enable it.
- * @param count The uart identifier uart1 for example
- * @return The uart identifier on success or -1 if it fails.
+/*!
+  This function opens the given uart, it should turn it ON iff needed and enable it.
+  @param count The uart identifier uart1 for example
+  @return The uart identifier on success or -1 if it fails.
  */
 extern uart_t uartopen(int count);
 /**
diff --git a/mkspecs/features/libuc2.prf b/mkspecs/features/libuc2.prf
--- a/mkspecs/features/libuc2.prf
+++ b/mkspecs/features/libuc2.prf
@@ -23,6 +23,7 @@ INCLUDEPATH += $$[QT_INSTALL_HEADERS] \
                $$[QT_INSTALL_HEADERS]/AUDIO \
                $$[QT_INSTALL_HEADERS]/POWER \
                $$[QT_INSTALL_HEADERS]/PERIPHERALS \
+               $$[QT_INSTALL_HEADERS]/USB \
                $$[QT_INSTALL_HEADERS]/FLASH \
                $$[QT_INSTALL_HEADERS]/ADC \
                $$[QT_INSTALL_HEADERS]/GRAPHIC/CONTROLERS \
diff --git a/src/stm32f4/CPU/USB/STM32_USB_OTG_Driver/inc/usb_otg.h b/src/stm32f4/CPU/USB/STM32_USB_OTG_Driver/inc/usb_otg.h
--- a/src/stm32f4/CPU/USB/STM32_USB_OTG_Driver/inc/usb_otg.h
+++ b/src/stm32f4/CPU/USB/STM32_USB_OTG_Driver/inc/usb_otg.h
@@ -28,7 +28,7 @@
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __USB_OTG__
 #define __USB_OTG__
-
+#include <usbd_core.h>
 
 /** @addtogroup USB_OTG_DRIVER
   * @{
diff --git a/src/stm32f4/CPU/USB/USB.pri b/src/stm32f4/CPU/USB/USB.pri
--- a/src/stm32f4/CPU/USB/USB.pri
+++ b/src/stm32f4/CPU/USB/USB.pri
@@ -17,6 +17,7 @@ HEADERS += \
     $${PWD}/STM32_USB_OTG_Driver/inc/usb_dcd.h \
     $${PWD}/STM32_USB_OTG_Driver/inc/usb_core.h \
     $${PWD}/STM32_USB_OTG_Driver/inc/usb_conf_template.h \
+    $${PWD}/STM32_USB_OTG_Driver/inc/usb_conf.h \
     $${PWD}/STM32_USB_OTG_Driver/inc/usb_bsp.h
 }
 contains(USB , OTG){
diff --git a/src/stm32f4/stm32f4.pro b/src/stm32f4/stm32f4.pro
--- a/src/stm32f4/stm32f4.pro
+++ b/src/stm32f4/stm32f4.pro
@@ -7,7 +7,8 @@ SUBDIRS =  CORE/core.pro \
            UART/uart.pro \
            SPI/spi.pro \
            I2C/i2c.pro \
-           SDCARD-SDIO/sdcard-sdio.pro
+           SDCARD-SDIO/sdcard-sdio.pro \
+           USB