Skip to content
Snippets Groups Projects
Commit d2c6fbec authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

onenand: rename 16 bit memory copy into memcpy_16() to avoid conflicts


Onenand needs a version of memcpy() which performs 16 bit accesses
only; make sure the name does not conflict with the standard
function.

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent 12bc4e94
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <asm/errno.h> #include <asm/errno.h>
/* It should access 16-bit instead of 8-bit */ /* It should access 16-bit instead of 8-bit */
static inline void *memcpy(void *dst, const void *src, unsigned int len) static inline void *memcpy_16(void *dst, const void *src, unsigned int len)
{ {
void *ret = dst; void *ret = dst;
short *d = dst; short *d = dst;
...@@ -358,7 +358,7 @@ static int onenand_read_bufferram(struct mtd_info *mtd, int area, ...@@ -358,7 +358,7 @@ static int onenand_read_bufferram(struct mtd_info *mtd, int area,
bufferram = this->base + area; bufferram = this->base + area;
bufferram += onenand_bufferram_offset(mtd, area); bufferram += onenand_bufferram_offset(mtd, area);
memcpy(buffer, bufferram + offset, count); memcpy_16(buffer, bufferram + offset, count);
return 0; return 0;
} }
...@@ -385,7 +385,7 @@ static int onenand_sync_read_bufferram(struct mtd_info *mtd, int area, ...@@ -385,7 +385,7 @@ static int onenand_sync_read_bufferram(struct mtd_info *mtd, int area,
this->mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ); this->mmcontrol(mtd, ONENAND_SYS_CFG1_SYNC_READ);
memcpy(buffer, bufferram + offset, count); memcpy_16(buffer, bufferram + offset, count);
this->mmcontrol(mtd, 0); this->mmcontrol(mtd, 0);
...@@ -412,7 +412,7 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area, ...@@ -412,7 +412,7 @@ static int onenand_write_bufferram(struct mtd_info *mtd, int area,
bufferram = this->base + area; bufferram = this->base + area;
bufferram += onenand_bufferram_offset(mtd, area); bufferram += onenand_bufferram_offset(mtd, area);
memcpy(bufferram + offset, buffer, count); memcpy_16(bufferram + offset, buffer, count);
return 0; return 0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment