fixed minor inconsistencies between headers and source files and between asm and C sources

This commit is contained in:
Markus Fröschle
2013-12-17 14:16:29 +00:00
parent 41582c0381
commit c55f0e48f8
6 changed files with 24 additions and 45 deletions

View File

@@ -25,12 +25,12 @@
#include <stddef.h>
extern int strncmp(const char *s1, const char *s2, int max);
extern int strncmp(const char *s1, const char *s2, size_t max);
extern char *strcpy(char *dst, const char *src);
char *strncpy(char *dst, const char *src, int max);
char *strncpy(char *dst, const char *src, size_t max);
extern size_t strlen(const char *str);
extern char *strcat(char *dst, const char *src);
extern char *strncat(char *dst, const char *src, int max);
extern char *strncat(char *dst, const char *src, size_t max);
extern int atoi(const char *c);
extern void *memcpy(void *dst, const void *src, size_t n);
extern void *memset(void *s, int c, size_t n);

View File

@@ -28,12 +28,11 @@
#define _WAIT_H_
#include <bas_types.h>
#if MACHINE_FIREBEE
#include "firebee.h"
#elif MACHINE_M5484LITE
#include "m5484l.h"
#else
//#error unknown machine
#endif /* MACHINE_FIREBEE */
#include "MCF5475.h"
@@ -60,7 +59,7 @@ extern __inline__ void wait(uint32_t us)
extern __inline__ bool waitfor(uint32_t us, checker_func condition)
{
int32_t target = MCF_SLT_SCNT(0) - (us * (SYSCLK / 1000));
uint32_t res;
bool res;
do
{