Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Code Issues Wiki Activity

Use 4B address for device > 128Mb (16MB)

Browse source
This commit is contained in:
jflyper 2017-11-21 22:20:21 +09:00
parent 3d965ba64f
commit ecabd778f0
1 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/main/drivers/flash_m25p16.c
View file

@ -41,6 +41,8 @@
#define M25P16_STATUS_FLAG_WRITE_IN_PROGRESS 0x01 #define M25P16_STATUS_FLAG_WRITE_IN_PROGRESS 0x01
#define M25P16_STATUS_FLAG_WRITE_ENABLED 0x02 #define M25P16_STATUS_FLAG_WRITE_ENABLED 0x02
#define W25Q256_INSTRUCTION_ENTER_4BYTE_ADDRESS_MODE 0xB7
// Format is manufacturer, memory type, then capacity // Format is manufacturer, memory type, then capacity
#define JEDEC_ID_MACRONIX_MX25L3206E 0xC22016 #define JEDEC_ID_MACRONIX_MX25L3206E 0xC22016
#define JEDEC_ID_MACRONIX_MX25L6406E 0xC22017 #define JEDEC_ID_MACRONIX_MX25L6406E 0xC22017
@ -58,6 +60,7 @@
static busDevice_t busInstance; static busDevice_t busInstance;
static busDevice_t *bus; static busDevice_t *bus;
static bool isLargeFlash = false;
// The timeout we expect between being able to issue page program instructions // The timeout we expect between being able to issue page program instructions
#define DEFAULT_TIMEOUT_MILLIS 6 #define DEFAULT_TIMEOUT_MILLIS 6
@ -201,6 +204,11 @@ static bool m25p16_readIdentification(void)
geometry.sectorSize = geometry.pagesPerSector * geometry.pageSize; geometry.sectorSize = geometry.pagesPerSector * geometry.pageSize;
geometry.totalSize = geometry.sectorSize * geometry.sectors; geometry.totalSize = geometry.sectorSize * geometry.sectors;
if (geometry.totalSize > 16 * 1024 * 1024) {
isLargeFlash = true;
m25p16_performOneByteCommand(W25Q256_INSTRUCTION_ENTER_4BYTE_ADDRESS_MODE);
}
couldBeBusy = true; // Just for luck we'll assume the chip could be busy even though it isn't specced to be couldBeBusy = true; // Just for luck we'll assume the chip could be busy even though it isn't specced to be
return true; return true;
@ -243,12 +251,24 @@ bool m25p16_init(const flashConfig_t *flashConfig)
return m25p16_readIdentification(); return m25p16_readIdentification();
} }
void m25p16_setAddress(bool useLongAddress, uint32_t address, uint8_t *buf)
{
if (useLongAddress) {
*buf++ = (address >> 24) & 0xff;
}
*buf++ = (address >> 16) & 0xff;
*buf++ = (address >> 8) & 0xff;
*buf = address & 0xff;
}
/** /**
* Erase a sector full of bytes to all 1's at the given byte offset in the flash chip. * Erase a sector full of bytes to all 1's at the given byte offset in the flash chip.
*/ */
void m25p16_eraseSector(uint32_t address) void m25p16_eraseSector(uint32_t address)
{ {
const uint8_t out[] = { M25P16_INSTRUCTION_SECTOR_ERASE, (address >> 16) & 0xFF, (address >> 8) & 0xFF, address & 0xFF}; uint8_t out[5] = { M25P16_INSTRUCTION_SECTOR_ERASE };
m25p16_setAddress(isLargeFlash, address, &out[1]);
m25p16_waitForReady(SECTOR_ERASE_TIMEOUT_MILLIS); m25p16_waitForReady(SECTOR_ERASE_TIMEOUT_MILLIS);
@ -256,7 +276,7 @@ void m25p16_eraseSector(uint32_t address)
ENABLE_M25P16; ENABLE_M25P16;
spiTransfer(bus->busdev_u.spi.instance, out, NULL, sizeof(out)); spiTransfer(bus->busdev_u.spi.instance, out, NULL, isLargeFlash ? 5 : 4);
DISABLE_M25P16; DISABLE_M25P16;
} }
@ -272,7 +292,9 @@ void m25p16_eraseCompletely(void)
void m25p16_pageProgramBegin(uint32_t address) void m25p16_pageProgramBegin(uint32_t address)
{ {
const uint8_t command[] = { M25P16_INSTRUCTION_PAGE_PROGRAM, (address >> 16) & 0xFF, (address >> 8) & 0xFF, address & 0xFF}; uint8_t command[5] = { M25P16_INSTRUCTION_PAGE_PROGRAM };
m25p16_setAddress(isLargeFlash, address, &command[1]);
m25p16_waitForReady(DEFAULT_TIMEOUT_MILLIS); m25p16_waitForReady(DEFAULT_TIMEOUT_MILLIS);
@ -280,7 +302,7 @@ void m25p16_pageProgramBegin(uint32_t address)
ENABLE_M25P16; ENABLE_M25P16;
spiTransfer(bus->busdev_u.spi.instance, command, NULL, sizeof(command)); spiTransfer(bus->busdev_u.spi.instance, command, NULL, isLargeFlash ? 5 : 4);
} }
void m25p16_pageProgramContinue(const uint8_t *data, int length) void m25p16_pageProgramContinue(const uint8_t *data, int length)
@ -327,7 +349,9 @@ void m25p16_pageProgram(uint32_t address, const uint8_t *data, int length)
*/ */
int m25p16_readBytes(uint32_t address, uint8_t *buffer, int length) int m25p16_readBytes(uint32_t address, uint8_t *buffer, int length)
{ {
const uint8_t command[] = { M25P16_INSTRUCTION_READ_BYTES, (address >> 16) & 0xFF, (address >> 8) & 0xFF, address & 0xFF}; uint8_t command[5] = { M25P16_INSTRUCTION_READ_BYTES };
m25p16_setAddress(isLargeFlash, address, &command[1]);
if (!m25p16_waitForReady(DEFAULT_TIMEOUT_MILLIS)) { if (!m25p16_waitForReady(DEFAULT_TIMEOUT_MILLIS)) {
return 0; return 0;
@ -335,7 +359,7 @@ int m25p16_readBytes(uint32_t address, uint8_t *buffer, int length)
ENABLE_M25P16; ENABLE_M25P16;
spiTransfer(bus->busdev_u.spi.instance, command, NULL, sizeof(command)); spiTransfer(bus->busdev_u.spi.instance, command, NULL, isLargeFlash ? 5 : 4);
spiTransfer(bus->busdev_u.spi.instance, NULL, buffer, length); spiTransfer(bus->busdev_u.spi.instance, NULL, buffer, length);
DISABLE_M25P16; DISABLE_M25P16;