sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sfdp: Moved the read debugging into the implementation

This commit is contained in:
dragonmux 2022-08-06 04:19:14 +01:00 committed by Piotr Esden-Tempski
parent 1556db88de
commit 7107d14bbc
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/target/rp.c
View File

@ -164,14 +164,6 @@ static bool rp_mass_erase(target *t);
static void rp_spi_read_sfdp(target *const t, const uint32_t address, void *const buffer, const size_t length) static void rp_spi_read_sfdp(target *const t, const uint32_t address, void *const buffer, const size_t length)
{ {
rp_spi_read(t, SPI_FLASH_CMD_READ_SFDP, address, buffer, length); rp_spi_read(t, SPI_FLASH_CMD_READ_SFDP, address, buffer, length);
#if ENABLE_DEBUG
DEBUG_INFO("%" PRIu32 " byte SFDP read at 0x%" PRIx32 ":\n", (uint32_t)length, address);
const uint8_t *const data = buffer;
for (size_t i = 0; i < length; i += 8U) {
DEBUG_INFO("\t%02x %02x %02x %02x %02x %02x %02x %02x\n", data[i + 0], data[i + 1], data[i + 2], data[i + 3],
data[i + 4], data[i + 5], data[i + 6], data[i + 7]);
}
#endif
} }
static void rp_add_flash(target *t) static void rp_add_flash(target *t)

19
src/target/sfdp.c
View File

@ -32,6 +32,7 @@
*/ */
#include <string.h> #include <string.h>
#include "general.h"
#include "sfdp_internal.h" #include "sfdp_internal.h"
#ifdef MIN #ifdef MIN
@ -39,6 +40,22 @@
#endif #endif
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
static inline void sfdp_debug_print(const uint32_t address, const void *const buffer, const uint32_t length)
{
#if ENABLE_DEBUG
DEBUG_INFO("%" PRIu32 " byte SFDP read at 0x%" PRIx32 ":\n", length, address);
const uint8_t *const data = buffer;
for (size_t i = 0; i < length; i += 8U) {
DEBUG_INFO("\t%02x %02x %02x %02x %02x %02x %02x %02x\n", data[i + 0], data[i + 1], data[i + 2], data[i + 3],
data[i + 4], data[i + 5], data[i + 6], data[i + 7]);
}
#else
(void)address;
(void)buffer;
(void)length;
#endif
}
static inline size_t sfdp_memory_density_to_capacity_bits(const uint8_t *const density) static inline size_t sfdp_memory_density_to_capacity_bits(const uint8_t *const density)
{ {
if (SFDP_DENSITY_IS_EXPONENTIAL(density)) if (SFDP_DENSITY_IS_EXPONENTIAL(density))
@ -72,12 +89,14 @@ bool sfdp_read_parameters(target *const t, spi_parameters_s *params, const read_
{ {
sfdp_header_s header; sfdp_header_s header;
sfdp_read(t, SFDP_HEADER_ADDRESS, &header, sizeof(header)); sfdp_read(t, SFDP_HEADER_ADDRESS, &header, sizeof(header));
sfdp_debug_print(SFDP_HEADER_ADDRESS, &header, sizeof(header));
if (memcmp(header.magic, SFDP_MAGIC, 4) != 0) if (memcmp(header.magic, SFDP_MAGIC, 4) != 0)
return false; return false;
for (size_t i = 0; i <= header.parameter_headers_count; ++i) { for (size_t i = 0; i <= header.parameter_headers_count; ++i) {
sfdp_parameter_table_header_s table_header; sfdp_parameter_table_header_s table_header;
sfdp_read(t, SFDP_TABLE_HEADER_ADDRESS + (sizeof(table_header) * i), &table_header, sizeof(table_header)); sfdp_read(t, SFDP_TABLE_HEADER_ADDRESS + (sizeof(table_header) * i), &table_header, sizeof(table_header));
sfdp_debug_print(SFDP_TABLE_HEADER_ADDRESS + (sizeof(table_header) * i), &table_header, sizeof(table_header));
const uint16_t jedec_parameter_id = SFDP_JEDEC_PARAMETER_ID(table_header); const uint16_t jedec_parameter_id = SFDP_JEDEC_PARAMETER_ID(table_header);
if (jedec_parameter_id == SFDP_BASIC_SPI_PARAMETER_TABLE) { if (jedec_parameter_id == SFDP_BASIC_SPI_PARAMETER_TABLE) {
const uint32_t table_address = SFDP_TABLE_ADDRESS(table_header); const uint32_t table_address = SFDP_TABLE_ADDRESS(table_header);