rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix incompatible USBH VMTs

This commit is contained in:
Paul Roukema 2018-08-05 23:59:06 -04:00
parent fe95e90b80
commit 2a9d939d72
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/src/usbh/hal_usbh_aoa.c
View File

@ -499,6 +499,7 @@ static size_t _read(USBHAOAChannel *aoacp, uint8_t *bp, size_t n) {
}
static const struct AOADriverVMT async_channel_vmt = {
(size_t) 0,
(size_t (*)(void *, const uint8_t *, size_t))_write,
(size_t (*)(void *, uint8_t *, size_t))_read,
(msg_t (*)(void *, uint8_t))_put,
@ -506,7 +507,8 @@ static const struct AOADriverVMT async_channel_vmt = {
(msg_t (*)(void *, uint8_t, systime_t))_put_timeout,
(msg_t (*)(void *, systime_t))_get_timeout,
(size_t (*)(void *, const uint8_t *, size_t, systime_t))_write_timeout,
(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout
(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout,
(void*) 0 // FIXME: Implement CTL
};
static void _stop_channelS(USBHAOAChannel *aoacp) {

5
os/hal/src/usbh/hal_usbh_ftdi.c
View File

@ -150,6 +150,7 @@ alloc_ok:
case 0x900: //232H;
uinfo("FTDI: Type H chip");
ftdip->type = USBHFTDI_TYPE_H;
break;
default:
uerr("FTDI: Unrecognized chip type");
return NULL;
@ -615,6 +616,7 @@ static void _vt(void *p) {
}
static const struct FTDIPortDriverVMT async_channel_vmt = {
(size_t) 0,
(size_t (*)(void *, const uint8_t *, size_t))_write,
(size_t (*)(void *, uint8_t *, size_t))_read,
(msg_t (*)(void *, uint8_t))_put,
@ -622,7 +624,8 @@ static const struct FTDIPortDriverVMT async_channel_vmt = {
(msg_t (*)(void *, uint8_t, systime_t))_put_timeout,
(msg_t (*)(void *, systime_t))_get_timeout,
(size_t (*)(void *, const uint8_t *, size_t, systime_t))_write_timeout,
(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout
(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout,
(void*) 0 // FIXME: Implement CTL
};

1
os/hal/src/usbh/hal_usbh_msd.c
View File

@ -683,6 +683,7 @@ static msd_result_t scsi_write10(USBHMassStorageLUNDriver *lunp, uint32_t lba, u
USBHMassStorageLUNDriver MSBLKD[HAL_USBHMSD_MAX_LUNS];
static const struct USBHMassStorageDriverVMT blk_vmt = {
(size_t)0,
(bool (*)(void *))usbhmsdLUNIsInserted,
(bool (*)(void *))usbhmsdLUNIsProtected,
(bool (*)(void *))usbhmsdLUNConnect,