Remove unneeded remnants of bcopy().
Since bcopy() is no longer used, delete all remaining references to it. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
This commit is contained in:
parent
5c2728ff0f
commit
25bab53ab2
|
@ -17,13 +17,11 @@
|
||||||
#define __MICROBLAZE_STRING_H__
|
#define __MICROBLAZE_STRING_H__
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
#define __HAVE_ARCH_BCOPY
|
|
||||||
#define __HAVE_ARCH_MEMCPY
|
#define __HAVE_ARCH_MEMCPY
|
||||||
#define __HAVE_ARCH_MEMSET
|
#define __HAVE_ARCH_MEMSET
|
||||||
#define __HAVE_ARCH_MEMMOVE
|
#define __HAVE_ARCH_MEMMOVE
|
||||||
|
|
||||||
extern void *memcpy (void *, const void *, __kernel_size_t);
|
extern void *memcpy (void *, const void *, __kernel_size_t);
|
||||||
extern void bcopy (const char *, char *, int);
|
|
||||||
extern void *memset (void *, int, __kernel_size_t);
|
extern void *memset (void *, int, __kernel_size_t);
|
||||||
extern void *memmove (void *, const void *, __kernel_size_t);
|
extern void *memmove (void *, const void *, __kernel_size_t);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -92,13 +92,6 @@ memset:
|
||||||
bdnz 8b
|
bdnz 8b
|
||||||
blr
|
blr
|
||||||
|
|
||||||
.globl bcopy
|
|
||||||
bcopy:
|
|
||||||
mr r6,r3
|
|
||||||
mr r3,r4
|
|
||||||
mr r4,r6
|
|
||||||
b memcpy
|
|
||||||
|
|
||||||
.globl memmove
|
.globl memmove
|
||||||
memmove:
|
memmove:
|
||||||
cmplw 0,r3,r4
|
cmplw 0,r3,r4
|
||||||
|
|
|
@ -20,10 +20,6 @@ extern __kernel_size_t strspn(const char *,const char *);
|
||||||
*/
|
*/
|
||||||
#include <asm/string.h>
|
#include <asm/string.h>
|
||||||
|
|
||||||
#ifndef __HAVE_ARCH_BCOPY
|
|
||||||
char *bcopy(const char *src, char *dest, int count);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __HAVE_ARCH_STRCPY
|
#ifndef __HAVE_ARCH_STRCPY
|
||||||
extern char * strcpy(char *,const char *);
|
extern char * strcpy(char *,const char *);
|
||||||
#endif
|
#endif
|
||||||
|
|
24
lib/string.c
24
lib/string.c
|
@ -461,30 +461,6 @@ void * memset(void * s,int c,size_t count)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __HAVE_ARCH_BCOPY
|
|
||||||
/**
|
|
||||||
* bcopy - Copy one area of memory to another
|
|
||||||
* @src: Where to copy from
|
|
||||||
* @dest: Where to copy to
|
|
||||||
* @count: The size of the area.
|
|
||||||
*
|
|
||||||
* Note that this is the same as memcpy(), with the arguments reversed.
|
|
||||||
* memcpy() is the standard, bcopy() is a legacy BSD function.
|
|
||||||
*
|
|
||||||
* You should not use this function to access IO space, use memcpy_toio()
|
|
||||||
* or memcpy_fromio() instead.
|
|
||||||
*/
|
|
||||||
char * bcopy(const char * src, char * dest, int count)
|
|
||||||
{
|
|
||||||
char *tmp = dest;
|
|
||||||
|
|
||||||
while (count--)
|
|
||||||
*tmp++ = *src++;
|
|
||||||
|
|
||||||
return dest;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef __HAVE_ARCH_MEMCPY
|
#ifndef __HAVE_ARCH_MEMCPY
|
||||||
/**
|
/**
|
||||||
* memcpy - Copy one area of memory to another
|
* memcpy - Copy one area of memory to another
|
||||||
|
|
Loading…
Reference in New Issue