hal_usbh: update to new Time macros
This commit is contained in:
parent
26a11251bf
commit
e1e6f87481
|
@ -1665,9 +1665,9 @@ usbh_urbstatus_t usbh_lld_root_hub_request(USBHDriver *usbh, uint8_t bmRequestTy
|
||||||
* despite reporting a successful por enable. */
|
* despite reporting a successful por enable. */
|
||||||
uerr("Detected enabled port; resetting OTG core");
|
uerr("Detected enabled port; resetting OTG core");
|
||||||
otg->GAHBCFG = 0;
|
otg->GAHBCFG = 0;
|
||||||
osalThreadSleepS(MS2ST(20));
|
osalThreadSleepS(OSAL_MS2I(20));
|
||||||
_usbh_start(usbh); /* this effectively resets the core */
|
_usbh_start(usbh); /* this effectively resets the core */
|
||||||
osalThreadSleepS(MS2ST(100)); /* during this delay, the core generates connect ISR */
|
osalThreadSleepS(OSAL_MS2I(100)); /* during this delay, the core generates connect ISR */
|
||||||
uinfo("OTG reset ended");
|
uinfo("OTG reset ended");
|
||||||
if (otg->HPRT & HPRT_PCSTS) {
|
if (otg->HPRT & HPRT_PCSTS) {
|
||||||
/* if the device is still connected, don't report a C_CONNECTION flag, which would cause
|
/* if the device is still connected, don't report a C_CONNECTION flag, which would cause
|
||||||
|
@ -1680,9 +1680,9 @@ usbh_urbstatus_t usbh_lld_root_hub_request(USBHDriver *usbh, uint8_t bmRequestTy
|
||||||
hprt &= ~(HPRT_PSUSP | HPRT_PENA | HPRT_PCDET | HPRT_PENCHNG | HPRT_POCCHNG);
|
hprt &= ~(HPRT_PSUSP | HPRT_PENA | HPRT_PCDET | HPRT_PENCHNG | HPRT_POCCHNG);
|
||||||
while ((otg->GRSTCTL & GRSTCTL_AHBIDL) == 0);
|
while ((otg->GRSTCTL & GRSTCTL_AHBIDL) == 0);
|
||||||
otg->HPRT = hprt | HPRT_PRST;
|
otg->HPRT = hprt | HPRT_PRST;
|
||||||
osalThreadSleepS(MS2ST(15));
|
osalThreadSleepS(OSAL_MS2I(15));
|
||||||
otg->HPRT = hprt;
|
otg->HPRT = hprt;
|
||||||
osalThreadSleepS(MS2ST(10));
|
osalThreadSleepS(OSAL_MS2I(10));
|
||||||
usbh->rootport.lld_c_status |= USBH_PORTSTATUS_C_RESET;
|
usbh->rootport.lld_c_status |= USBH_PORTSTATUS_C_RESET;
|
||||||
osalSysUnlock();
|
osalSysUnlock();
|
||||||
} break;
|
} break;
|
||||||
|
|
|
@ -533,7 +533,7 @@ static void _vt(void *p) {
|
||||||
if ((aoacp->iq_counter == 0) && !usbhURBIsBusy(&aoacp->iq_urb)) {
|
if ((aoacp->iq_counter == 0) && !usbhURBIsBusy(&aoacp->iq_urb)) {
|
||||||
_submitInI(aoacp);
|
_submitInI(aoacp);
|
||||||
}
|
}
|
||||||
chVTSetI(&aoacp->vt, MS2ST(16), _vt, aoacp);
|
chVTSetI(&aoacp->vt, OSAL_MS2I(16), _vt, aoacp);
|
||||||
osalSysUnlockFromISR();
|
osalSysUnlockFromISR();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -565,7 +565,7 @@ void usbhaoaChannelStart(USBHAOADriver *aoap) {
|
||||||
usbhURBSubmit(&aoacp->iq_urb);
|
usbhURBSubmit(&aoacp->iq_urb);
|
||||||
|
|
||||||
chVTObjectInit(&aoacp->vt);
|
chVTObjectInit(&aoacp->vt);
|
||||||
chVTSet(&aoacp->vt, MS2ST(16), _vt, aoacp);
|
chVTSet(&aoacp->vt, OSAL_MS2I(16), _vt, aoacp);
|
||||||
|
|
||||||
aoacp->state = USBHAOA_CHANNEL_STATE_READY;
|
aoacp->state = USBHAOA_CHANNEL_STATE_READY;
|
||||||
|
|
||||||
|
|
|
@ -332,7 +332,7 @@ static usbh_urbstatus_t _ftdi_port_control(USBHFTDIPortDriver *ftdipp,
|
||||||
wLength
|
wLength
|
||||||
};
|
};
|
||||||
|
|
||||||
return usbhControlRequestExtended(ftdipp->ftdip->dev, &req, buff, NULL, MS2ST(1000));
|
return usbhControlRequestExtended(ftdipp->ftdip->dev, &req, buff, NULL, OSAL_MS2I(1000));
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t _get_divisor(uint32_t baud, usbhftdi_type_t type) {
|
static uint32_t _get_divisor(uint32_t baud, usbhftdi_type_t type) {
|
||||||
|
@ -394,7 +394,7 @@ static usbh_urbstatus_t _set_baudrate(USBHFTDIPortDriver *ftdipp, uint32_t baudr
|
||||||
wIndex,
|
wIndex,
|
||||||
0
|
0
|
||||||
};
|
};
|
||||||
return usbhControlRequestExtended(ftdipp->ftdip->dev, &req, NULL, NULL, MS2ST(1000));
|
return usbhControlRequestExtended(ftdipp->ftdip->dev, &req, NULL, NULL, OSAL_MS2I(1000));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -610,7 +610,7 @@ static void _vt(void *p) {
|
||||||
if ((ftdipp->iq_counter == 0) && !usbhURBIsBusy(&ftdipp->iq_urb)) {
|
if ((ftdipp->iq_counter == 0) && !usbhURBIsBusy(&ftdipp->iq_urb)) {
|
||||||
_submitInI(ftdipp);
|
_submitInI(ftdipp);
|
||||||
}
|
}
|
||||||
chVTSetI(&ftdipp->vt, MS2ST(16), _vt, ftdipp);
|
chVTSetI(&ftdipp->vt, OSAL_MS2I(16), _vt, ftdipp);
|
||||||
osalSysUnlockFromISR();
|
osalSysUnlockFromISR();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -690,7 +690,7 @@ void usbhftdipStart(USBHFTDIPortDriver *ftdipp, const USBHFTDIPortConfig *config
|
||||||
usbhURBSubmit(&ftdipp->iq_urb);
|
usbhURBSubmit(&ftdipp->iq_urb);
|
||||||
|
|
||||||
chVTObjectInit(&ftdipp->vt);
|
chVTObjectInit(&ftdipp->vt);
|
||||||
chVTSet(&ftdipp->vt, MS2ST(16), _vt, ftdipp);
|
chVTSet(&ftdipp->vt, OSAL_MS2I(16), _vt, ftdipp);
|
||||||
|
|
||||||
ftdipp->state = USBHFTDIP_STATE_READY;
|
ftdipp->state = USBHFTDIP_STATE_READY;
|
||||||
osalMutexUnlock(&ftdipp->ftdip->mtx);
|
osalMutexUnlock(&ftdipp->ftdip->mtx);
|
||||||
|
|
|
@ -304,7 +304,7 @@ static msd_bot_result_t _msd_bot_transaction(msd_transaction_t *tran, USBHMassSt
|
||||||
|
|
||||||
/* control phase */
|
/* control phase */
|
||||||
status = usbhBulkTransfer(&lunp->msdp->epout, tran->cbw,
|
status = usbhBulkTransfer(&lunp->msdp->epout, tran->cbw,
|
||||||
sizeof(*tran->cbw), &actual_len, MS2ST(1000));
|
sizeof(*tran->cbw), &actual_len, OSAL_MS2I(1000));
|
||||||
|
|
||||||
if (status == USBH_URBSTATUS_CANCELLED) {
|
if (status == USBH_URBSTATUS_CANCELLED) {
|
||||||
uerr("\tMSD: Control phase: USBH_URBSTATUS_CANCELLED");
|
uerr("\tMSD: Control phase: USBH_URBSTATUS_CANCELLED");
|
||||||
|
@ -327,7 +327,7 @@ static msd_bot_result_t _msd_bot_transaction(msd_transaction_t *tran, USBHMassSt
|
||||||
ep,
|
ep,
|
||||||
data,
|
data,
|
||||||
tran->cbw->dCBWDataTransferLength,
|
tran->cbw->dCBWDataTransferLength,
|
||||||
&data_actual_len, MS2ST(20000));
|
&data_actual_len, OSAL_MS2I(20000));
|
||||||
|
|
||||||
if (status == USBH_URBSTATUS_CANCELLED) {
|
if (status == USBH_URBSTATUS_CANCELLED) {
|
||||||
uerr("\tMSD: Data phase: USBH_URBSTATUS_CANCELLED");
|
uerr("\tMSD: Data phase: USBH_URBSTATUS_CANCELLED");
|
||||||
|
@ -349,7 +349,7 @@ static msd_bot_result_t _msd_bot_transaction(msd_transaction_t *tran, USBHMassSt
|
||||||
|
|
||||||
/* status phase */
|
/* status phase */
|
||||||
status = usbhBulkTransfer(&lunp->msdp->epin, &csw,
|
status = usbhBulkTransfer(&lunp->msdp->epin, &csw,
|
||||||
sizeof(csw), &actual_len, MS2ST(1000));
|
sizeof(csw), &actual_len, OSAL_MS2I(1000));
|
||||||
|
|
||||||
if (status == USBH_URBSTATUS_STALL) {
|
if (status == USBH_URBSTATUS_STALL) {
|
||||||
uwarn("\tMSD: Status phase: USBH_URBSTATUS_STALL, clear halt and retry");
|
uwarn("\tMSD: Status phase: USBH_URBSTATUS_STALL, clear halt and retry");
|
||||||
|
@ -358,7 +358,7 @@ static msd_bot_result_t _msd_bot_transaction(msd_transaction_t *tran, USBHMassSt
|
||||||
|
|
||||||
if (status == USBH_URBSTATUS_OK) {
|
if (status == USBH_URBSTATUS_OK) {
|
||||||
status = usbhBulkTransfer(&lunp->msdp->epin, &csw,
|
status = usbhBulkTransfer(&lunp->msdp->epin, &csw,
|
||||||
sizeof(csw), &actual_len, MS2ST(1000));
|
sizeof(csw), &actual_len, OSAL_MS2I(1000));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue