Skip to content

STM32: USBDevice files clean-up #4979

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.

Sign up for GitHub

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 6 commits into from
Sep 27, 2017
Merged

STM32: USBDevice files clean-up #4979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
58c9f4b
STM32 USBDevice: refactor files
bcostm Aug 24, 2017
211d201
STM32 USBDevice: add more supported targets
bcostm Aug 25, 2017
1d72b31
STM32 USBDevice: Remove disco-f429zi, clean-up nucleo-f103rb
bcostm Aug 28, 2017
e588011
STM32 USBDevice: Add USB_STM_HAL macro for disco-f469ni
bcostm Aug 28, 2017
9e3b509
STM32 USBDevice: Add NUCLEO_F446RE target
bcostm Aug 28, 2017
8f4b6e2
STM32 USBDevice: Add DISCO_F407VG target
bcostm Aug 28, 2017
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
151 changes: 91 additions & 60 deletions ...e/targets/TARGET_STM/USBHAL_STM32F103RB.h → ...ice/targets/TARGET_STM/USBHAL_IP_DEVICE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2016 mbed.org, MIT License
/* Copyright (c) 2017 mbed.org, MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software
* and associated documentation files (the "Software"), to deal in the Software without
Expand All @@ -15,51 +15,63 @@
* 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.
*/
#ifndef USBHAL_STM32F103RB
#define USBHAL_STM32F103RB
#ifndef USBHAL_IP_DEVICE_H
#define USBHAL_IP_DEVICE_H

#if defined(TARGET_NUCLEO_F303ZE)
#define USBHAL_IRQn USB_LP_CAN_RX0_IRQn

#elif defined(TARGET_NUCLEO_F103RB)
#define USBHAL_IRQn USB_LP_CAN1_RX0_IRQn

#elif defined(TARGET_DISCO_L072CZ_LRWAN1) || \
defined(TARGET_DISCO_L053C8)
#define USBHAL_IRQn USB_IRQn

#else
#error "USB IRQ is not configured !"
#endif

#define NB_ENDPOINT 8 // Must be a multiple of 4 bytes

#define NB_ENDPOINT 8
/* must be multiple of 4 bytes */
#define MAXTRANSFER_SIZE 0x200
#define FIFO_USB_RAM_SIZE (MAXTRANSFER_SIZE+MAX_PACKET_SIZE_EP0+MAX_PACKET_SIZE_EP1+MAX_PACKET_SIZE_EP2+MAX_PACKET_SIZE_EP3)

#define FIFO_USB_RAM_SIZE (MAXTRANSFER_SIZE + MAX_PACKET_SIZE_EP0 + MAX_PACKET_SIZE_EP1 + MAX_PACKET_SIZE_EP2 + MAX_PACKET_SIZE_EP3)

#if (FIFO_USB_RAM_SIZE > 0x500)
#error "FIFO dimensioning incorrect"
#endif

typedef struct
{
USBHAL *inst;

void (USBHAL::*bus_reset)(void);
void (USBHAL::*sof)(int frame);
void (USBHAL::*connect_change)(unsigned int connected);
void (USBHAL::*connect_change)(unsigned int connected);
void (USBHAL::*suspend_change)(unsigned int suspended);
void (USBHAL::*ep0_setup)(void);
void (USBHAL::*ep0_in)(void);
void (USBHAL::*ep0_out)(void);
void (USBHAL::*ep0_read)(void);
bool (USBHAL::*ep_realise)(uint8_t endpoint, uint32_t maxPacket, uint32_t flags);
bool (USBHAL::*epCallback[2*NB_ENDPOINT-2])(void);
uint8_t epComplete[8];
/* memorize dummy buffer used for reception */
uint32_t pBufRx[MAXTRANSFER_SIZE>>2];
uint32_t pBufRx0[MAX_PACKET_SIZE_EP0>>2];
gpio_t usb_switch;
}USBHAL_Private_t;
bool (USBHAL::*epCallback[(2 * NB_ENDPOINT) - 2])(void);

