andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9450 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
Giovanni Di Sirio 2016-05-08 10:53:21 +00:00
parent cc298608cc
commit a4e52c4687
1 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
os/ex/Micron/n25q128.c
View File

@ -81,7 +81,7 @@ static flash_descriptor_t descriptor = {
/* Driver local functions. */ /* Driver local functions. */
/*===========================================================================*/ /*===========================================================================*/
static void spi_send_cmd_addr(N25Q128Driver *devp, static void flash_send_cmd_addr(N25Q128Driver *devp,
uint8_t cmd, uint8_t cmd,
flash_address_t addr) { flash_address_t addr) {
uint8_t buf[4]; uint8_t buf[4];
@ -93,21 +93,47 @@ static void spi_send_cmd_addr(N25Q128Driver *devp,
spiSend(devp->config->spip, 4, buf); spiSend(devp->config->spip, 4, buf);
} }
static void spi_send_cmd(N25Q128Driver *devp, uint8_t cmd) { static void flash_send_cmd(N25Q128Driver *devp, uint8_t cmd) {
uint8_t buf[1]; uint8_t buf[1];
buf[0] = cmd; buf[0] = cmd;
spiSend(devp->config->spip, 1, buf); spiSend(devp->config->spip, 1, buf);
} }
static flash_error_t flash_poll_status(N25Q128Driver *devp) {
SPIDriver *spip = devp->config->spip;
uint8_t sts;
do {
#if N25Q128_NICE_WAITING == TRUE
osalThreadSleepMilliseconds(1);
#endif
/* Read status command.*/
spiSelect(spip);
flash_send_cmd(devp, N25Q128_CMD_READ_STATUS_REGISTER);
spiReceive(spip, 1, &sts);
spiUnselect(spip);
} while ((sts & N25Q128_STS_BUSY) != 0U);
/* Checking for errors.*/
if ((sts & N25Q128_STS_ALL_ERRORS) != 0U) {
/* Clearing status register.*/
spiSelect(spip);
flash_send_cmd(devp, N25Q128_CMD_CLEAR_FLAG_STATUS_REGISTER);
spiUnselect(spip);
/* Program operation failed.*/
return FLASH_PROGRAM_FAILURE;
}
return FLASH_NO_ERROR;
}
static const flash_descriptor_t *get_attributes(void *instance) { static const flash_descriptor_t *get_attributes(void *instance) {
N25Q128Driver *devp = (N25Q128Driver *)instance; N25Q128Driver *devp = (N25Q128Driver *)instance;
SPIDriver *spip = devp->config->spip;
osalDbgAssert(devp->state == FLASH_READY, "invalid state"); osalDbgAssert(devp->state == FLASH_READY, "invalid state");
(void)instance;
return &descriptor; return &descriptor;
} }
@ -166,8 +192,8 @@ static flash_error_t program(void *instance, flash_address_t addr,
#endif #endif
devp->state = FLASH_ACTIVE; devp->state = FLASH_ACTIVE;
/* Data is programmed page by page.*/
while (n > 0U) { while (n > 0U) {
uint8_t sts;
/* Data size that can be written in a single program page operation.*/ /* Data size that can be written in a single program page operation.*/
size_t chunk = (size_t)(((addr | PAGE_MASK) + 1U) - addr); size_t chunk = (size_t)(((addr | PAGE_MASK) + 1U) - addr);
@ -177,40 +203,21 @@ static flash_error_t program(void *instance, flash_address_t addr,
/* Enabling write operation.*/ /* Enabling write operation.*/
spiSelect(spip); spiSelect(spip);
spi_send_cmd(devp, N25Q128_CMD_WRITE_ENABLE); flash_send_cmd(devp, N25Q128_CMD_WRITE_ENABLE);
spiUnselect(spip); spiUnselect(spip);
(void) spiPolledExchange(spip, 0xFF); /* One frame delay.*/ (void) spiPolledExchange(spip, 0xFF); /* One frame delay.*/
/* Page program command.*/ /* Page program command.*/
spiSelect(spip); spiSelect(spip);
spi_send_cmd_addr(devp, N25Q128_CMD_PAGE_PROGRAM, addr); flash_send_cmd_addr(devp, N25Q128_CMD_PAGE_PROGRAM, addr);
spiSend(spip, chunk, pp); spiSend(spip, chunk, pp);
spiUnselect(spip); spiUnselect(spip);
(void) spiPolledExchange(spip, 0xFF); /* One frame delay.*/ (void) spiPolledExchange(spip, 0xFF); /* One frame delay.*/
/* Operation end waiting.*/ /* Wait for status and check errors.*/
do { err = flash_poll_status(devp);
#if N25Q128_NICE_WAITING == TRUE if (err != FLASH_NO_ERROR) {
osalThreadSleepMilliseconds(1); break;
#endif
/* Read status command.*/
spiSelect(spip);
spi_send_cmd(devp, N25Q128_CMD_READ_STATUS_REGISTER);
spiReceive(spip, 1, &sts);
spiUnselect(spip);
} while ((sts & N25Q128_STS_BUSY) != 0U);
/* Checking for errors.*/
if ((sts & N25Q128_STS_ALL_ERRORS) != 0U) {
/* Clearing status register.*/
(void) spiPolledExchange(spip, 0xFF); /* One frame delay.*/
spiSelect(spip);
spi_send_cmd(devp, N25Q128_CMD_CLEAR_FLAG_STATUS_REGISTER);
spiUnselect(spip);
/* Program operation failed.*/
err = FLASH_PROGRAM_FAILURE;
goto exit_error;
} }
/* Next page.*/ /* Next page.*/
@ -219,12 +226,8 @@ static flash_error_t program(void *instance, flash_address_t addr,
n -= chunk; n -= chunk;
} }
/* Program operation succeeded.*/
err = FLASH_NO_ERROR;
/* Common exit path for this function.*/
exit_error:
devp->state = FLASH_READY; devp->state = FLASH_READY;
#if N25Q128_SHARED_SPI == TRUE #if N25Q128_SHARED_SPI == TRUE
spiReleaseBus(spip); spiReleaseBus(spip);
#endif #endif
@ -246,7 +249,7 @@ static flash_error_t read(void *instance, flash_address_t addr,
/* Read command.*/ /* Read command.*/
spiSelect(spip); spiSelect(spip);
spi_send_cmd_addr(devp, N25Q128_CMD_READ, addr); flash_send_cmd_addr(devp, N25Q128_CMD_READ, addr);
spiReceive(spip, n, rp); spiReceive(spip, n, rp);
spiUnselect(spip); spiUnselect(spip);