Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-14 20:10:18 +03:00
Code Issues Wiki Activity

Merge pull request #7124 from mikeller/rename_use_flash

Browse source 
Renamed USE_FLASH to USE_FLASH_CHIP for clarity.
This commit is contained in:
Michael Keller 2018-11-26 21:51:27 +13:00 • committed by GitHub
commit 02c7ac8c93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/drivers/flash.c
View file

@ -25,7 +25,7 @@
#include "build/debug.h" #include "build/debug.h"
#ifdef USE_FLASH #ifdef USE_FLASH_CHIP
#include "flash.h" #include "flash.h"
#include "flash_impl.h" #include "flash_impl.h"
@ -166,4 +166,4 @@ const flashGeometry_t *flashGetGeometry(void)
return &noFlashGeometry; return &noFlashGeometry;
} }
#endif // USE_FLASH #endif // USE_FLASH_CHIP

2
src/main/fc/init.c
View file

@ -643,7 +643,7 @@ void init(void)
#endif #endif
#ifdef USE_FLASHFS #ifdef USE_FLASHFS
#if defined(USE_FLASH) #if defined(USE_FLASH_CHIP)
flashInit(flashConfig()); flashInit(flashConfig());
#endif #endif
flashfsInit(); flashfsInit();

2
src/main/interface/cli.c
View file

@ -3904,7 +3904,7 @@ const cliResourceValue_t resourceTable[] = {
#if defined(USE_USB_MSC) #if defined(USE_USB_MSC)
DEFS( OWNER_USB_MSC_PIN, PG_USB_CONFIG, usbDev_t, mscButtonPin ), DEFS( OWNER_USB_MSC_PIN, PG_USB_CONFIG, usbDev_t, mscButtonPin ),
#endif #endif
#ifdef USE_FLASH #ifdef USE_FLASH_CHIP
DEFS( OWNER_FLASH_CS, PG_FLASH_CONFIG, flashConfig_t, csTag ), DEFS( OWNER_FLASH_CS, PG_FLASH_CONFIG, flashConfig_t, csTag ),
#endif #endif
#ifdef USE_MAX7456 #ifdef USE_MAX7456

2
src/main/interface/settings.c
View file

@ -1218,7 +1218,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) }, { "usb_msc_pin_pullup", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_USB_CONFIG, offsetof(usbDev_t, mscButtonUsePullup) },
#endif #endif
// PG_FLASH_CONFIG // 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) }, { "flash_spi_bus", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, SPIDEV_COUNT }, PG_FLASH_CONFIG, offsetof(flashConfig_t, spiDevice) },
#endif #endif
// RCDEVICE // RCDEVICE

2
src/main/msc/usbd_storage_emfat.c
View file

@ -69,7 +69,7 @@ static int8_t STORAGE_Init(uint8_t lun)
LED0_ON; LED0_ON;
#ifdef USE_FLASHFS #ifdef USE_FLASHFS
#ifdef USE_FLASH #ifdef USE_FLASH_CHIP
flashInit(flashConfig()); flashInit(flashConfig());
#endif #endif
flashfsInit(); flashfsInit();

2
src/main/pg/flash.c
View file

@ -23,7 +23,7 @@
#include "platform.h" #include "platform.h"
#ifdef USE_FLASH #ifdef USE_FLASH_CHIP
#include "drivers/bus_spi.h" #include "drivers/bus_spi.h"
#include "drivers/io.h" #include "drivers/io.h"

2
src/main/target/common_post.h
View file

@ -178,7 +178,7 @@
#endif #endif
#if defined(USE_FLASH_M25P16) #if defined(USE_FLASH_M25P16)
#define USE_FLASH #define USE_FLASH_CHIP
#endif #endif
#if defined(USE_MAX7456) #if defined(USE_MAX7456)