Changeset c979591b in mainline for uspace/app

Timestamp:

2011-01-23T22:44:40Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4a5e2f1

Parents:

4f380d06 (diff), b93d637 (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:

Merged myself

Location:

uspace/app

Files:

• ping/ping.c (modified) (1 diff)
• tester/Makefile (modified) (1 diff)
• tester/mm/mapping1.c (added)
• tester/mm/mapping1.def (added)
• tester/tester.c (modified) (1 diff)
• tester/tester.h (modified) (1 diff)
• virtusbkbd/keys.h (modified) (1 diff)

uspace/app/ping/ping.c

@@ -340 +340 @@
             config.dest_str, config.size, config.size);
         
-        int icmp_phone = icmp_connect_module(SERVICE_ICMP, ICMP_CONNECT_TIMEOUT);
+        int icmp_phone = icmp_connect_module(ICMP_CONNECT_TIMEOUT);
         if (icmp_phone < 0) {
                 fprintf(stderr, "%s: Unable to connect to ICMP service (%s)\n", NAME,

uspace/app/tester/Makefile

@@ -53 +53 @@
         loop/loop1.c \
         mm/malloc1.c \
+        mm/mapping1.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c

uspace/app/tester/tester.c

@@ -62 +62 @@
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
+#include "mm/mapping1.def"
 #include "hw/serial/serial1.def"
 #include "adt/usbaddrkeep.def"

uspace/app/tester/tester.h

@@ -79 +79 @@
 extern const char *test_loop1(void);
 extern const char *test_malloc1(void);
+extern const char *test_mapping1(void);
 extern const char *test_serial1(void);
 extern const char *test_usbaddrkeep(void);

uspace/app/virtusbkbd/keys.h

@@ -40 +40 @@
 
 /** Maximum number of keys that can be pressed simultaneously. */
-#define KB_MAX_KEYS_AT_ONCE 4
+#define KB_MAX_KEYS_AT_ONCE 6
 
 /** Key code type. */