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

#140

This commit is contained in:
rusefi 2017-06-20 06:04:06 +03:00
parent ee3529296d
commit b19b850575
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/hw_layer/mmc_card.cpp
View File

@ -327,6 +327,9 @@ static void MMCumount(void) {
scheduleMsg(&logger, "MMC/SD card removed"); scheduleMsg(&logger, "MMC/SD card removed");
} }
#define RAMDISK_BLOCK_SIZE 512U
static uint8_t blkbuf[RAMDISK_BLOCK_SIZE];
/* /*
* MMC card mount. * MMC card mount.
*/ */
@ -358,25 +361,32 @@ static void MMCmount(void) {
#if HAL_USE_USB_MSD #if HAL_USE_USB_MSD
msdObjectInit(&USBMSD1); msdObjectInit(&USBMSD1);
// BaseBlockDevice *bbdp = (BaseBlockDevice*)&MMCD1; BaseBlockDevice *bbdp = (BaseBlockDevice*)&MMCD1;
msdStart(&USBMSD1, usb_driver, bbdp, blkbuf, NULL);
// const usb_msd_driver_state_t msd_driver_state = msdInit(ms_usb_driver, bbdp, &UMSD1, USB_MS_DATA_EP, USB_MSD_INTERFACE_NUMBER); // const usb_msd_driver_state_t msd_driver_state = msdInit(ms_usb_driver, bbdp, &UMSD1, USB_MS_DATA_EP, USB_MSD_INTERFACE_NUMBER);
// UMSD1.chp = NULL; // UMSD1.chp = NULL;
/*Disconnect the USB Bus*/ /*Disconnect the USB Bus*/
// usbDisconnectBus(ms_usb_driver); usbDisconnectBus(usb_driver);
// chThdSleepMilliseconds(200); chThdSleepMilliseconds(200);
// //
// /*Start the useful functions*/ // /*Start the useful functions*/
// msdStart(&UMSD1); // msdStart(&UMSD1);
// usbStart(ms_usb_driver, &msd_usb_config); usbStart(usb_driver, &msdusbcfg);
// //
// /*Connect the USB Bus*/ /*Connect the USB Bus*/
// usbConnectBus(ms_usb_driver); usbConnectBus(usb_driver);
#endif #endif
//} //}
unlockSpi(); unlockSpi();
#if HAL_USE_USB_MSD
sdStatus = SD_STATE_MOUNTED;
return;
#endif
// if Ok - mount FS now // if Ok - mount FS now
memset(&MMC_FS, 0, sizeof(FATFS)); memset(&MMC_FS, 0, sizeof(FATFS));
if (f_mount(&MMC_FS, "/", 1) == FR_OK) { if (f_mount(&MMC_FS, "/", 1) == FR_OK) {