diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-06-07 12:55:23 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-06-07 12:55:23 +0000 |
| commit | afc0508c0b98188ecd6467391cd8043f0ba9ff57 (patch) | |
| tree | f592dc64b8896990985fb2dcb175402e31fc4167 /os/ex/Micron/m25q.c | |
| parent | d151ada9c34470d74729e9d00467a40970e5beae (diff) | |
| download | ChibiOS-afc0508c0b98188ecd6467391cd8043f0ba9ff57.tar.gz ChibiOS-afc0508c0b98188ecd6467391cd8043f0ba9ff57.tar.bz2 ChibiOS-afc0508c0b98188ecd6467391cd8043f0ba9ff57.zip | |
M25Qxx demos working in both SPI and QSPI modes.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9600 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/ex/Micron/m25q.c')
| -rw-r--r-- | os/ex/Micron/m25q.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/os/ex/Micron/m25q.c b/os/ex/Micron/m25q.c index 7a2d9a760..c109a61e4 100644 --- a/os/ex/Micron/m25q.c +++ b/os/ex/Micron/m25q.c @@ -345,6 +345,8 @@ static flash_error_t m25q_read(void *instance, flash_address_t addr, addr, M25Q_READ_DUMMY_CYCLES, n, rp); #else /* Normal read command in SPI mode.*/ + jesd216_cmd_addr_receive(devp->config->busp, M25Q_CMD_READ, + addr, n, rp); #endif /* Ready state again.*/ @@ -512,7 +514,9 @@ static flash_error_t m25q_verify_erase(void *instance, addr, M25Q_READ_DUMMY_CYCLES, sizeof cmpbuf, cmpbuf); #else - /* Normal read command in SPI mode.*/ + /* Normal read command in SPI mode.*/ + jesd216_cmd_addr_receive(devp->config->busp, M25Q_CMD_READ, + addr, sizeof cmpbuf, cmpbuf); #endif /* Checking for erased state of current buffer.*/ @@ -648,11 +652,10 @@ void m25qStart(M25QDriver *devp, const M25QConfig *config) { /* Bus acquisition.*/ jesd216_bus_acquire(devp->config->busp, devp->config->buscfg); - /* Starting bus device.*/ - jesd216_start(devp->config->busp, devp->config->buscfg); - #if JESD216_BUS_MODE == JESD216_BUS_MODE_SPI /* Reading device ID.*/ + jesd216_cmd_receive(devp->config->busp, M25Q_CMD_READ_ID, + sizeof devp->device_id, devp->device_id); #else /* JESD216_BUS_MODE != JESD216_BUS_MODE_SPI */ /* Attempting a reset of the XIP mode, it could be in an unexpected state |