bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

It looks like HAS_ONBOARD_SD is obsolete

Browse Source
This commit is contained in:
Scott Lahteine
2020-04-16 01:56:37 -05:00
parent bc856fd8ec
commit 880f63b008
6 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/STM32F1/msc_sd.cpp
View File

@ -25,7 +25,7 @@ USBCompositeSerial MarlinCompositeSerial;
#include "../../inc/MarlinConfig.h"
#ifdef HAS_ONBOARD_SD
#if SD_CONNECTION_IS(ONBOARD)
#include "onboard_sd.h"
@ -47,7 +47,7 @@ void MSC_SD_init() {
USBComposite.end();
USBComposite.clear();
// Set api and register mass storage
#ifdef HAS_ONBOARD_SD
#if SD_CONNECTION_IS(ONBOARD)
uint32_t cardSize;
if (disk_initialize(0) == RES_OK) {
if (disk_ioctl(0, GET_SECTOR_COUNT, (void *)(&cardSize)) == RES_OK) {

6
Marlin/src/HAL/STM32F1/onboard_sd.cpp
View File

@ -14,13 +14,13 @@
#include "../../inc/MarlinConfig.h"
#ifdef HAS_ONBOARD_SD
#if SD_CONNECTION_IS(ONBOARD)
#include "onboard_sd.h"
#include "SPI.h"
#include "fastio.h"
#ifdef SHARED_SD_CARD
#if ENABLED(SHARED_SD_CARD)
#ifndef ON_BOARD_SPI_DEVICE
#define ON_BOARD_SPI_DEVICE SPI_DEVICE
#endif
@ -553,4 +553,4 @@ DRESULT disk_read (
#endif // _DISKIO_IOCTL
#endif // HAS_ONBOARD_SD
#endif // SD_CONNECTION_IS(ONBOARD)