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

Merge pull request #184 from nanoframework/fix-usbms 

Fixes for USB MSD
This commit is contained in:
Fabien Poussin 2019-03-06 21:38:41 +01:00 committed by GitHub
parent 61e54f53e7 f014b8da68
commit 30773367ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/ports/STM32/LLD/USBHv1/hal_usbh_lld.c
View File

@ -1505,8 +1505,8 @@ static void _usbh_start(USBHDriver *usbh) {
#endif #endif
{ {
/* OTG HS clock enable and reset.*/ /* OTG HS clock enable and reset.*/
rccEnableOTG_HS(TRUE); // Enable HS clock when cpu is in sleep mode rccEnableOTG_HS(FALSE); // Disable HS clock when cpu is in sleep mode
rccDisableOTG_HSULPI(TRUE); // Disable HS ULPI clock when cpu is in sleep mode rccDisableOTG_HSULPI();
rccResetOTG_HS(); rccResetOTG_HS();
otgp->GINTMSK = 0; otgp->GINTMSK = 0;

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

@ -516,6 +516,8 @@ static msd_result_t _scsi_perform_transaction(USBHMassStorageLUNDriver *lunp,
if (scsi_requestsense(lunp, &sense) == MSD_RESULT_OK) { if (scsi_requestsense(lunp, &sense) == MSD_RESULT_OK) {
uwarnf("\tMSD: REQUEST SENSE: Sense key=%x, ASC=%02x, ASCQ=%02x", uwarnf("\tMSD: REQUEST SENSE: Sense key=%x, ASC=%02x, ASCQ=%02x",
sense.byte[2] & 0xf, sense.byte[12], sense.byte[13]); sense.byte[2] & 0xf, sense.byte[12], sense.byte[13]);
return MSD_RESULT_OK;
} }
} }
return MSD_RESULT_FAILED; return MSD_RESULT_FAILED;

84
os/various/fatfs_bindings/fatfs_diskio.c
View File

@ -14,14 +14,31 @@
#error "cannot specify both MMC_SPI and SDC drivers" #error "cannot specify both MMC_SPI and SDC drivers"
#endif #endif
#if HAL_USE_MMC_SPI // sanity check for no FAT option selected
extern MMCDriver MMCD1; // why is the FAT sources being pulled into the build?
#elif HAL_USE_SDC #if !HAL_USE_MMC_SPI && !HAL_USE_SDC & !HAL_USBH_USE_MSD
extern SDCDriver SDCD1; #error "MMC_SPI, SDC or USBH_MSD driver must be specified. None was."
#elif HAL_USBH_USE_MSD #endif
#if !defined(FATFS_HAL_DEVICE)
#if HAL_USE_MMC_SPI
#define FATFS_HAL_DEVICE MMCD1
#else #else
#error "MMC_SPI, SDC or USBH_MSD driver must be specified" #define FATFS_HAL_DEVICE SDCD1
#endif
#endif
#if HAL_USE_MMC_SPI
extern MMCDriver FATFS_HAL_DEVICE;
#endif
#if HAL_USE_SDC
extern SDCDriver FATFS_HAL_DEVICE;
#endif
#if HAL_USBH_USE_MSD
#endif
#if HAL_USE_RTC
extern RTCDriver RTCD1;
#endif #endif
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
@ -42,11 +59,12 @@ extern SDCDriver SDCD1;
#endif #endif
#endif #endif
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
/* Inidialize a Drive */ /* Inidialize a Drive */
DSTATUS disk_initialize ( DSTATUS disk_initialize (
BYTE pdrv /* Physical drive nmuber (0..) */ BYTE pdrv /* Physical drive number (0..) */
) )
{ {
DSTATUS stat; DSTATUS stat;
@ -56,18 +74,18 @@ DSTATUS disk_initialize (
case MMC: case MMC:
stat = 0; stat = 0;
/* It is initialized externally, just reads the status.*/ /* It is initialized externally, just reads the status.*/
if (blkGetDriverState(&MMCD1) != BLK_READY) if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
stat |= STA_NOINIT; stat |= STA_NOINIT;
if (mmcIsWriteProtected(&MMCD1)) if (mmcIsWriteProtected(&FATFS_HAL_DEVICE))
stat |= STA_PROTECT; stat |= STA_PROTECT;
return stat; return stat;
#elif HAL_USE_SDC #elif HAL_USE_SDC
case SDC: case SDC:
stat = 0; stat = 0;
/* It is initialized externally, just reads the status.*/ /* It is initialized externally, just reads the status.*/
if (blkGetDriverState(&SDCD1) != BLK_READY) if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
stat |= STA_NOINIT; stat |= STA_NOINIT;
if (sdcIsWriteProtected(&SDCD1)) if (sdcIsWriteProtected(&FATFS_HAL_DEVICE))
stat |= STA_PROTECT; stat |= STA_PROTECT;
return stat; return stat;
#endif #endif
@ -99,18 +117,18 @@ DSTATUS disk_status (
case MMC: case MMC:
stat = 0; stat = 0;
/* It is initialized externally, just reads the status.*/ /* It is initialized externally, just reads the status.*/
if (blkGetDriverState(&MMCD1) != BLK_READY) if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
stat |= STA_NOINIT; stat |= STA_NOINIT;
if (mmcIsWriteProtected(&MMCD1)) if (mmcIsWriteProtected(&FATFS_HAL_DEVICE))
stat |= STA_PROTECT; stat |= STA_PROTECT;
return stat; return stat;
#elif HAL_USE_SDC #elif HAL_USE_SDC
case SDC: case SDC:
stat = 0; stat = 0;
/* It is initialized externally, just reads the status.*/ /* It is initialized externally, just reads the status.*/
if (blkGetDriverState(&SDCD1) != BLK_READY) if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
stat |= STA_NOINIT; stat |= STA_NOINIT;
if (sdcIsWriteProtected(&SDCD1)) if (sdcIsWriteProtected(&FATFS_HAL_DEVICE))
stat |= STA_PROTECT; stat |= STA_PROTECT;
return stat; return stat;
#endif #endif
@ -141,24 +159,24 @@ DRESULT disk_read (
switch (pdrv) { switch (pdrv) {
#if HAL_USE_MMC_SPI #if HAL_USE_MMC_SPI
case MMC: case MMC:
if (blkGetDriverState(&MMCD1) != BLK_READY) if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
return RES_NOTRDY; return RES_NOTRDY;
if (mmcStartSequentialRead(&MMCD1, sector)) if (mmcStartSequentialRead(&FATFS_HAL_DEVICE, sector))
return RES_ERROR; return RES_ERROR;
while (count > 0) { while (count > 0) {
if (mmcSequentialRead(&MMCD1, buff)) if (mmcSequentialRead(&FATFS_HAL_DEVICE, buff))
return RES_ERROR; return RES_ERROR;
buff += MMCSD_BLOCK_SIZE; buff += MMCSD_BLOCK_SIZE;
count--; count--;
} }
if (mmcStopSequentialRead(&MMCD1)) if (mmcStopSequentialRead(&FATFS_HAL_DEVICE))
return RES_ERROR; return RES_ERROR;
return RES_OK; return RES_OK;
#elif HAL_USE_SDC #elif HAL_USE_SDC
case SDC: case SDC:
if (blkGetDriverState(&SDCD1) != BLK_READY) if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
return RES_NOTRDY; return RES_NOTRDY;
if (sdcRead(&SDCD1, sector, buff, count)) if (sdcRead(&FATFS_HAL_DEVICE, sector, buff, count))
return RES_ERROR; return RES_ERROR;
return RES_OK; return RES_OK;
#endif #endif
@ -180,6 +198,7 @@ DRESULT disk_read (
/*-----------------------------------------------------------------------*/ /*-----------------------------------------------------------------------*/
/* Write Sector(s) */ /* Write Sector(s) */
#if !FF_FS_READONLY
DRESULT disk_write ( DRESULT disk_write (
BYTE pdrv, /* Physical drive number (0..) */ BYTE pdrv, /* Physical drive number (0..) */
const BYTE *buff, /* Data to be written */ const BYTE *buff, /* Data to be written */
@ -190,26 +209,26 @@ DRESULT disk_write (
switch (pdrv) { switch (pdrv) {
#if HAL_USE_MMC_SPI #if HAL_USE_MMC_SPI
case MMC: case MMC:
if (blkGetDriverState(&MMCD1) != BLK_READY) if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
return RES_NOTRDY; return RES_NOTRDY;
if (mmcIsWriteProtected(&MMCD1)) if (mmcIsWriteProtected(&FATFS_HAL_DEVICE))
return RES_WRPRT; return RES_WRPRT;
if (mmcStartSequentialWrite(&MMCD1, sector)) if (mmcStartSequentialWrite(&FATFS_HAL_DEVICE, sector))
return RES_ERROR; return RES_ERROR;
while (count > 0) { while (count > 0) {
if (mmcSequentialWrite(&MMCD1, buff)) if (mmcSequentialWrite(&FATFS_HAL_DEVICE, buff))
return RES_ERROR; return RES_ERROR;
buff += MMCSD_BLOCK_SIZE; buff += MMCSD_BLOCK_SIZE;
count--; count--;
} }
if (mmcStopSequentialWrite(&MMCD1)) if (mmcStopSequentialWrite(&FATFS_HAL_DEVICE))
return RES_ERROR; return RES_ERROR;
return RES_OK; return RES_OK;
#elif HAL_USE_SDC #elif HAL_USE_SDC
case SDC: case SDC:
if (blkGetDriverState(&SDCD1) != BLK_READY) if (blkGetDriverState(&FATFS_HAL_DEVICE) != BLK_READY)
return RES_NOTRDY; return RES_NOTRDY;
if (sdcWrite(&SDCD1, sector, buff, count)) if (sdcWrite(&FATFS_HAL_DEVICE, sector, buff, count))
return RES_ERROR; return RES_ERROR;
return RES_OK; return RES_OK;
#endif #endif
@ -225,6 +244,7 @@ DRESULT disk_write (
} }
return RES_PARERR; return RES_PARERR;
} }
#endif /* _FS_READONLY */
@ -237,6 +257,8 @@ DRESULT disk_ioctl (
void *buff /* Buffer to send/receive control data */ void *buff /* Buffer to send/receive control data */
) )
{ {
(void)buff;
switch (pdrv) { switch (pdrv) {
#if HAL_USE_MMC_SPI #if HAL_USE_MMC_SPI
case MMC: case MMC:
@ -250,7 +272,7 @@ DRESULT disk_ioctl (
#endif #endif
#if FF_USE_TRIM #if FF_USE_TRIM
case CTRL_TRIM: case CTRL_TRIM:
mmcErase(&MMCD1, *((DWORD *)buff), *((DWORD *)buff + 1)); mmcErase(&FATFS_HAL_DEVICE, *((DWORD *)buff), *((DWORD *)buff + 1));
return RES_OK; return RES_OK;
#endif #endif
default: default:
@ -262,7 +284,7 @@ DRESULT disk_ioctl (
case CTRL_SYNC: case CTRL_SYNC:
return RES_OK; return RES_OK;
case GET_SECTOR_COUNT: case GET_SECTOR_COUNT:
*((DWORD *)buff) = mmcsdGetCardCapacity(&SDCD1); *((DWORD *)buff) = mmcsdGetCardCapacity(&FATFS_HAL_DEVICE);
return RES_OK; return RES_OK;
#if FF_MAX_SS > FF_MIN_SS #if FF_MAX_SS > FF_MIN_SS
case GET_SECTOR_SIZE: case GET_SECTOR_SIZE:
@ -274,7 +296,7 @@ DRESULT disk_ioctl (
return RES_OK; return RES_OK;
#if FF_USE_TRIM #if FF_USE_TRIM
case CTRL_TRIM: case CTRL_TRIM:
sdcErase(&SDCD1, *((DWORD *)buff), *((DWORD *)buff + 1)); sdcErase(&FATFS_HAL_DEVICE, *((DWORD *)buff), *((DWORD *)buff + 1));
return RES_OK; return RES_OK;
#endif #endif
default: default: