diff options
| author | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-06-25 14:51:18 +0300 |
|---|---|---|
| committer | Evgeniy Naydanov <evgeniy.naydanov@syntacore.com> | 2024-06-25 14:51:18 +0300 |
| commit | 2eedd74197f12fb8c30f259207430713291e8ec0 (patch) | |
| tree | 8a27b3ebbdddb49c32477151bc66e339e84b46fe /src/flash/nor/driver.h | |
| parent | fdd07f127998f8669784fa64b67a43dea97c1837 (diff) | |
| parent | ad87fbd1cf28760795c4e18f3318a2d720e5a8a6 (diff) | |
| download | riscv-openocd-2eedd74197f12fb8c30f259207430713291e8ec0.zip riscv-openocd-2eedd74197f12fb8c30f259207430713291e8ec0.tar.gz riscv-openocd-2eedd74197f12fb8c30f259207430713291e8ec0.tar.bz2 | |
Merge up to ad87fbd1cf28760795c4e18f3318a2d720e5a8a6 from upstream
Conflicts:
* `doc/openocd.texi`: due to d382c95d57c0ad9ed2dcc83c95404babb7647708,
resolved by selecting the upstream version.
* `src/server/gdb_server.c`: between
944fe66f104e356c5fcd2b5c25200cebef9b389c and
92e8823ebdb6d01b41bb5d79af49501d525acd1d. Resolved by adopting the use
of `LOG_TARGET_*`.
* `src/target/target.c`: between
639e68a621b7ae8c4a296ca7e45b47075268fded and
c5358c84ad0d3e7497498e0457cec7785f72910a, selected the version from
`riscv-openocd`.
Change-Id: Ic1327f25e147945e0ec82947a82452501e8ee5de
Diffstat (limited to 'src/flash/nor/driver.h')
| -rw-r--r-- | src/flash/nor/driver.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/flash/nor/driver.h b/src/flash/nor/driver.h index 7d6f8c5..211661e 100644 --- a/src/flash/nor/driver.h +++ b/src/flash/nor/driver.h @@ -29,7 +29,7 @@ struct flash_bank; * flash bank DRIVERNAME ...parameters... * @endcode * - * OpenOCD will search for the driver with a @c flash_driver_s::name + * OpenOCD will search for the driver with a @c flash_driver::name * that matches @c DRIVERNAME. * * The flash subsystem calls some of the other drivers routines a using @@ -170,7 +170,7 @@ struct flash_driver { /** * Check the erasure status of a flash bank. * When called, the driver routine must perform the required - * checks and then set the @c flash_sector_s::is_erased field + * checks and then set the @c flash_sector::is_erased field * for each of the flash banks's sectors. * * @param bank The bank to check @@ -182,7 +182,7 @@ struct flash_driver { * Determine if the specific bank is "protected" or not. * When called, the driver routine must must perform the * required protection check(s) and then set the @c - * flash_sector_s::is_protected field for each of the flash + * flash_sector::is_protected field for each of the flash * bank's sectors. * * If protection is not implemented, set method to NULL @@ -204,7 +204,7 @@ struct flash_driver { int (*info)(struct flash_bank *bank, struct command_invocation *cmd); /** - * A more gentle flavor of flash_driver_s::probe, performing + * A more gentle flavor of flash_driver::probe, performing * setup with less noise. Generally, driver routines should test * to see if the bank has already been probed; if it has, the * driver probably should not perform its probe a second time. |