diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-25 06:33:44 +0000 |
| commit | 6bd6dbbd3ae53a268a510270bebaab24fff382ca (patch) | |
| tree | 41d0361e6b48ce74584c9a6fcb475d5054ca4141 /include/video | |
| parent | ee355114ec6062d00c1376b184b886a39e74fd4e (diff) | |
Merge with Linux 2.4.0-test6-pre10.
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/fbcon.h | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/include/video/fbcon.h b/include/video/fbcon.h index e5f26faa4..332cabf7e 100644 --- a/include/video/fbcon.h +++ b/include/video/fbcon.h @@ -681,32 +681,37 @@ static __inline__ void *fb_memmove(void *d, const void *s, size_t count) while (count--) fb_writeb(fb_readb(src++), dst++); } else { - dst = (unsigned long) d + count - 1; - src = (unsigned long) s + count - 1; + dst = (unsigned long) d + count; + src = (unsigned long) s + count; if ((count < 8) || ((dst ^ src) & 3)) goto restdown; if (dst & 1) { - fb_writeb(fb_readb(src--), dst--); + src--; + dst--; count--; + fb_writeb(fb_readb(src), dst); } if (dst & 2) { - fb_writew(fb_readw(src), dst); src -= 2; dst -= 2; count -= 2; + fb_writew(fb_readw(src), dst); } while (count > 3) { - fb_writel(fb_readl(src), dst); src -= 4; dst -= 4; count -= 4; + fb_writel(fb_readl(src), dst); } restdown: - while (count--) - fb_writeb(fb_readb(src--), dst--); + while (count--) { + src--; + dst--; + fb_writeb(fb_readb(src), dst); + } } return d; @@ -744,32 +749,37 @@ static __inline__ void fast_memmove(char *d, const char *s, size_t count) while (count--) fb_writeb(fb_readb(src++), dst++); } else { - dst = (unsigned long) d + count - 1; - src = (unsigned long) s + count - 1; + dst = (unsigned long) d + count; + src = (unsigned long) s + count; if ((count < 8) || ((dst ^ src) & 3)) goto restdown; if (dst & 1) { - fb_writeb(fb_readb(src--), dst--); + src--; + dst--; count--; + fb_writeb(fb_readb(src), dst); } if (dst & 2) { - fb_writew(fb_readw(src), dst); src -= 2; dst -= 2; count -= 2; + fb_writew(fb_readw(src), dst); } while (count > 3) { - fb_writel(fb_readl(src), dst); src -= 4; dst -= 4; count -= 4; + fb_writel(fb_readl(src), dst); } restdown: - while (count--) - fb_writeb(fb_readb(src--), dst--); + while (count--) { + src--; + dst--; + fb_writeb(fb_readb(src), dst); + } } } |