Index: uspace/app/bdsh/cmds/modules/cat/cat.c =================================================================== --- uspace/app/bdsh/cmds/modules/cat/cat.c (revision 249154b73bfe1ef522fcff57810432e77e015dc8) +++ uspace/app/bdsh/cmds/modules/cat/cat.c (revision fe61181fa59a4e6299307c453129da8aa2539451) @@ -176,12 +176,12 @@ bool reading_stdin = dash_represents_stdin && (str_cmp(fname, "-") == 0); - + if (reading_stdin) { fd = fileno(stdin); /* Allow storing the whole UTF-8 character. */ blen = STR_BOUNDS(1); - } else { + } else fd = open(fname, O_RDONLY); - } + if (fd < 0) { printf("Unable to open %s\n", fname); @@ -222,6 +222,6 @@ bytes_to_read = 1; } else { - if ((length != CAT_FULL_FILE) - && (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) { + if ((length != CAT_FULL_FILE) && + (length - (off64_t)count <= (off64_t)(blen - copied_bytes))) { bytes_to_read = (size_t) (length - count); } else { @@ -229,4 +229,5 @@ } } + bytes = read(fd, buff + copied_bytes, bytes_to_read); bytes += copied_bytes; @@ -261,8 +262,7 @@ reads++; } - - if (reading_stdin) { + + if (reading_stdin) fflush(stdout); - } } while (bytes > 0 && !should_quit && (count < length || length == CAT_FULL_FILE)); Index: uspace/app/lsusb/Makefile =================================================================== --- uspace/app/lsusb/Makefile (revision 249154b73bfe1ef522fcff57810432e77e015dc8) +++ (revision ) @@ -1,44 +1,0 @@ -# -# Copyright (c) 2011 Vojtech Horky -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../.. -BINARY = lsusb - -LIBS = \ - $(LIBUSBDEV_PREFIX)/libusbdev.a \ - $(LIBUSB_PREFIX)/libusb.a \ - $(LIBDRV_PREFIX)/libdrv.a -EXTRA_CFLAGS = \ - -I$(LIBUSB_PREFIX)/include \ - -I$(LIBUSBDEV_PREFIX)/include \ - -I$(LIBDRV_PREFIX)/include - -SOURCES = \ - main.c - -include $(USPACE_PREFIX)/Makefile.common Index: uspace/app/lsusb/main.c =================================================================== --- uspace/app/lsusb/main.c (revision 249154b73bfe1ef522fcff57810432e77e015dc8) +++ (revision ) @@ -1,139 +1,0 @@ -/* - * Copyright (c) 2010-2011 Vojtech Horky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup lsusb - * @{ - */ -/** - * @file - * Listing of USB host controllers. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define NAME "lsusb" - -#define MAX_USB_ADDRESS USB11_ADDRESS_MAX -#define MAX_PATH_LENGTH 1024 - -static void print_found_hc(service_id_t sid, const char *path) -{ - printf("Bus %" PRIun ": %s\n", sid, path); -} -static void print_found_dev(usb_address_t addr, const char *path) -{ - printf(" Device %02d: %s\n", addr, path); -} - -static void print_hc_devices(devman_handle_t hc_handle) -{ - int rc; - usb_hc_connection_t conn; - - usb_hc_connection_initialize(&conn, hc_handle); - rc = usb_hc_connection_open(&conn); - if (rc != EOK) { - printf(NAME ": failed to connect to HC: %s.\n", - str_error(rc)); - return; - } - usb_address_t addr; - for (addr = 1; addr < MAX_USB_ADDRESS; addr++) { - devman_handle_t dev_handle; - rc = usb_hc_get_handle_by_address(&conn, addr, &dev_handle); - if (rc != EOK) { - continue; - } - char path[MAX_PATH_LENGTH]; - rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH); - if (rc != EOK) { - continue; - } - print_found_dev(addr, path); - } - usb_hc_connection_close(&conn); -} - -int main(int argc, char *argv[]) -{ - category_id_t usbhc_cat; - service_id_t *svcs; - size_t count; - size_t i; - int rc; - - 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_sid(svcs[i], &hc_handle); - if (rc != EOK) { - printf(NAME ": Error resolving handle of HC with SID %" - PRIun ", skipping.\n", svcs[i]); - continue; - } - char path[MAX_PATH_LENGTH]; - rc = devman_fun_get_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(svcs[i], path); - print_hc_devices(hc_handle); - } - - free(svcs); - - return 0; -} - - -/** @} - */ Index: uspace/app/usbinfo/Makefile =================================================================== --- uspace/app/usbinfo/Makefile (revision 249154b73bfe1ef522fcff57810432e77e015dc8) +++ uspace/app/usbinfo/Makefile (revision fe61181fa59a4e6299307c453129da8aa2539451) @@ -47,4 +47,5 @@ hid.c \ info.c \ + list.c \ main.c Index: uspace/app/usbinfo/list.c =================================================================== --- uspace/app/usbinfo/list.c (revision fe61181fa59a4e6299307c453129da8aa2539451) +++ uspace/app/usbinfo/list.c (revision fe61181fa59a4e6299307c453129da8aa2539451) @@ -0,0 +1,137 @@ +/* + * Copyright (c) 2010-2011 Vojtech Horky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup lsusb + * @{ + */ +/** + * @file + * Listing of USB host controllers. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "usbinfo.h" + +#define MAX_USB_ADDRESS USB11_ADDRESS_MAX +#define MAX_PATH_LENGTH 1024 + +static void print_found_hc(service_id_t sid, const char *path) +{ + printf("Bus %" PRIun ": %s\n", sid, path); +} +static void print_found_dev(usb_address_t addr, const char *path) +{ + printf(" Device %02d: %s\n", addr, path); +} + +static void print_hc_devices(devman_handle_t hc_handle) +{ + int rc; + usb_hc_connection_t conn; + + usb_hc_connection_initialize(&conn, hc_handle); + rc = usb_hc_connection_open(&conn); + if (rc != EOK) { + printf(NAME ": failed to connect to HC: %s.\n", + str_error(rc)); + return; + } + usb_address_t addr; + for (addr = 1; addr < MAX_USB_ADDRESS; addr++) { + devman_handle_t dev_handle; + rc = usb_hc_get_handle_by_address(&conn, addr, &dev_handle); + if (rc != EOK) { + continue; + } + char path[MAX_PATH_LENGTH]; + rc = devman_fun_get_path(dev_handle, path, MAX_PATH_LENGTH); + if (rc != EOK) { + continue; + } + print_found_dev(addr, path); + } + usb_hc_connection_close(&conn); +} + +void list(void) +{ + category_id_t usbhc_cat; + service_id_t *svcs; + size_t count; + size_t i; + int rc; + + rc = loc_category_get_id(USB_HC_CATEGORY, &usbhc_cat, 0); + if (rc != EOK) { + printf(NAME ": Error resolving category '%s'", + USB_HC_CATEGORY); + return; + } + + rc = loc_category_get_svcs(usbhc_cat, &svcs, &count); + if (rc != EOK) { + printf(NAME ": Error getting list of host controllers.\n"); + return; + } + + for (i = 0; i < count; i++) { + devman_handle_t hc_handle = 0; + int rc = usb_ddf_get_hc_handle_by_sid(svcs[i], &hc_handle); + if (rc != EOK) { + printf(NAME ": Error resolving handle of HC with SID %" + PRIun ", skipping.\n", svcs[i]); + continue; + } + char path[MAX_PATH_LENGTH]; + rc = devman_fun_get_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(svcs[i], path); + print_hc_devices(hc_handle); + } + + free(svcs); +} + + +/** @} + */ Index: uspace/app/usbinfo/main.c =================================================================== --- uspace/app/usbinfo/main.c (revision 249154b73bfe1ef522fcff57810432e77e015dc8) +++ uspace/app/usbinfo/main.c (revision fe61181fa59a4e6299307c453129da8aa2539451) @@ -62,4 +62,5 @@ _OPTION("-h --help", "Print this help and exit."); + _OPTION("-l --list", "Print a list of host controllers and devices."); _OPTION("-i --identification", "Brief device identification."); _OPTION("-m --match-ids", "Print match ids generated for the device."); @@ -82,4 +83,5 @@ {"help", no_argument, NULL, 'h'}, {"identification", no_argument, NULL, 'i'}, + {"list", no_argument, NULL, 'l'}, {"match-ids", no_argument, NULL, 'm'}, {"descriptor-tree", no_argument, NULL, 't'}, @@ -91,5 +93,5 @@ {0, 0, NULL, 0} }; -static const char *short_options = "himtTsSrR"; +static const char *short_options = "hilmtTsSrR"; static usbinfo_action_t actions[] = { @@ -146,4 +148,5 @@ } + bool something_active = false; /* * Process command-line options. They determine what shall be @@ -156,4 +159,7 @@ switch (opt) { case -1: + break; + case 'l': + list(); break; case '?': @@ -168,4 +174,5 @@ if (actions[idx].opt == opt) { actions[idx].active = true; + something_active = true; break; } @@ -178,13 +185,4 @@ /* Set the default action. */ - int idx = 0; - bool something_active = false; - while (actions[idx].opt != 0) { - if (actions[idx].active) { - something_active = true; - break; - } - idx++; - } if (!something_active) { actions[0].active = true; Index: uspace/app/usbinfo/usbinfo.h =================================================================== --- uspace/app/usbinfo/usbinfo.h (revision 249154b73bfe1ef522fcff57810432e77e015dc8) +++ uspace/app/usbinfo/usbinfo.h (revision fe61181fa59a4e6299307c453129da8aa2539451) @@ -79,4 +79,5 @@ dump_descriptor_in_tree_t, size_t, void *); +void list(void); void dump_short_device_identification(usbinfo_device_t *);