Changeset f483a15 in mainline for uspace/app

Timestamp:

2011-02-22T20:05:46Z (15 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

a54af66

Parents:

b65cae22 (diff), 664af708 (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 changes from mainline

Location:

uspace/app

Files:

• taskdump/taskdump.c (modified) (1 diff)
• tester/hw/misc/virtchar1.c (modified) (1 diff)
• tester/hw/serial/serial1.c (modified) (1 diff)

uspace/app/taskdump/taskdump.c

@@ -406 +406 @@
         }
 
+        rc = asprintf(&file_name, "/drv/%s/%s", app_name, app_name);
+        if (rc < 0) {
+                printf("Memory allocation failure.\n");
+                exit(1);
+        }
+
+        rc = symtab_load(file_name, &app_symtab);
+        if (rc == EOK) {
+                printf("Loaded symbol table from %s\n", file_name);
+                free(file_name);
+                return;
+        }
+
         free(file_name);
         printf("Failed autoloading symbol table.\n");

uspace/app/tester/hw/misc/virtchar1.c

@@ -47 +47 @@
 #include "../../tester.h"
 
-#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null"
+#define DEVICE_PATH_NORMAL "/dev/devices/\\virt\\null\\a"
 #define DEVICE_PATH_CLASSES "/dev/class/virt-null\\1"
 #define BUFFER_SIZE 64

uspace/app/tester/hw/serial/serial1.c

@@ -74 +74 @@
         
         devman_handle_t handle;
-        res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,
+        res = devman_device_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
             IPC_FLAG_BLOCKING);
         if (res != EOK)