projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPI table updates (some new devices and new info)
[fw/openocd]
/
src
/
flash
/
nand
/
lpc32xx.c
diff --git
a/src/flash/nand/lpc32xx.c
b/src/flash/nand/lpc32xx.c
index 38c7e33500ed705bd3a2a9a728afab77cbe3d8c2..1ed16dfd0f5cd130213c2cbfa7496e6105c38599 100644
(file)
--- a/
src/flash/nand/lpc32xx.c
+++ b/
src/flash/nand/lpc32xx.c
@@
-21,9
+21,7
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
***************************************************************************/
#ifdef HAVE_CONFIG_H
***************************************************************************/
#ifdef HAVE_CONFIG_H
@@
-52,10
+50,10
@@
extern int nand_correct_data(struct nand_device *nand, u_char *dat,
#define SPARE_OFFS 0x140
#define DATA_OFFS 0x200
#define SPARE_OFFS 0x140
#define DATA_OFFS 0x200
-static int sp_ooblayout[] = {
+static
const
int sp_ooblayout[] = {
10, 11, 12, 13, 14, 15
};
10, 11, 12, 13, 14, 15
};
-static int lp_ooblayout[] = {
+static
const
int lp_ooblayout[] = {
40, 41, 42, 43, 44, 45,
46, 47, 48, 49, 50, 51,
52, 53, 54, 55, 56, 57,
40, 41, 42, 43, 44, 45,
46, 47, 48, 49, 50, 51,
52, 53, 54, 55, 56, 57,
@@
-1148,7
+1146,7
@@
static int lpc32xx_write_page_slc(struct nand_device *nand,
/* Copy to oob, at correct offsets */
static uint8_t ecc[24];
slc_ecc_copy_to_buffer(ecc, hw_ecc, ecc_count);
/* Copy to oob, at correct offsets */
static uint8_t ecc[24];
slc_ecc_copy_to_buffer(ecc, hw_ecc, ecc_count);
- int *layout = nand->page_size == 2048 ? lp_ooblayout : sp_ooblayout;
+
const
int *layout = nand->page_size == 2048 ? lp_ooblayout : sp_ooblayout;
int i;
for (i = 0; i < ecc_count * 3; i++)
foob[layout[i]] = ecc[i];
int i;
for (i = 0; i < ecc_count * 3; i++)
foob[layout[i]] = ecc[i];
@@
-1549,7
+1547,7
@@
static int lpc32xx_read_page_slc(struct nand_device *nand,
slc_ecc_copy_to_buffer(ecc, hw_ecc, ecc_count);
/* Copy ECC from flash using correct layout */
static uint8_t fecc[24];/* max size */
slc_ecc_copy_to_buffer(ecc, hw_ecc, ecc_count);
/* Copy ECC from flash using correct layout */
static uint8_t fecc[24];/* max size */
- int *layout = nand->page_size == 2048 ? lp_ooblayout : sp_ooblayout;
+
const
int *layout = nand->page_size == 2048 ? lp_ooblayout : sp_ooblayout;
int i;
for (i = 0; i < ecc_count * 3; i++)
fecc[i] = foob[layout[i]];
int i;
for (i = 0; i < ecc_count * 3; i++)
fecc[i] = foob[layout[i]];