Skip to content

Revert "Target stm usb config" #3734

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,9 @@
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/* TARGET NOT STM does not support this HAL */
#ifndef TARGET_STM
#define USBSTM_HAL_UNSUPPORTED
#endif
/* F4 famlily wihtout USB_STM_HAL use another HAL*/
#if defined(TARGET_STM) && defined(TARGET_STM32F4) && !defined(USB_STM_HAL)
#define USBSTM_HAL_UNSUPPORTED
#endif
#if (defined (USB_STM_HAL) && defined(TARGET_STM32F4)) \
|| defined(TARGET_STM32F2) || defined (TARGET_STM32F7) || defined (TARGET_STM32F3) || defined (TARGET_STM32L4)

#ifndef USBSTM_HAL_UNSUPPORTED
#include "USBHAL.h"
#include "pinmap.h"
/* mbed endpoint definition to hal definition */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,26 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

#ifdef TARGET_STM32F303ZE
#include "USBHAL_STM32F303ZE.h"
#endif

#if defined(TARGET_STM32F207ZG) || \
defined(TARGET_STM32F401RE) || \
defined(TARGET_STM32F407VG) || \
defined(TARGET_STM32F411RE) || \
defined(TARGET_STM32F412ZG) || \
defined(TARGET_STM32F429ZI) || \
defined(TARGET_STM32F446ZE) || \
defined(TARGET_STM32F746ZG) || \
defined(TARGET_STM32F767ZI)
#include "USBHAL_STM_144_64pins.h"
#endif

#ifdef TARGET_STM32L476VG
#include "USBHAL_STM32L476VG.h"
#endif

#ifdef TARGET_STM32F769NI
#include "USBHAL_STM32F769NI.h"
#endif
2 changes: 1 addition & 1 deletion features/unsupported/USBDevice/USBDevice/USBEndpoints.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ typedef enum {
#include "USBEndpoints_KL25Z.h"
#elif !defined(USB_STM_HAL) && defined(TARGET_STM32F4)
#include "USBEndpoints_STM32F4.h"
#elif defined (TARGET_STM32F4) || defined (TARGET_STM32F2) || defined (TARGET_STM32F7) || defined (TARGET_STM32F3) || defined(TARGET_STM32L4) || defined(TARGET_STM32F1)
#elif defined (TARGET_STM32F4) || defined (TARGET_STM32F2) || defined (TARGET_STM32F7) || defined (TARGET_STM32F3) || defined(TARGET_STM32L4)
#include "USBEndpoints_STM32.h"
#elif defined (TARGET_RZ_A1H) || defined (TARGET_VK_RZ_A1H)
#include "USBEndpoints_RZ_A1H.h"
Expand Down
2 changes: 1 addition & 1 deletion features/unsupported/USBDevice/USBDevice/USBHAL.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class USBHAL {
bool (USBHAL::*epCallback[10 - 2])(void);
#elif (defined(TARGET_STM32F4) && !defined(USB_STM_HAL)) || defined(TARGET_NUMAKER_PFM_M453)
bool (USBHAL::*epCallback[8 - 2])(void);
#elif defined(TARGET_STM)
#elif defined(TARGET_STM32F4) || defined(TARGET_STM32F3) || defined (TARGET_STM32F2)|| defined(TARGET_STM32L4) || defined(TARGET_STM32F7)
PCD_HandleTypeDef hpcd;
#elif defined(TARGET_NUMAKER_PFM_NUC472)
bool (USBHAL::*epCallback[14 - 2])(void);
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading