Changeset 6843a9c in mainline for uspace/app/msim/arch_helenos/input.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/app/msim/arch_helenos/input.c (moved) (moved from uspace/lib/c/include/ipc/il.h ) (2 diffs)

uspace/app/msim/arch_helenos/input.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Lukas Mejdrech
+ * Copyright (c) 2012 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup libc
+/** @addtogroup msim
  * @{
  */
+/** @file HelenOS specific functions for MSIM simulator.
+ */
+#include "../../io/input.h"
+#include "../../io/output.h"
+#include "../../fault.h"
+#include "helenos.h"
+#include <tinput.h>
+#include <errno.h>
 
-/** @file
- * Internetwork layer modules messages.
- * @see il_remote.h
- * @see ip_interface.h
- */
+static tinput_t *input_prompt;
 
-#ifndef LIBC_IL_MESSAGES_H_
-#define LIBC_IL_MESSAGES_H_
-
-#include <ipc/net.h>
-
-/** Internet layer modules messages. */
-typedef enum {
-        /** Device state changed message.
-         * @see il_device_state_msg()
-         */
-        NET_IL_DEVICE_STATE = NET_IL_FIRST,
-        
-        /** Device MTU changed message.
-         * @see il_mtu_changed_msg()
-         */
-        NET_IL_MTU_CHANGED,
-        
-        /**
-         * Device address changed message
-         * @see il_addr_changed_msg()
-         */
-        NET_IL_ADDR_CHANGED,
-
-        /** Packet received message.
-         * @see il_received_msg()
-         */
-        NET_IL_RECEIVED
-} il_messages;
-
-/** @name Internetwork layer specific message parameters definitions */
-/*@{*/
-
-/** Return the protocol number message parameter.
- *
- * @param[in] call Message call structure.
+/** Terminal and readline initialization
  *
  */
-#define IL_GET_PROTO(call)  ((int) IPC_GET_ARG1(call))
+void input_init(void)
+{
+        input_prompt = tinput_new();
+        if (input_prompt == NULL) {
+                die(1, "Failed to intialize input.");
+        }
+        helenos_dprinter_init();
+}
 
-/** Return the registering service message parameter.
- *
- * @param[in] call Message call structure.
- *
- */
-#define IL_GET_SERVICE(call)  ((services_t) IPC_GET_ARG2(call))
+void input_inter(void)
+{
+}
 
-/*@}*/
+void input_shadow( void)
+{
+}
 
-#endif
+void input_back( void)
+{
+}
 
-/** @}
- */
+char *helenos_input_get_next_command(void)
+{
+        tinput_set_prompt(input_prompt, "[msim] ");
+
+        char *commline = NULL;
+        int rc = tinput_read(input_prompt, &commline);
+
+        if (rc == ENOENT) {
+                rc = asprintf(&commline, "quit");
+                mprintf("Quit\n");
+                if (rc != EOK) {
+                        exit(1);
+                }
+        }
+
+        /* On error, it remains NULL. */
+        return commline;
+}
+
+
+bool stdin_poll(char *key)
+{
+        kbd_event_t ev;
+        suseconds_t timeout = 0;
+        errno = EOK;
+        console_flush(input_prompt->console);
+        bool has_input = console_get_kbd_event_timeout(input_prompt->console, &ev, &timeout);
+        if (!has_input) {
+                return false;
+        }
+
+        if (ev.type != KEY_PRESS)
+                return false;
+
+        *key = ev.c;
+
+        return true;
+}
+