Changeset 97c7682 in mainline for uspace/app/msim/arch_helenos/input.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/app/msim/arch_helenos/input.c (moved) (moved from uspace/lib/net/include/net_checksum.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 libnet
+/** @addtogroup msim
  * @{
  */
-/** @file
- * General CRC and checksum computation.
+/** @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>
 
-#ifndef LIBNET_CHECKSUM_H_
-#define LIBNET_CHECKSUM_H_
+static tinput_t *input_prompt;
 
-#include <byteorder.h>
-#include <sys/types.h>
-
-/** IP checksum value for computed zero checksum.
- *
- * Zero is returned as 0xFFFF (not flipped)
+/** Terminal and readline initialization
  *
  */
-#define IP_CHECKSUM_ZERO  0xffffU
+void input_init(void)
+{
+        input_prompt = tinput_new();
+        if (input_prompt == NULL) {
+                die(1, "Failed to intialize input.");
+        }
+        helenos_dprinter_init();
+}
 
-#ifdef __BE__
+void input_inter(void)
+{
+}
 
-#define compute_crc32(seed, data, length) \
-        compute_crc32_be(seed, (uint8_t *) data, length)
+void input_shadow( void)
+{
+}
 
-#endif
+void input_back( void)
+{
+}
 
-#ifdef __LE__
+char *helenos_input_get_next_command(void)
+{
+        tinput_set_prompt(input_prompt, "[msim] ");
 
-#define compute_crc32(seed, data, length) \
-        compute_crc32_le(seed, (uint8_t *) data, length)
+        char *commline = NULL;
+        int rc = tinput_read(input_prompt, &commline);
 
-#endif
+        if (rc == ENOENT) {
+                rc = asprintf(&commline, "quit");
+                mprintf("Quit\n");
+                if (rc != EOK) {
+                        exit(1);
+                }
+        }
 
-extern uint32_t compute_crc32_le(uint32_t, uint8_t *, size_t);
-extern uint32_t compute_crc32_be(uint32_t, uint8_t *, size_t);
-extern uint32_t compute_checksum(uint32_t, uint8_t *, size_t);
-extern uint16_t compact_checksum(uint32_t);
-extern uint16_t flip_checksum(uint16_t);
-extern uint16_t ip_checksum(uint8_t *, size_t);
+        /* On error, it remains NULL. */
+        return commline;
+}
 
-#endif
 
-/** @}
- */
+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;
+}
+