fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CPS: Fix zone data reading

This commit is contained in:
Federico Amedeo Izzo 2021-01-23 10:05:18 +01:00
parent 9fc7863f36
commit fe35d4017a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
platform/drivers/NVM/nvmem_MDUV3x0.c
View File

@ -332,7 +332,7 @@ int nvm_readZoneData(zone_t *zone, uint16_t pos)
mduv3x0Zone_t zoneData; mduv3x0Zone_t zoneData;
mduv3x0ZoneExt_t zoneExtData; mduv3x0ZoneExt_t zoneExtData;
uint32_t zoneAddr = zoneBaseAddr + pos * sizeof(mduv3x0Zone_t); uint32_t zoneAddr = zoneBaseAddr + pos * sizeof(mduv3x0Zone_t);
uint32_t zoneExtAddr = zoneBaseAddr + pos * sizeof(mduv3x0Zone_t); uint32_t zoneExtAddr = zoneExtBaseAddr + pos * sizeof(mduv3x0ZoneExt_t);
W25Qx_readData(zoneAddr, ((uint8_t *) &zoneData), sizeof(mduv3x0Zone_t)); W25Qx_readData(zoneAddr, ((uint8_t *) &zoneData), sizeof(mduv3x0Zone_t));
W25Qx_readData(zoneExtAddr, ((uint8_t *) &zoneExtData), sizeof(mduv3x0ZoneExt_t)); W25Qx_readData(zoneExtAddr, ((uint8_t *) &zoneExtData), sizeof(mduv3x0ZoneExt_t));
W25Qx_sleep(); W25Qx_sleep();
@ -346,9 +346,15 @@ int nvm_readZoneData(zone_t *zone, uint16_t pos)
zone->name[i] = ((char) (zoneData.name[i] & 0x00FF)); zone->name[i] = ((char) (zoneData.name[i] & 0x00FF));
} }
// Copy zone channel indexes // Copy zone channel indexes
memcpy(zone->member, zoneData.member_a, sizeof(uint16_t) * 16); for(uint16_t i = 0; i < 16; i++)
{
zone->member[i] = zoneData.member_a[i];
}
// Copy zone extension channel indexes // Copy zone extension channel indexes
memcpy(zone->member[16], zoneExtData.ext_a, sizeof(uint16_t) * 48); for(uint16_t i = 0; i < 48; i++)
{
zone->member[16 + i] = zoneExtData.ext_a[i];
}
return 0; return 0;
} }