Renamed USE_FLASH to USE_FLASH_CHIP for clarity.
This commit is contained in:
parent
4246f06529
commit
c8e484df94
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include "build/debug.h"
|
||||
|
||||
#ifdef USE_FLASH
|
||||
#ifdef USE_FLASH_CHIP
|
||||
|
||||
#include "flash.h"
|
||||
#include "flash_impl.h"
|
||||
|
@ -166,4 +166,4 @@ const flashGeometry_t *flashGetGeometry(void)
|
|||
|
||||
return &noFlashGeometry;
|
||||
}
|
||||
#endif // USE_FLASH
|
||||
#endif // USE_FLASH_CHIP
|
||||
|
|
|
@ -643,7 +643,7 @@ void init(void)
|
|||
#endif
|
||||
|
||||
#ifdef USE_FLASHFS
|
||||
#if defined(USE_FLASH)
|
||||
#if defined(USE_FLASH_CHIP)
|
||||
flashInit(flashConfig());
|
||||
#endif
|
||||
flashfsInit();
|
||||
|
|
|
@ -3895,7 +3895,7 @@ const cliResourceValue_t resourceTable[] = {
|
|||
#if defined(USE_USB_MSC)
|
||||
DEFS( OWNER_USB_MSC_PIN, PG_USB_CONFIG, usbDev_t, mscButtonPin ),
|
||||
#endif
|
||||
#ifdef USE_FLASH
|
||||
#ifdef USE_FLASH_CHIP
|
||||
DEFS( OWNER_FLASH_CS, PG_FLASH_CONFIG, flashConfig_t, csTag ),
|
||||
#endif
|
||||
#ifdef USE_MAX7456
|
||||
|
|
|
@ -1217,7 +1217,7 @@ const clivalue_t valueTable[] = {
|
|||
{ "usb_msc_pin_pullup", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_USB_CONFIG, offsetof(usbDev_t, mscButtonUsePullup) },
|
||||
#endif
|
||||
// PG_FLASH_CONFIG
|
||||
#ifdef USE_FLASH
|
||||
#ifdef USE_FLASH_CHIP
|
||||
{ "flash_spi_bus", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, SPIDEV_COUNT }, PG_FLASH_CONFIG, offsetof(flashConfig_t, spiDevice) },
|
||||
#endif
|
||||
// RCDEVICE
|
||||
|
|
|
@ -69,7 +69,7 @@ static int8_t STORAGE_Init(uint8_t lun)
|
|||
LED0_ON;
|
||||
|
||||
#ifdef USE_FLASHFS
|
||||
#ifdef USE_FLASH
|
||||
#ifdef USE_FLASH_CHIP
|
||||
flashInit(flashConfig());
|
||||
#endif
|
||||
flashfsInit();
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "platform.h"
|
||||
|
||||
#ifdef USE_FLASH
|
||||
#ifdef USE_FLASH_CHIP
|
||||
|
||||
#include "drivers/bus_spi.h"
|
||||
#include "drivers/io.h"
|
||||
|
|
|
@ -180,7 +180,7 @@
|
|||
#endif
|
||||
|
||||
#if defined(USE_FLASH_M25P16)
|
||||
#define USE_FLASH
|
||||
#define USE_FLASH_CHIP
|
||||
#endif
|
||||
|
||||
#if defined(USE_MAX7456)
|
||||
|
|
Loading…
Reference in New Issue