Merge branch 'master' of https://github.com/ChibiOS/ChibiOS-Contrib

3 files changed, 21 insertions, 5 deletions

diff --git a/os/hal/src/usbh/hal_usbh_aoa.c b/os/hal/src/usbh/hal_usbh_aoa.c
index bda93a2..4e1d65d 100644
--- a/os/hal/src/usbh/hal_usbh_aoa.c
+++ b/os/hal/src/usbh/hal_usbh_aoa.c
@@ -509,8 +509,15 @@ static size_t _read(USBHAOAChannel *aoacp, uint8_t *bp, size_t n) {
 	return _read_timeout(aoacp, bp, n, TIME_INFINITE);
 }
 
+static msg_t _ctl(USBHAOAChannel *ftdipp, unsigned int operation, void *arg) {
+	(void)ftdipp;
+	(void)operation;
+	(void)arg;
+	return MSG_OK;
+}
+
 static const struct AOADriverVMT async_channel_vmt = {
-	(size_t) 0,
+	(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,
@@ -519,7 +526,7 @@ static const struct AOADriverVMT async_channel_vmt = {
 	(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,
-	(void*) 0 // FIXME: Implement CTL
+	(msg_t (*)(void *, unsigned int, void *))_ctl
 };
 
 static void _stop_channelS(USBHAOAChannel *aoacp) {
diff --git a/os/hal/src/usbh/hal_usbh_ftdi.c b/os/hal/src/usbh/hal_usbh_ftdi.c
index 070dbcf..b262256 100644
--- a/os/hal/src/usbh/hal_usbh_ftdi.c
+++ b/os/hal/src/usbh/hal_usbh_ftdi.c
@@ -601,6 +601,13 @@ static size_t _read(USBHFTDIPortDriver *ftdipp, uint8_t *bp, size_t n) {
 	return _read_timeout(ftdipp, bp, n, TIME_INFINITE);
 }
 
+static msg_t _ctl(USBHFTDIPortDriver *ftdipp, unsigned int operation, void *arg) {
+	(void)ftdipp;
+	(void)operation;
+	(void)arg;
+	return MSG_OK;
+}
+
 static void _vt(void *p) {
 	USBHFTDIPortDriver *const ftdipp = (USBHFTDIPortDriver *)p;
 	osalSysLockFromISR();
@@ -616,7 +623,7 @@ static void _vt(void *p) {
 }
 
 static const struct FTDIPortDriverVMT async_channel_vmt = {
-	(size_t) 0,
+	(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,
@@ -624,8 +631,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, 
-	(void*) 0 // FIXME: Implement CTL
+	(size_t (*)(void *, uint8_t *, size_t, systime_t))_read_timeout,
+	(msg_t (*)(void *, unsigned int, void *))_ctl
 };
 
 
diff --git a/os/hal/src/usbh/hal_usbh_msd.c b/os/hal/src/usbh/hal_usbh_msd.c
index fe97ff0..3d57934 100644
--- a/os/hal/src/usbh/hal_usbh_msd.c
+++ b/os/hal/src/usbh/hal_usbh_msd.c
@@ -516,6 +516,8 @@ static msd_result_t _scsi_perform_transaction(USBHMassStorageLUNDriver *lunp,
 			if (scsi_requestsense(lunp, &sense) == MSD_RESULT_OK) {
 				uwarnf("\tMSD: REQUEST SENSE: Sense key=%x, ASC=%02x, ASCQ=%02x",
 						sense.byte[2] & 0xf, sense.byte[12], sense.byte[13]);
+
+				return MSD_RESULT_OK;
 			}
 		}
 		return MSD_RESULT_FAILED;