aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal
diff options
context:
space:
mode:
authorJosé Simões <jose.simoes@eclo.solutions>2019-02-26 22:38:30 +0000
committerJosé Simões <jose.simoes@eclo.solutions>2019-02-27 15:00:50 +0000
commitf014b8da68f162bb06ca88acf0085382a76d8dcd (patch)
tree63297febf9738bf88bbb86766df520f05609ad62 /os/hal
parentb82dd2d0266dfdb91e8563536af74cf3727b91c2 (diff)
downloadChibiOS-Contrib-f014b8da68f162bb06ca88acf0085382a76d8dcd.tar.gz
ChibiOS-Contrib-f014b8da68f162bb06ca88acf0085382a76d8dcd.tar.bz2
ChibiOS-Contrib-f014b8da68f162bb06ca88acf0085382a76d8dcd.zip
Fixes for USB MSD
- Fix return value on succesfull scsi_requestsense. - Fix calls to LL SMT32 API for OTG2. - Port changes from ChibiOS fatfs_diskio. - Rework checks to allow simultaneous use of SD Card and USB MSD. Signed-off-by: José Simões <jose.simoes@eclo.solutions>
Diffstat (limited to 'os/hal')
-rw-r--r--os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c4
-rw-r--r--os/hal/src/usbh/hal_usbh_msd.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
index 3298c20..192b008 100644
--- a/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
+++ b/os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
@@ -1505,8 +1505,8 @@ static void _usbh_start(USBHDriver *usbh) {
#endif
{
/* OTG HS clock enable and reset.*/
- rccEnableOTG_HS(TRUE); // Enable HS clock when cpu is in sleep mode
- rccDisableOTG_HSULPI(TRUE); // Disable HS ULPI clock when cpu is in sleep mode
+ rccEnableOTG_HS(FALSE); // Disable HS clock when cpu is in sleep mode
+ rccDisableOTG_HSULPI();
rccResetOTG_HS();
otgp->GINTMSK = 0;
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;