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

Flash code tidy

This commit is contained in:
Martin Budden 2017-04-25 06:05:00 +01:00
parent a5866f4fc6
commit 3e66b8edbd
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/drivers/flash_m25p16.c
View File

@ -88,7 +88,7 @@ static void m25p16_performOneByteCommand(uint8_t command)
* The flash requires this write enable command to be sent before commands that would cause * The flash requires this write enable command to be sent before commands that would cause
* a write like program and erase. * a write like program and erase.
*/ */
static void m25p16_writeEnable() static void m25p16_writeEnable(void)
{ {
m25p16_performOneByteCommand(M25P16_INSTRUCTION_WRITE_ENABLE); m25p16_performOneByteCommand(M25P16_INSTRUCTION_WRITE_ENABLE);
@ -96,7 +96,7 @@ static void m25p16_writeEnable()
couldBeBusy = true; couldBeBusy = true;
} }
static uint8_t m25p16_readStatus() static uint8_t m25p16_readStatus(void)
{ {
uint8_t command[2] = { M25P16_INSTRUCTION_READ_STATUS_REG, 0 }; uint8_t command[2] = { M25P16_INSTRUCTION_READ_STATUS_REG, 0 };
uint8_t in[2]; uint8_t in[2];
@ -110,7 +110,7 @@ static uint8_t m25p16_readStatus()
return in[1]; return in[1];
} }
bool m25p16_isReady() bool m25p16_isReady(void)
{ {
// If couldBeBusy is false, don't bother to poll the flash chip for its status // If couldBeBusy is false, don't bother to poll the flash chip for its status
couldBeBusy = couldBeBusy && ((m25p16_readStatus() & M25P16_STATUS_FLAG_WRITE_IN_PROGRESS) != 0); couldBeBusy = couldBeBusy && ((m25p16_readStatus() & M25P16_STATUS_FLAG_WRITE_IN_PROGRESS) != 0);
@ -135,7 +135,7 @@ bool m25p16_waitForReady(uint32_t timeoutMillis)
* *
* Returns true if we get valid ident, false if something bad happened like there is no M25P16. * Returns true if we get valid ident, false if something bad happened like there is no M25P16.
*/ */
static bool m25p16_readIdentification() static bool m25p16_readIdentification(void)
{ {
uint8_t out[] = { M25P16_INSTRUCTION_RDID, 0, 0, 0 }; uint8_t out[] = { M25P16_INSTRUCTION_RDID, 0, 0, 0 };
uint8_t in[4]; uint8_t in[4];
@ -254,7 +254,7 @@ void m25p16_eraseSector(uint32_t address)
DISABLE_M25P16; DISABLE_M25P16;
} }
void m25p16_eraseCompletely() void m25p16_eraseCompletely(void)
{ {
m25p16_waitForReady(BULK_ERASE_TIMEOUT_MILLIS); m25p16_waitForReady(BULK_ERASE_TIMEOUT_MILLIS);
@ -281,7 +281,7 @@ void m25p16_pageProgramContinue(const uint8_t *data, int length)
spiTransfer(M25P16_SPI_INSTANCE, NULL, data, length); spiTransfer(M25P16_SPI_INSTANCE, NULL, data, length);
} }
void m25p16_pageProgramFinish() void m25p16_pageProgramFinish(void)
{ {
DISABLE_M25P16; DISABLE_M25P16;
} }
@ -341,7 +341,7 @@ int m25p16_readBytes(uint32_t address, uint8_t *buffer, int length)
* *
* Can be called before calling m25p16_init() (the result would have totalSize = 0). * Can be called before calling m25p16_init() (the result would have totalSize = 0).
*/ */
const flashGeometry_t* m25p16_getGeometry() const flashGeometry_t* m25p16_getGeometry(void)
{ {
return &geometry; return &geometry;
} }

8
src/main/drivers/flash_m25p16.h
View File

@ -25,18 +25,18 @@
bool m25p16_init(const flashConfig_t *flashConfig); bool m25p16_init(const flashConfig_t *flashConfig);
void m25p16_eraseSector(uint32_t address); void m25p16_eraseSector(uint32_t address);
void m25p16_eraseCompletely(); void m25p16_eraseCompletely(void);
void m25p16_pageProgram(uint32_t address, const uint8_t *data, int length); void m25p16_pageProgram(uint32_t address, const uint8_t *data, int length);
void m25p16_pageProgramBegin(uint32_t address); void m25p16_pageProgramBegin(uint32_t address);
void m25p16_pageProgramContinue(const uint8_t *data, int length); void m25p16_pageProgramContinue(const uint8_t *data, int length);
void m25p16_pageProgramFinish(); void m25p16_pageProgramFinish(void);
int m25p16_readBytes(uint32_t address, uint8_t *buffer, int length); int m25p16_readBytes(uint32_t address, uint8_t *buffer, int length);
bool m25p16_isReady(); bool m25p16_isReady(void);
bool m25p16_waitForReady(uint32_t timeoutMillis); bool m25p16_waitForReady(uint32_t timeoutMillis);
struct flashGeometry_s; struct flashGeometry_s;
const struct flashGeometry_s* m25p16_getGeometry(); const struct flashGeometry_s* m25p16_getGeometry(void);