diff options
author | Wolfgang Denk <wd@denx.de> | 2012-03-17 20:46:33 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-03-17 20:46:33 (GMT) |
commit | 6ae38b8c583c61f00c2fe9904cafa81932c7faaf (patch) | |
tree | 5a600d4098039983b97b5ba6ff9edf559cb805d5 /include | |
parent | df25d49959da75cfaa1e4708669ef550d0000ce6 (diff) | |
parent | 9d72e67b79a454dcd6847bcd80c9929e0ec9054d (diff) | |
download | u-boot-6ae38b8c583c61f00c2fe9904cafa81932c7faaf.tar.xz |
Merge branch 'sandbox' of git://git.denx.de/u-boot-blackfin
* 'sandbox' of git://git.denx.de/u-boot-blackfin:
sandbox: mark os_exit as noreturn
sandbox: add getopt support
sandbox: allow processing before main loop
sandbox: add concept of sandbox state
sandbox: disable fortification
sandbox: u-boot.lds: tweak style
sandbox: add get_{tbclk,ticks}
sandbox: enable GPIO driver
sandbox: gpio: add basic driver for simulating GPIOs
sandbox: add flags for open() call
sandbox: config: enable fdt and snprintf() options
sandbox: fdt: add support for CONFIG_OF_CONTROL
sandbox: add lseek helper
sandbox: add ifdef protection to os.h
sandbox: add required header to os.c
sandbox: sort header files in os.c
Diffstat (limited to 'include')
-rw-r--r-- | include/configs/sandbox.h | 10 | ||||
-rw-r--r-- | include/os.h | 51 |
2 files changed, 55 insertions, 6 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 10565e6..a58a34e 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -28,6 +28,16 @@ /* Number of bits in a C 'long' on this architecture */ #define CONFIG_SANDBOX_BITS_PER_LONG 64 +#define CONFIG_OF_CONTROL +#define CONFIG_OF_LIBFDT +#define CONFIG_LMB + +#define CONFIG_SYS_VSNPRINTF + +#define CONFIG_CMD_GPIO +#define CONFIG_SANDBOX_GPIO +#define CONFIG_SANDBOX_GPIO_COUNT 20 + /* * Size of malloc() pool, although we don't actually use this yet. */ diff --git a/include/os.h b/include/os.h index f3af4f0..699682a 100644 --- a/include/os.h +++ b/include/os.h @@ -1,4 +1,9 @@ /* + * Operating System Interface + * + * This provides access to useful OS routines for the sandbox architecture. + * They are kept in a separate file so we can include system headers. + * * Copyright (c) 2011 The Chromium OS Authors. * See file CREDITS for list of people who contributed to this * project. @@ -19,11 +24,10 @@ * MA 02111-1307 USA */ -/* - * Operating System Interface - * - * This provides access to useful OS routines from the sandbox architecture - */ +#ifndef __OS_H__ +#define __OS_H__ + +struct sandbox_state; /** * Access to the OS read() system call @@ -46,6 +50,21 @@ ssize_t os_read(int fd, void *buf, size_t count); ssize_t os_write(int fd, const void *buf, size_t count); /** + * Access to the OS lseek() system call + * + * \param fd File descriptor as returned by os_open() + * \param offset File offset (based on whence) + * \param whence Position offset is relative to (see below) + * \return new file offset + */ +off_t os_lseek(int fd, off_t offset, int whence); + +/* Defines for "whence" in os_lseek() */ +#define OS_SEEK_SET 0 +#define OS_SEEK_CUR 1 +#define OS_SEEK_END 2 + +/** * Access to the OS open() system call * * \param pathname Pathname of file to open @@ -54,6 +73,12 @@ ssize_t os_write(int fd, const void *buf, size_t count); */ int os_open(const char *pathname, int flags); +#define OS_O_RDONLY 0 +#define OS_O_WRONLY 1 +#define OS_O_RDWR 2 +#define OS_O_MASK 3 /* Mask for read/write flags */ +#define OS_O_CREAT 0100 + /** * Access to the OS close() system call * @@ -70,7 +95,7 @@ int os_close(int fd); * * @param exit_code exit code for U-Boot */ -void os_exit(int exit_code); +void os_exit(int exit_code) __attribute__((noreturn)); /** * Put tty into raw mode to mimic serial console better @@ -98,3 +123,17 @@ void os_usleep(unsigned long usec); * \return A monotonic increasing time scaled in nano seconds */ u64 os_get_nsec(void); + +/** + * Parse arguments and update sandbox state. + * + * @param state Sandbox state to update + * @param argc Argument count + * @param argv Argument vector + * @return 0 if ok, and program should continue; + * 1 if ok, but program should stop; + * -1 on error: program should terminate. + */ +int os_parse_args(struct sandbox_state *state, int argc, char *argv[]); + +#endif |