openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

jedec.c: Make getaddrmask() ret const correct

Browse Source 
Change-Id: If9701a6d56159d0dfc047aa91b2a80c80fb33e5f
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/72499
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan 2023-01-29 11:47:17 +11:00 committed by Edward O'Callaghan
parent 515cd09c26
commit d01e694a22
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jedec.c
View File

@ -121,7 +121,7 @@ static void start_program_jedec_common(const struct flashctx *flash, unsigned in
int probe_jedec_29gl(struct flashctx *flash) int probe_jedec_29gl(struct flashctx *flash)
{ {
unsigned int mask = getaddrmask(flash->chip); const unsigned int mask = getaddrmask(flash->chip);
chipaddr bios = flash->virtual_memory; chipaddr bios = flash->virtual_memory;
const struct flashchip *chip = flash->chip; const struct flashchip *chip = flash->chip;
@ -412,9 +412,7 @@ int write_jedec_1(struct flashctx *flash, const uint8_t *src, unsigned int start
int failed = 0; int failed = 0;
chipaddr dst = flash->virtual_memory + start; chipaddr dst = flash->virtual_memory + start;
chipaddr olddst; chipaddr olddst;
unsigned int mask; const unsigned int mask = getaddrmask(flash->chip);
mask = getaddrmask(flash->chip);
olddst = dst; olddst = dst;
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
@ -438,9 +436,7 @@ static int write_page_write_jedec_common(struct flashctx *flash, const uint8_t *
chipaddr bios = flash->virtual_memory; chipaddr bios = flash->virtual_memory;
chipaddr dst = bios + start; chipaddr dst = bios + start;
chipaddr d = dst; chipaddr d = dst;
unsigned int mask; const unsigned int mask = getaddrmask(flash->chip);
mask = getaddrmask(flash->chip);
retry: retry:
/* Issue JEDEC Start Program command */ /* Issue JEDEC Start Program command */
@ -518,9 +514,7 @@ int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start,
int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr, int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr,
unsigned int blocksize) unsigned int blocksize)
{ {
unsigned int mask; const unsigned int mask = getaddrmask(flash->chip);
mask = getaddrmask(flash->chip);
if ((addr != 0) || (blocksize != flash->chip->total_size * 1024)) { if ((addr != 0) || (blocksize != flash->chip->total_size * 1024)) {
msg_cerr("%s called with incorrect arguments\n", msg_cerr("%s called with incorrect arguments\n",
__func__); __func__);
@ -531,27 +525,21 @@ int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr,
int probe_jedec(struct flashctx *flash) int probe_jedec(struct flashctx *flash)
{ {
unsigned int mask; const unsigned int mask = getaddrmask(flash->chip);
mask = getaddrmask(flash->chip);
return probe_jedec_common(flash, mask); return probe_jedec_common(flash, mask);
} }
int erase_sector_jedec(struct flashctx *flash, unsigned int page, int erase_sector_jedec(struct flashctx *flash, unsigned int page,
unsigned int size) unsigned int size)
{ {
unsigned int mask; const unsigned int mask = getaddrmask(flash->chip);
mask = getaddrmask(flash->chip);
return erase_sector_jedec_common(flash, page, size, mask); return erase_sector_jedec_common(flash, page, size, mask);
} }
int erase_block_jedec(struct flashctx *flash, unsigned int page, int erase_block_jedec(struct flashctx *flash, unsigned int page,
unsigned int size) unsigned int size)
{ {
unsigned int mask; const unsigned int mask = getaddrmask(flash->chip);
mask = getaddrmask(flash->chip);
return erase_block_jedec_common(flash, page, size, mask); return erase_block_jedec_common(flash, page, size, mask);
} }