Changeset 46c20c8 in mainline for uspace/app/sbi/src/input.h

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/sbi/src/input.h (moved) (moved from boot/arch/mips32/loader/types.h ) (2 diffs)

uspace/app/sbi/src/input.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2010 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-#ifndef BOOT_mips32_TYPES_H_
-#define BOOT_mips32_TYPES_H_
+#ifndef INPUT_H_
+#define INPUT_H_
 
-#include <gentypes.h>
+#include "mytypes.h"
 
-typedef signed char int8_t;
+int input_new_file(input_t **input, const char *fname);
+int input_new_interactive(input_t **input);
+int input_new_string(input_t **input, const char *str);
 
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
-typedef uint32_t uintptr_t;
-typedef uint32_t unative_t;
+int input_get_line(input_t *input, char **line);
+int input_get_line_no(input_t *input);
 
 #endif