video: Factor out vidconsole_put_string()

[oweals/u-boot.git] / include / os.h

diff --git a/include/os.h b/include/os.h
index e850f879ec3bfb714597ed81b53cbf259bec9caa..7a4f78b9b1fa7919e4a37940831ee976be323e89 100644 (file)
--- a/include/os.h
+++ b/include/os.h
@@ -26,16 +26,6 @@ struct sandbox_state;
  */
 ssize_t os_read(int fd, void *buf, size_t count);
 
-/**
- * Access to the OS read() system call with non-blocking access
- *
- * \param fd   File descriptor as returned by os_open()
- * \param buf  Buffer to place data
- * \param count        Number of bytes to read
- * \return number of bytes read, or -1 on error
- */
-ssize_t os_read_no_block(int fd, void *buf, size_t count);
-
 /**
  * Access to the OS write() system call
  *
@@ -75,6 +65,7 @@ int os_open(const char *pathname, int flags);
 #define OS_O_RDWR      2
 #define OS_O_MASK      3       /* Mask for read/write flags */
 #define OS_O_CREAT     0100
+#define OS_O_TRUNC     01000
 
 /**
  * Access to the OS close() system call
@@ -331,28 +322,57 @@ int os_spl_to_uboot(const char *fname);
 void os_localtime(struct rtc_time *rt);
 
 /**
- * os_setjmp() - Call setjmp()
+ * os_abort() - Raise SIGABRT to exit sandbox (e.g. to debugger)
+ */
+void os_abort(void);
+
+/**
+ * os_mprotect_allow() - Remove write-protection on a region of memory
  *
- * Call the host system's setjmp() function.
+ * The start and length will be page-aligned before use.
  *
- * @jmp: Buffer to store current execution state
- * @size: Size of buffer
- * @return normal setjmp() value if OK, -ENOSPC if @size is too small
+ * @start:     Region start
+ * @len:       Region length in bytes
+ * @return 0 if OK, -1 on error from mprotect()
  */
-int os_setjmp(ulong *jmp, int size);
+int os_mprotect_allow(void *start, size_t len);
 
 /**
- * os_longjmp() - Call longjmp()
+ * os_write_file() - Write a file to the host filesystem
  *
- * Call the host system's longjmp() function.
+ * This can be useful when debugging for writing data out of sandbox for
+ * inspection by external tools.
  *
- * @jmp: Buffer where previous execution state was stored
- * @ret: Value to pass to longjmp()
+ * @name:      File path to write to
+ * @buf:       Data to write
+ * @size:      Size of data to write
+ * @return 0 if OK, -ve on error
  */
-void os_longjmp(ulong *jmp, int ret);
+int os_write_file(const char *name, const void *buf, int size);
 
 /**
- * os_abort() - Raise SIGABRT to exit sandbox (e.g. to debugger)
+ * os_read_file() - Read a file from the host filesystem
+ *
+ * This can be useful when reading test data into sandbox for use by test
+ * routines. The data is allocated using os_malloc() and should be freed by
+ * the caller.
+ *
+ * @name:      File path to read from
+ * @bufp:      Returns buffer containing data read
+ * @sizep:     Returns size of data
+ * @return 0 if OK, -ve on error
  */
-void os_abort(void);
+int os_read_file(const char *name, void **bufp, int *sizep);
+
+/*
+ * os_find_text_base() - Find the text section in this running process
+ *
+ * This tries to find the address of the text section in this running process.
+ * It can be useful to map the address of functions to the address listed in
+ * the u-boot.map file.
+ *
+ * @return address if found, else NULL
+ */
+void *os_find_text_base(void);
+
 #endif