void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state)
{
USBHAL_Private_t *priv=((USBHAL_Private_t *)(hpcd->pData));
gpio_write(&(priv->usb_switch),!state);
}
uint8_t epComplete[2 * NB_ENDPOINT];

/* Memorize dummy buffer used for reception */
uint32_t pBufRx[MAXTRANSFER_SIZE >> 2];
uint32_t pBufRx0[MAX_PACKET_SIZE_EP0 >> 2];

gpio_t usb_switch;
} USBHAL_Private_t;

uint32_t HAL_PCDEx_GetTxFiFo(PCD_HandleTypeDef *hpcd, uint8_t fifo)
{
return 1024;
}
void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)

void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
{
USBHAL_Private_t *priv=((USBHAL_Private_t *)(hpcd->pData));
USBHAL *obj= priv->inst;
Expand All @@ -68,24 +80,31 @@ void HAL_PCD_SOFCallback(PCD_HandleTypeDef *hpcd)
(obj->*func)(sofnum);
}

USBHAL * USBHAL::instance;

USBHAL::USBHAL(void)
void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state)
{
/* init parameter */
USBHAL_Private_t *priv = ((USBHAL_Private_t *)(hpcd->pData));
#if defined(TARGET_NUCLEO_F103RB)
gpio_write(&(priv->usb_switch), !state);
#else
gpio_write(&(priv->usb_switch), state);
#endif
}

USBHAL *USBHAL::instance;

USBHAL::USBHAL(void) {
USBHAL_Private_t *HALPriv = new(USBHAL_Private_t);
/* initialized all field of init including 0 field */
/* constructor does not fill with zero */

hpcd.Instance = USB;
/* initialized all field of init including 0 field */
/* constructor does not fill with zero */

memset(&hpcd.Init, 0, sizeof(hpcd.Init));
hpcd.Init.dev_endpoints = NB_ENDPOINT;
hpcd.Init.ep0_mps = MAX_PACKET_SIZE_EP0;
hpcd.Init.ep0_mps = MAX_PACKET_SIZE_EP0;
hpcd.Init.phy_itface = PCD_PHY_EMBEDDED;
hpcd.Init.Sof_enable = 1;
hpcd.Init.speed = PCD_SPEED_FULL;
/* pass instance for usage inside call back */

// Pass instance for usage inside call back
HALPriv->inst = this;
HALPriv->bus_reset = &USBHAL::busReset;
HALPriv->suspend_change = &USBHAL::suspendStateChanged;
Expand All @@ -96,7 +115,6 @@ USBHAL::USBHAL(void)
HALPriv->ep0_in = &USBHAL::EP0in;
HALPriv->ep0_out = &USBHAL::EP0out;
HALPriv->ep0_read = &USBHAL::EP0read;
hpcd.pData = (void*)HALPriv;
HALPriv->epCallback[0] = &USBHAL::EP1_OUT_callback;
HALPriv->epCallback[1] = &USBHAL::EP1_IN_callback;
HALPriv->epCallback[2] = &USBHAL::EP2_OUT_callback;
Expand All @@ -105,43 +123,56 @@ USBHAL::USBHAL(void)
HALPriv->epCallback[5] = &USBHAL::EP3_IN_callback;
instance = this;

// Configure USB pins and other clocks
#if defined(TARGET_NUCLEO_F303ZE)
__HAL_RCC_GPIOA_CLK_ENABLE();
pin_function(PA_11, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF14_USB)); // DM
pin_function(PA_12, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF14_USB)); // DP
__HAL_RCC_GPIOG_CLK_ENABLE();
gpio_init_out(&HALPriv->usb_switch, PG_6);

