diff options
author | Nick Withers <nick.withers@anu.edu.au> | 2014-01-17 12:57:08 +1100 |
---|---|---|
committer | Gedare Bloom <gedare@rtems.org> | 2014-01-23 11:30:15 -0500 |
commit | f334847bce1fd5da7af94bb46920864ae375007b (patch) | |
tree | 821cb66f7da3d7d96a018d2b245a9341c7cb7566 /c/src/lib/libbsp/powerpc/shared | |
parent | Add warnings to MOTLoad-equipped BSPs' READMEs that a "waitProbe", "netShut" ... (diff) | |
download | rtems-f334847bce1fd5da7af94bb46920864ae375007b.tar.bz2 |
powerpc/flash: give string variables const attribute
Diffstat (limited to 'c/src/lib/libbsp/powerpc/shared')
5 files changed, 22 insertions, 22 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flash.c b/c/src/lib/libbsp/powerpc/shared/flash/flash.c index ebd38cfaed..0037fe73e2 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/flash.c +++ b/c/src/lib/libbsp/powerpc/shared/flash/flash.c @@ -104,7 +104,7 @@ STATIC struct bankdesc * bankValidate(int bank, int quiet); static struct bankdesc * -argcheck(int bank, uint32_t offset, char *src, uint32_t size); +argcheck(int bank, uint32_t offset, const char *src, uint32_t size); /* Type definitions */ @@ -223,14 +223,14 @@ struct devdesc *rval; */ STATIC uint32_t -BSP_flashWriteDataRaw(struct bankdesc *b, uint32_t addr, char *src, uint32_t n_words, int quiet) +BSP_flashWriteDataRaw(struct bankdesc *b, uint32_t addr, const char *src, uint32_t n_words, int quiet) { -uint32_t sta; -uint32_t N; -uint32_t nxt, a, i, bufsz; -uint32_t then, now; -unsigned f; -char *s; +uint32_t sta; +uint32_t N; +uint32_t nxt, a, i, bufsz; +uint32_t then, now; +unsigned f; +const char *s; #ifdef DEBUG printf("\nflashWriteDataRaw(0x%08"PRIx32", %p, 0x%"PRIx32")\n", addr, src, n_words); @@ -477,7 +477,7 @@ struct bankdesc *b = BSP_flashBspOps.bankcheck(bank, quiet); */ static struct bankdesc * -argcheck(int bank, uint32_t offset, char *src, uint32_t size) +argcheck(int bank, uint32_t offset, const char *src, uint32_t size) { struct bankdesc *b; @@ -514,7 +514,7 @@ struct bankdesc *b; * - prints progress/messages. */ STATIC int -regionCheckAndErase(int bank, uint32_t offset, char *src, uint32_t n_bytes, int quiet) +regionCheckAndErase(int bank, uint32_t offset, const char *src, uint32_t n_bytes, int quiet) { struct bankdesc *b; uint32_t i; @@ -594,14 +594,14 @@ uint32_t a,e; */ STATIC int -BSP_flashWriteRegion(int bank, uint32_t offset, char *src, uint32_t n_bytes, int quiet) +BSP_flashWriteRegion(int bank, uint32_t offset, const char *src, uint32_t n_bytes, int quiet) { struct bankdesc *b = BSP_flashBspOps.bankcheck(bank, 0); /* caller did bankValidate() */ uint32_t ab = offset & ~(b->fblksz - 1); uint32_t eb = (offset + n_bytes + b->fblksz - 1) & ~(b->fblksz - 1); uint32_t o,i,a,e; int err; -char *p; +const char *p; union bconv buf; /* unlock */ @@ -730,7 +730,7 @@ int f; } int -BSP_flashWrite(int bank, uint32_t offset, char *src, uint32_t n_bytes, int quiet) +BSP_flashWrite(int bank, uint32_t offset, const char *src, uint32_t n_bytes, int quiet) { int rval; @@ -767,7 +767,7 @@ int got, avail; } int -BSP_flashWriteFile(int bank, uint32_t offset, char *fname, int quiet) +BSP_flashWriteFile(int bank, uint32_t offset, const char *fname, int quiet) { int fd = -1; struct stat sb; diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h b/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h index 7c6d7e1880..19f2c4708e 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h +++ b/c/src/lib/libbsp/powerpc/shared/flash/flashPgm.h @@ -110,7 +110,7 @@ BSP_flashErase(int bank, uint32_t offset, uint32_t size, int quiet); * RETURNS: 0 on success, nonzero on error (message printed to stderr). */ int -BSP_flashWrite(int bank, uint32_t offset, char *src, uint32_t n_bytes, int quiet); +BSP_flashWrite(int bank, uint32_t offset, const char *src, uint32_t n_bytes, int quiet); /* Copy contents of a file to flash. * @@ -122,7 +122,7 @@ BSP_flashWrite(int bank, uint32_t offset, char *src, uint32_t n_bytes, int quiet * args and return value. */ int -BSP_flashWriteFile(int bank, uint32_t offset, char *path, int quiet); +BSP_flashWriteFile(int bank, uint32_t offset, const char *path, int quiet); /* Dump info about available flash to file * (stdout is used if f==NULL). diff --git a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h b/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h index 52825d0c5a..c26b8ed01d 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h +++ b/c/src/lib/libbsp/powerpc/shared/flash/flashPgmPvt.h @@ -244,7 +244,7 @@ struct flash_bank_ops { * N may be assumed to be a multiple of 'stride' * RETURNS: failure status or zero on success. */ - uint32_t (*write_line)(struct bankdesc *b, uint32_t addr, char *src, uint32_t N); + uint32_t (*write_line)(struct bankdesc *b, uint32_t addr, const char *src, uint32_t N); }; /* BSP ops (detect banks, handle write-protection on board); diff --git a/c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c b/c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c index 9c0be50d7f..10eb6657c0 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c +++ b/c/src/lib/libbsp/powerpc/shared/flash/intelFlash.c @@ -141,7 +141,7 @@ STATIC void flash_array_mode_intel(struct bankdesc *, uint32_t); STATIC uint32_t -flash_write_line_intel(struct bankdesc *, uint32_t, char *, uint32_t); +flash_write_line_intel(struct bankdesc *, uint32_t, const char *, uint32_t); /********* Global Variables ********************/ @@ -392,7 +392,7 @@ flash_lock_block_intel(struct bankdesc *b, uint32_t addr) } STATIC uint32_t -flash_write_line_intel(struct bankdesc *b, uint32_t a, char *s, uint32_t N) +flash_write_line_intel(struct bankdesc *b, uint32_t a, const char *s, uint32_t N) { uint32_t sta, Nspla, nxt, j; union { @@ -416,7 +416,7 @@ union { /* fill buffer */ for (nxt = a; N>0; N--) { #if defined(TESTING) || (DEBUG > 4) - printf("Writing DAT *0x%08"PRIx32" = 0x%08"PRIx32"\n", nxt, *(uint32_t*)s); + printf("Writing DAT *0x%08"PRIx32" = 0x%08"PRIx32"\n", nxt, *(const uint32_t*)s); #endif /* deal with misaligned sources */ for ( j=0; j<sizeof(buf.u); j++ ) { diff --git a/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c b/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c index 70af0a87ac..41d9e3cce2 100644 --- a/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c +++ b/c/src/lib/libbsp/powerpc/shared/flash/spansionFlash.c @@ -104,7 +104,7 @@ STATIC void flash_array_mode_s160(struct bankdesc *, uint32_t); STATIC uint32_t -flash_write_line_s160(struct bankdesc *, uint32_t, char *, uint32_t); +flash_write_line_s160(struct bankdesc *, uint32_t, const char *, uint32_t); /********* Global Variables ********************/ @@ -426,7 +426,7 @@ flash_print_stat_s160(struct bankdesc *b, uint32_t sta, int verbose) } STATIC uint32_t -flash_write_line_s160(struct bankdesc *b, uint32_t a, char *s, uint32_t N) +flash_write_line_s160(struct bankdesc *b, uint32_t a, const char *s, uint32_t N) { uint32_t sta, nxt, j, v; union bconv buf; |