projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-video
[platform/kernel/u-boot.git]
/
include
/
api_public.h
diff --git
a/include/api_public.h
b/include/api_public.h
index
5b0c09e
..
5940d81
100644
(file)
--- a/
include/api_public.h
+++ b/
include/api_public.h
@@
-57,6
+57,7
@@
#define API_ENOMEM 3 /* no memory */
#define API_EBUSY 4 /* busy, occupied etc. */
#define API_EIO 5 /* I/O error */
#define API_ENOMEM 3 /* no memory */
#define API_EBUSY 4 /* busy, occupied etc. */
#define API_EIO 5 /* I/O error */
+#define API_ESYSC 6 /* syscall error */
typedef int (*scp_t)(int, int *, ...);
typedef int (*scp_t)(int, int *, ...);
@@
-110,8
+111,8
@@
struct sys_info {
int mr_no; /* number of memory regions */
};
int mr_no; /* number of memory regions */
};
-#undef C
FG
_64BIT_LBA
-#ifdef C
FG
_64BIT_LBA
+#undef C
ONFIG_SYS
_64BIT_LBA
+#ifdef C
ONFIG_SYS
_64BIT_LBA
typedef u_int64_t lbasize_t;
#else
typedef unsigned long lbasize_t;
typedef u_int64_t lbasize_t;
#else
typedef unsigned long lbasize_t;