WebSVN – HelenOS-historic – Path Comparison – / – /kernel/trunk/genarch Rev 659 and /kernel/trunk/genarch Rev 669

Ignore whitespace Rev 659 → Rev 669

/kernel/trunk/genarch/include/ofw/ofw.h
55,6 → 55,7
extern void ofw_done(void);
extern __native ofw_call(const char *service, const int nargs, const int nret, ...);
extern void ofw_putchar(const char ch);
extern char ofw_getchar(void);
extern phandle ofw_find_device(const char *name);
extern int ofw_get_property(const phandle device, const char name, void buf, const int buflen);
extern void ofw_claim(const void addr, const int size, const int align);

 /kernel/trunk/genarch/src/ofw/ofw.c
 ,6 → 35,7
 ofw_entry ofw;
 phandle ofw_chosen;
+ihandle ofw_stdin;
 ihandle ofw_stdout;
 void ofw_init(void)
 ,8 → 44,11
     if (ofw_chosen == -1)
         ofw_done();
+    if (ofw_get_property(ofw_chosen, "stdin",  &ofw_stdin, sizeof(ofw_stdin)) <= 0)
+        ofw_stdin = 0;
     if (ofw_get_property(ofw_chosen, "stdout",  &ofw_stdout, sizeof(ofw_stdout)) <= 0)
-        ofw_stdout = 0;
+        ofw_stdout = 0;
 }
 void ofw_done(void)
 ,6 → 88,25
     (void) ofw_call("write", 3, 1, ofw_stdout, &ch, 1);
 }
+/** Read character from OFW's input.
+ *
+ * This call is non-blocking.
+ *
+ * @return 0 if no character was read, character read otherwise.
+ */
+char ofw_getchar(void)
+{
+    char ch;
+    if (ofw_stdin == 0)
+        return 0;
+    if (ofw_call("read", 3, 1, ofw_stdin, &ch, 1) == 1)
+        return ch;
+    else
+        return 0;
+}
 phandle ofw_find_device(const char *name)
 {
     return (phandle) ofw_call("finddevice", 1, 1, name);