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

Fixed SNOR drivers. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@15572 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
Giovanni Di Sirio 2022-04-08 09:29:18 +00:00
parent 5f825b3aa6
commit 79cf37a2b9
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os/hal/lib/complex/serial_nor/devices/macronix_mx25/hal_flash_device.c
View File

@ -319,7 +319,7 @@ void snor_device_init(SNORDriver *devp) {
#if SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_SPI #if SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_SPI
/* Reading device ID.*/ /* Reading device ID.*/
bus_cmd_receive(devp->config->busp, MX25_CMD_READ_ID, bus_cmd_receive(devp->config->busp, MX25_CMD_READ_ID,
sizeof devp->device_id, devp->device_id); 3U, &devp->nocache->buf[0]);
#else /* SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI */ #else /* SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI */

19
os/hal/lib/complex/serial_nor/devices/micron_n25q/hal_flash_device.c
View File

@ -309,7 +309,7 @@ void snor_device_init(SNORDriver *devp) {
#if SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_SPI #if SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_SPI
/* Reading device ID.*/ /* Reading device ID.*/
bus_cmd_receive(devp->config->busp, N25Q_CMD_READ_ID, bus_cmd_receive(devp->config->busp, N25Q_CMD_READ_ID,
sizeof devp->device_id, devp->device_id); 3U, &devp->nocache->buf[0]);
#else /* SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI */ #else /* SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI */
/* Attempting a reset of the XIP mode, it could be in an unexpected state /* Attempting a reset of the XIP mode, it could be in an unexpected state
@ -322,17 +322,17 @@ void snor_device_init(SNORDriver *devp) {
/* Reading device ID and unique ID.*/ /* Reading device ID and unique ID.*/
wspiReceive(devp->config->busp, &n25q_cmd_read_id, wspiReceive(devp->config->busp, &n25q_cmd_read_id,
sizeof devp->device_id, devp->device_id); 3U, &devp->nocache->buf[0]);
#endif /* SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI */ #endif /* SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI */
/* Checking if the device is white listed.*/ /* Checking if the device is white listed.*/
osalDbgAssert(n25q_find_id(n25q_manufacturer_ids, osalDbgAssert(n25q_find_id(n25q_manufacturer_ids,
sizeof n25q_manufacturer_ids, sizeof n25q_manufacturer_ids,
devp->device_id[0]), devp->nocache->buf[0]),
"invalid manufacturer id"); "invalid manufacturer id");
osalDbgAssert(n25q_find_id(n25q_memory_type_ids, osalDbgAssert(n25q_find_id(n25q_memory_type_ids,
sizeof n25q_memory_type_ids, sizeof n25q_memory_type_ids,
devp->device_id[1]), devp->nocache->buf[1]),
"invalid memory type id"); "invalid memory type id");
#if (SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI) && (N25Q_SWITCH_WIDTH == TRUE) #if (SNOR_BUS_DRIVER == SNOR_BUS_DRIVER_WSPI) && (N25Q_SWITCH_WIDTH == TRUE)
@ -341,19 +341,20 @@ void snor_device_init(SNORDriver *devp) {
wspiSend(devp->config->busp, &n25q_cmd_write_evconf, 1, n25q_evconf_value); wspiSend(devp->config->busp, &n25q_cmd_write_evconf, 1, n25q_evconf_value);
{ {
uint8_t id[3];
/* Reading ID again for confirmation.*/ /* Reading ID again for confirmation.*/
bus_cmd_receive(devp->config->busp, N25Q_CMD_MULTIPLE_IO_READ_ID, 3, id); bus_cmd_receive(devp->config->busp, N25Q_CMD_MULTIPLE_IO_READ_ID,
3U, &devp->nocache->buf[16]);
/* Checking if the device is white listed.*/ /* Checking if the device is white listed.*/
osalDbgAssert(memcmp(id, devp->device_id, 3) == 0, osalDbgAssert(memcmp(&devp->nocache->buf[0],
&devp->nocache->buf[16],
3U) == 0,
"id confirmation failed"); "id confirmation failed");
} }
#endif #endif
/* Setting up the device size.*/ /* Setting up the device size.*/
snor_descriptor.sectors_count = (1U << (size_t)devp->device_id[2]) / snor_descriptor.sectors_count = (1U << (size_t)devp->nocache->buf[2]) /
SECTOR_SIZE; SECTOR_SIZE;
snor_descriptor.size = (size_t)snor_descriptor.sectors_count * SECTOR_SIZE; snor_descriptor.size = (size_t)snor_descriptor.sectors_count * SECTOR_SIZE;