Changeset 0cc32f2 in mainline for uspace/app

Timestamp:

2011-08-18T18:47:54Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

1f44b056, d7427a7e

Parents:

1d2a1a9 (diff), f55b12b (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 libposix changes.

Location:

uspace/app

Files:

• lsusb/main.c (modified) (3 diffs)
• tester/Makefile (modified) (1 diff)
• tester/devs/devman1.c (deleted)
• tester/devs/devman1.def (deleted)
• tester/devs/devman2.c (deleted)
• tester/devs/devman2.def (deleted)
• tester/hw/misc/virtchar1.c (modified) (2 diffs)
• tester/tester.c (modified) (1 diff)

uspace/app/lsusb/main.c

@@ -50 +50 @@
 
 #define MAX_USB_ADDRESS USB11_ADDRESS_MAX
-#define MAX_FAILED_ATTEMPTS 10
 #define MAX_PATH_LENGTH 1024
 
-static void print_found_hc(size_t class_index, const char *path)
+static void print_found_hc(service_id_t sid, const char *path)
 {
-        // printf(NAME ": host controller %zu is `%s'.\n", class_index, path);
-        printf("Bus %02zu: %s\n", class_index, path);
+        printf("Bus %" PRIun ": %s\n", sid, path);
 }
 static void print_found_dev(usb_address_t addr, const char *path)
 {
-        // printf(NAME ":     device with address %d is `%s'.\n", addr, path);
         printf("  Device %02d: %s\n", addr, path);
 }
@@ -95 +92 @@
 int main(int argc, char *argv[])
 {
-        size_t class_index = 0;
-        size_t failed_attempts = 0;
+        category_id_t usbhc_cat;
+        service_id_t *svcs;
+        size_t count;
+        size_t i;
+        int rc;
 
-        while (failed_attempts < MAX_FAILED_ATTEMPTS) {
-                class_index++;
+        rc = loc_category_get_id(USB_HC_CATEGORY, &usbhc_cat, 0);
+        if (rc != EOK) {
+                printf(NAME ": Error resolving category '%s'",
+                    USB_HC_CATEGORY);
+                return 1;
+        }
+
+        rc = loc_category_get_svcs(usbhc_cat, &svcs, &count);
+        if (rc != EOK) {
+                printf(NAME ": Error getting list of host controllers.\n");
+                return 1;
+        }
+
+        for (i = 0; i < count; i++) {
                 devman_handle_t hc_handle = 0;
-                int rc = usb_ddf_get_hc_handle_by_class(class_index, &hc_handle);
+                int rc = usb_ddf_get_hc_handle_by_sid(svcs[i], &hc_handle);
                 if (rc != EOK) {
-                        failed_attempts++;
+                        printf(NAME ": Error resolving handle of HC with SID %"
+                            PRIun ", skipping.\n", svcs[i]);
                         continue;
                 }
@@ -109 +122 @@
                 rc = devman_get_device_path(hc_handle, path, MAX_PATH_LENGTH);
                 if (rc != EOK) {
+                        printf(NAME ": Error resolving path of HC with SID %"
+                            PRIun ", skipping.\n", svcs[i]);
                         continue;
                 }
-                print_found_hc(class_index, path);
+                print_found_hc(svcs[i], path);
                 print_hc_devices(hc_handle);
         }
+
+        free(svcs);
 
         return 0;

uspace/app/tester/Makefile

@@ -56 +56 @@
         mm/malloc3.c \
         mm/mapping1.c \
-        devs/devman1.c \
-        devs/devman2.c \
         hw/misc/virtchar1.c \
         hw/serial/serial1.c \

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

@@ -49 +49 @@
 
 #define DEVICE_PATH_NORMAL "/loc/devices/\\virt\\null\\a"
-#define DEVICE_PATH_CLASSES "/loc/class/virt-null\\1"
 #define BUFFER_SIZE 64
 
@@ -105 +104 @@
         }
 
-        res = test_virtchar1_internal(DEVICE_PATH_CLASSES);
-        if (res != NULL) {
-                return res;
-        }
-
         return NULL;
 }

uspace/app/tester/tester.c

@@ -68 +68 @@
 #include "hw/misc/virtchar1.def"
 #include "libext2/libext2_1.def"
-#include "devs/devman1.def"
-#include "devs/devman2.def"
         {NULL, NULL, NULL, false}
 };