Skip to content

Commit 535a17c

Browse files
facchinmfacchinm
authored
Merge pull request #3 from facchinm/test_hs_in_fs
Enable support for this library Arduino Giga
2 parents 945d58a + 929f0bd commit 535a17c

File tree

6 files changed

+81
-15
lines changed

6 files changed

+81
-15
lines changed

‎src/USBHost/USBHost.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ void USBHost::usb_process()
293293
}
294294
}
295295

296-
USBHost::USBHost() : usbThread(osPriorityNormal, USB_THREAD_STACK)
296+
USBHost::USBHost() : usbThread(osPriorityHigh, USB_THREAD_STACK)
297297
{
298298
#ifndef USBHOST_OTHER
299299
headControlEndpoint = NULL;
@@ -1202,6 +1202,7 @@ USB_TYPE USBHost::controlTransfer(USBDeviceConnected * dev, uint8_t requestType,
12021202
{
12031203
osEvent event = control->ep_queue.get(TD_TIMEOUT_CTRL);
12041204
if (event.status == osEventTimeout) {
1205+
USB_DBG_TRANSFER("TIMEOUT");
12051206
disableList(CONTROL_ENDPOINT);
12061207
control->setState(USB_TYPE_ERROR);
12071208
control->ep_queue.get(0);

‎src/USBHost/USBHostTypes.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ enum ENDPOINT_TYPE {
119119

120120
#else
121121

122-
#define TD_TIMEOUT_CTRL 600
122+
#define TD_TIMEOUT_CTRL 1000
123123
#define TD_TIMEOUT 2000
124124
#define TD_SETUP (uint32_t)(0) // Direction of Setup Packet
125125
#define TD_IN (uint32_t)(0x00100000) // Direction In

‎src/USBHostHID/USBHostKeyboard.cpp‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,15 @@ bool USBHostKeyboard::connect()
120120
for (uint8_t i = 0; i < MAX_DEVICE_CONNECTED; i++) {
121121
if ((dev = host->getDevice(i)) != NULL) {
122122

123-
if (host->enumerate(dev, this)) {
123+
printf("got device\n");
124+
int ret = host->enumerate(dev, this);
125+
printf("ret: %d\n", ret);
126+
if (ret) {
124127
break;
125128
}
126129

130+
printf("after enumerate\n");
131+
127132
if (keyboard_device_found) {
128133
{
129134
/* As this is done in a specific thread
@@ -183,6 +188,10 @@ void USBHostKeyboard::rxHandler()
183188

184189
/*virtual*/ bool USBHostKeyboard::parseInterface(uint8_t intf_nb, uint8_t intf_class, uint8_t intf_subclass, uint8_t intf_protocol) //Must return true if the interface should be parsed
185190
{
191+
printf("intf_class: %d\n", intf_class);
192+
printf("intf_subclass: %d\n", intf_subclass);
193+
printf("intf_protocol: %d\n", intf_protocol);
194+
186195
if ((keyboard_intf == -1) &&
187196
(intf_class == HID_CLASS) &&
188197
(intf_subclass == 0x01) &&
@@ -195,6 +204,7 @@ void USBHostKeyboard::rxHandler()
195204

196205
/*virtual*/ bool USBHostKeyboard::useEndpoint(uint8_t intf_nb, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir) //Must return true if the endpoint will be used
197206
{
207+
printf("intf_nb: %d\n", intf_nb);
198208
if (intf_nb == keyboard_intf) {
199209
if (type == INTERRUPT_ENDPOINT && dir == IN) {
200210
keyboard_device_found = true;

‎src/targets/TARGET_STM/USBEndpoint_STM.cpp‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ void USBEndpoint::init(HCED *hced_, ENDPOINT_TYPE type_, ENDPOINT_DIRECTION dir_
6565
state = USB_TYPE_IDLE;
6666
speed = false;
6767
}
68+
6869
void USBEndpoint::setSize(uint32_t size)
6970
{
7071
this->size = size;
@@ -80,7 +81,7 @@ void USBEndpoint::setDeviceAddress(uint8_t addr)
8081
if (this->speed) {
8182
USB_WARN("small speed device on hub not supported");
8283
}
83-
MBED_ASSERT(HAL_HCD_HC_Init((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num, address, addr, hcd_speed, type, size) != HAL_BUSY);
84+
HAL_HCD_HC_Init((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num, address, addr, hcd_speed, type, size);;
8485
this->device_address = addr;
8586

8687
}
@@ -106,21 +107,21 @@ void USBEndpoint::setState(USB_TYPE st)
106107
if ((*addr) && (type != INTERRUPT_ENDPOINT)) {
107108
this->ep_queue.put((uint8_t *)1);
108109
}
109-
MBED_ASSERT(HAL_HCD_HC_Halt((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num) != HAL_BUSY);
110+
HAL_HCD_HC_Halt((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num);
110111
HAL_HCD_DisableInt((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num);
111112
*addr = 0;
112113

113114
}
114115
if (st == USB_TYPE_ERROR) {
115-
MBED_ASSERT(HAL_HCD_HC_Halt((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num) != HAL_BUSY);
116+
HAL_HCD_HC_Halt((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num);
116117
HAL_HCD_DisableInt((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num);
117118

118119
}
119120
if (st == USB_TYPE_ERROR) {
120121
uint8_t hcd_speed = HCD_SPEED_FULL;
121122
/* small speed device with hub not supported
122123
if (this->speed) hcd_speed = HCD_SPEED_LOW;*/
123-
MBED_ASSERT(HAL_HCD_HC_Init((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num, address, 0, hcd_speed, type, size) != HAL_BUSY);
124+
HAL_HCD_HC_Init((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num, address, 0, hcd_speed, type, size);
124125
}
125126
}
126127

@@ -157,7 +158,7 @@ USB_TYPE USBEndpoint::queueTransfer()
157158
/* dir /setup is inverted for ST */
158159
/* token is useful only ctrl endpoint */
159160
/* last parameter is ping ? */
160-
MBED_ASSERT(HAL_HCD_HC_SubmitRequest((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num, dir - 1, type, !setup, (uint8_t *) td_current->currBufPtr, transfer_len, 0) == HAL_OK);
161+
HAL_HCD_HC_SubmitRequest((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num, dir - 1, type, !setup, (uint8_t *) td_current->currBufPtr, transfer_len, 1);
161162
HAL_HCD_EnableInt((HCD_HandleTypeDef *)hced->hhcd, hced->ch_num);
162163

163164
return USB_TYPE_PROCESSING;

‎src/targets/TARGET_STM/USBHALHost_STM.cpp‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,19 @@
1616

1717
#ifdef TARGET_STM
1818

19+
#if defined(TARGET_PORTENTA_H7)
1920
#define USBx_BASE USB2_OTG_FS_PERIPH_BASE
21+
#elif defined(TARGET_GIGA)
22+
#define USBx_BASE USB1_OTG_HS_PERIPH_BASE
23+
#else
24+
#define USBx_BASE USB1_OTG_HS_PERIPH_BASE
25+
#endif
2026

2127
#include "mbed.h"
2228
#include "USBHost/USBHALHost.h"
2329
#include "USBHost/dbg.h"
2430
#include "pinmap.h"
31+
#include "mbed_chrono.h"
2532

2633
#include "USBHALHost_STM.h"
2734

@@ -94,7 +101,7 @@ void HAL_HCD_HC_NotifyURBChange_Callback(HCD_HandleTypeDef *hhcd, uint8_t chnum,
94101
td->currBufPtr += max_size;
95102
td->size -= max_size;
96103
length = td->size <= max_size ? td->size : max_size;
97-
MBED_ASSERT(HAL_HCD_HC_SubmitRequest(hhcd, chnum, dir, type, !td->setup, (uint8_t *) td->currBufPtr, length, 0) == HAL_OK);
104+
HAL_HCD_HC_SubmitRequest(hhcd, chnum, dir, type, !td->setup, (uint8_t *) td->currBufPtr, length, 0);
98105
HAL_HCD_EnableInt(hhcd, chnum);
99106
return;
100107
}
@@ -109,7 +116,7 @@ void HAL_HCD_HC_NotifyURBChange_Callback(HCD_HandleTypeDef *hhcd, uint8_t chnum,
109116
td->retry++;
110117
#endif
111118
length = td->size <= max_size ? td->size : max_size;
112-
MBED_ASSERT(HAL_HCD_HC_SubmitRequest(hhcd, chnum, dir, type, !td->setup, (uint8_t *) td->currBufPtr, length, 0) == HAL_OK);
119+
HAL_HCD_HC_SubmitRequest(hhcd, chnum, dir, type, !td->setup, (uint8_t *) td->currBufPtr, length, 0);
113120
HAL_HCD_EnableInt(hhcd, chnum);
114121
return;
115122
#if defined(MAX_NYET_RETRY)
@@ -152,13 +159,12 @@ USBHALHost *USBHALHost::instHost;
152159

153160
void USBHALHost::init()
154161
{
155-
156162
NVIC_DisableIRQ(USBHAL_IRQn);
157163
NVIC_SetVector(USBHAL_IRQn, (uint32_t)(_usbisr));
158164
HAL_HCD_Init((HCD_HandleTypeDef *) usb_hcca);
159-
NVIC_EnableIRQ(USBHAL_IRQn);
160165
control_disable = 0;
161166
HAL_HCD_Start((HCD_HandleTypeDef *) usb_hcca);
167+
NVIC_EnableIRQ(USBHAL_IRQn);
162168
usb_vbus(1);
163169
}
164170

@@ -273,11 +279,12 @@ void USBHALHost::freeTD(volatile uint8_t *td)
273279
tdBufAlloc[i] = false;
274280
}
275281

282+
using namespace mbed::chrono_literals;
276283

277284
void USBHALHost::resetRootHub()
278285
{
279286
// Initiate port reset
280-
rtos::ThisThread::sleep_for(0.2);
287+
rtos::ThisThread::sleep_for(200);
281288
HAL_HCD_ResetPort((HCD_HandleTypeDef *)usb_hcca);
282289
}
283290

‎src/targets/TARGET_STM/USBHALHost_STM.h‎

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#endif
2727
#endif
2828

29-
#if defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI)
29+
#if defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI) || defined(TARGET_GIGA)
3030
#define USBHAL_IRQn OTG_HS_IRQn
3131
#else
3232
#define USBHAL_IRQn OTG_FS_IRQn
@@ -38,6 +38,8 @@
3838

3939
#define TOTAL_SIZE (HCCA_SIZE + (MAX_ENDPOINT * ED_SIZE) + (MAX_TD * TD_SIZE))
4040

41+
#define MAX_NYET_RETRY 5
42+
4143
/* STM device FS have 11 channels (definition is for 60 channels) */
4244
static volatile uint8_t usb_buf[TOTAL_SIZE];
4345

@@ -100,6 +102,11 @@ static gpio_t gpio_powerpin;
100102
#define USB_POWER_OFF 1
101103
#define USB_POWERPIN_CONFIG {}
102104

105+
#elif defined(TARGET_GIGA)
106+
#define USB_POWER_ON 1
107+
#define USB_POWER_OFF 0
108+
#define USB_POWERPIN_CONFIG {__HAL_RCC_GPIOA_CLK_ENABLE();gpio_init_out_ex(&gpio_powerpin, PA_15, USB_POWER_OFF);}
109+
103110
#elif defined(TARGET_DISCO_F769NI)
104111
#define USB_POWER_ON 0
105112
#define USB_POWER_OFF 1
@@ -136,7 +143,7 @@ void usb_vbus(uint8_t state)
136143
} else {
137144
/* The board does not have GPIO pin to control usb supply */
138145
}
139-
rtos::ThisThread::sleep_for(0.2);
146+
rtos::ThisThread::sleep_for(1.0f);
140147
}
141148

142149

@@ -157,6 +164,34 @@ USBHALHost::USBHALHost()
157164
hhcd->Instance = USB_OTG_HS;
158165
hhcd->Init.speed = HCD_SPEED_HIGH;
159166
hhcd->Init.phy_itface = HCD_PHY_ULPI;
167+
168+
#elif defined(TARGET_GIGA)
169+
hhcd->Instance = USB_OTG_HS;
170+
hhcd->Init.speed = HCD_SPEED_FULL;
171+
hhcd->Init.phy_itface = USB_OTG_EMBEDDED_PHY;
172+
173+
#if 1
174+
/* Configure the clock recovery system (CRS) ********************************/
175+
/* Enable CRS Clock */
176+
__CRS_CLK_ENABLE();
177+
178+
static RCC_CRSInitTypeDef RCC_CRSInitStruct;
179+
180+
/* Default Synchro Signal division factor (not divided) */
181+
RCC_CRSInitStruct.Prescaler = RCC_CRS_SYNC_DIV1;
182+
/* Set the SYNCSRC[1:0] bits according to CRS_Source value */
183+
RCC_CRSInitStruct.Source = RCC_CRS_SYNC_SOURCE_USB2;
184+
/* HSI48 is synchronized with USB SOF at 1KHz rate */
185+
RCC_CRSInitStruct.ReloadValue = __HAL_RCC_CRS_CALCULATE_RELOADVALUE(48000000, 1000);
186+
RCC_CRSInitStruct.ErrorLimitValue = RCC_CRS_ERRORLIMIT_DEFAULT;
187+
/* Set the TRIM[5:0] to the default value */
188+
RCC_CRSInitStruct.HSI48CalibrationValue = 0x1D;
189+
/* Start automatic synchronization */
190+
HAL_RCCEx_CRSConfig(&RCC_CRSInitStruct);
191+
192+
HAL_RCCEx_CRSWaitSynchronization(1000);
193+
#endif
194+
160195
#else
161196
hhcd->Instance = USB_OTG_FS;
162197
hhcd->Init.speed = HCD_SPEED_FULL;
@@ -169,6 +204,7 @@ USBHALHost::USBHALHost()
169204
hhcd->Init.Sof_enable = 0;
170205
hhcd->Init.vbus_sensing_enable = 0;
171206
hhcd->Init.use_external_vbus = 1;
207+
hhcd->Init.battery_charging_enable = 0;
172208
hhcd->Init.lpm_enable = 0;
173209

174210
HALPriv->inst = this;
@@ -224,6 +260,11 @@ USBHALHost::USBHALHost()
224260
__HAL_RCC_GPIOJ_CLK_ENABLE();
225261
pin_function(PJ_12, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OTG_FS)); // VBUS
226262

263+
#elif defined(TARGET_GIGA)
264+
__HAL_RCC_GPIOB_CLK_ENABLE();
265+
pin_function(PB_14, STM_PIN_DEFINE_SPEED(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_OTG2_FS, GPIO_SPEED_FREQ_VERY_HIGH)); // DM
266+
pin_function(PB_15, STM_PIN_DEFINE_SPEED(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_OTG2_FS, GPIO_SPEED_FREQ_VERY_HIGH)); // DM
267+
227268
#elif defined(TARGET_DISCO_F746NG_HS)
228269
__HAL_RCC_GPIOA_CLK_ENABLE();
229270
__HAL_RCC_GPIOB_CLK_ENABLE();
@@ -288,6 +329,8 @@ USBHALHost::USBHALHost()
288329
#error "USB pins are not configured !"
289330
#endif
290331

332+
NVIC_DisableIRQ(USBHAL_IRQn);
333+
291334
// Configure USB POWER pin
292335
USB_POWERPIN_CONFIG;
293336

@@ -297,6 +340,10 @@ USBHALHost::USBHALHost()
297340
#if defined(TARGET_DISCO_F746NG_HS) || defined(TARGET_DISCO_F769NI)
298341
__HAL_RCC_USB_OTG_HS_ULPI_CLK_ENABLE();
299342
__HAL_RCC_USB_OTG_HS_CLK_ENABLE();
343+
#elif defined(TARGET_GIGA)
344+
__HAL_RCC_USB_OTG_HS_ULPI_CLK_SLEEP_DISABLE();
345+
__HAL_RCC_USB_OTG_HS_CLK_SLEEP_ENABLE();
346+
__HAL_RCC_USB_OTG_HS_CLK_ENABLE();
300347
#else
301348
__HAL_RCC_USB_OTG_FS_CLK_ENABLE();
302349
#endif

0 commit comments

Comments
 (0)