#elif defined(TARGET_NUCLEO_F103RB)
// Make sure to connect a 1.5K resistor between USB-DP PA12 pin and +3.3V
__HAL_RCC_GPIOA_CLK_ENABLE();
pin_function(PA_11, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_MODE_AF_INPUT)); // DM
pin_function(PA_12, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_MODE_AF_INPUT)); // DP

#elif defined(TARGET_DISCO_L072CZ_LRWAN1) || \
defined(TARGET_DISCO_L053C8)
__HAL_RCC_GPIOA_CLK_ENABLE();
pin_function(PA_11, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_USB)); // DM
pin_function(PA_12, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF2_USB)); // DP

/* Configure USB VBUS GPIO */
gpio_init_out(&HALPriv->usb_switch,PB_14);
gpio_mode(&HALPriv->usb_switch,OpenDrain);
/* Configure USB FS GPIOs */

/* Configure DM DP Pins
* - USB-DP (D+ of the USB connector) <======> PA12 (Nucleo board)
* Make sure to connect a 1.5KOhm pull up to USB-DP PA12 pin
* (permanent pull-up)
- USB-DM (D- of the USB connector) <======> PA11 (Nucleo board)
*/

pin_function(PA_11, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_MODE_AF_INPUT));
pin_function(PA_12, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_MODE_AF_INPUT));
#else
#error "USB pins are not configured !"
#endif

__HAL_RCC_USB_CLK_ENABLE();
__HAL_RCC_SYSCFG_CLK_ENABLE();

// Configure PCD and FIFOs
hpcd.pData = (void*)HALPriv;
hpcd.State = HAL_PCD_STATE_RESET;

HAL_PCD_Init(&hpcd);
/* hardcoded size of FIFO according definition*/
HAL_PCDEx_PMAConfig(&hpcd , 0x00 , PCD_SNG_BUF, 0x30);
HAL_PCDEx_PMAConfig(&hpcd , 0x80 , PCD_SNG_BUF, 0x70);
HAL_PCDEx_PMAConfig(&hpcd , 0x01 , PCD_SNG_BUF, 0x90);
HAL_PCDEx_PMAConfig(&hpcd , 0x81 , PCD_SNG_BUF, 0xb0);
#if 0
HAL_PCDEx_PMAConfig(&hpcd , 0x2, PCD_DBL_BUF, 0x018000b0);
#else
HAL_PCDEx_PMAConfig(&hpcd , 0x2, PCD_SNG_BUF, 0x100);
#endif
HAL_PCDEx_PMAConfig(&hpcd , 0x82, PCD_SNG_BUF, 0x120);

NVIC_SetVector(USBHAL_IRQn,(uint32_t)&_usbisr);
NVIC_SetPriority( USBHAL_IRQn, 1);
// EP0
HAL_PCDEx_PMAConfig(&hpcd, 0x00, PCD_SNG_BUF, 0x30);
HAL_PCDEx_PMAConfig(&hpcd, 0x80, PCD_SNG_BUF, 0x70);
// EP1
HAL_PCDEx_PMAConfig(&hpcd, 0x01, PCD_SNG_BUF, 0x90);
HAL_PCDEx_PMAConfig(&hpcd, 0x81, PCD_SNG_BUF, 0xb0);
// EP2
HAL_PCDEx_PMAConfig(&hpcd, 0x02, PCD_SNG_BUF, 0x100);
HAL_PCDEx_PMAConfig(&hpcd, 0x82, PCD_SNG_BUF, 0x120);
// EP3
HAL_PCDEx_PMAConfig(&hpcd, 0x03, PCD_DBL_BUF, 0x018000b0);
HAL_PCDEx_PMAConfig(&hpcd, 0x83, PCD_SNG_BUF, 0xb0);

// Configure interrupt vector
NVIC_SetVector(USBHAL_IRQn, (uint32_t)&_usbisr);
NVIC_SetPriority(USBHAL_IRQn, 1);

HAL_PCD_Start(&hpcd);
}

#endif
#endif // USBHAL_IP_DEVICE_H
Loading