Changeset 5a6cc679 in mainline for uspace/app/usbinfo

Timestamp:

2018-01-31T02:21:24Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

Location:

uspace/app/usbinfo

Files:

• hid.c (modified) (1 diff)
• info.c (modified) (2 diffs)
• list.c (modified) (3 diffs)
• main.c (modified) (1 diff)
• usbinfo.h (modified) (1 diff)

uspace/app/usbinfo/hid.c

@@ -136 +136 @@
 
         size_t actual_report_size;
-        int rc = usb_request_get_descriptor(ctrl_pipe,
+        errno_t rc = usb_request_get_descriptor(ctrl_pipe,
             USB_REQUEST_TYPE_STANDARD, USB_REQUEST_RECIPIENT_INTERFACE,
             USB_DESCTYPE_HID_REPORT, 0, iface_no,

uspace/app/usbinfo/info.c

@@ -322 +322 @@
         l18_win_locales_t *langs;
         size_t langs_count;
-        int rc = usb_request_get_supported_languages(
+        errno_t rc = usb_request_get_supported_languages(
             usb_device_get_default_pipe(usb_dev), &langs, &langs_count);
         if (rc != EOK) {
@@ -371 +371 @@
 void dump_status(usb_device_t *usb_dev)
 {
-        int rc;
+        errno_t rc;
         uint16_t status = 0;
 

uspace/app/usbinfo/list.c

@@ -53 +53 @@
 {
         char path[MAX_PATH_LENGTH];
-        int rc = devman_fun_get_path(handle, path, MAX_PATH_LENGTH);
+        errno_t rc = devman_fun_get_path(handle, path, MAX_PATH_LENGTH);
         if (rc != EOK) {
                 printf(NAME "Failed to get path for device %"PRIun"\n", handle);
@@ -64 +64 @@
 {
         devman_handle_t hc_handle = 0;
-        int rc = devman_fun_sid_to_handle(svc, &hc_handle);
+        errno_t rc = devman_fun_sid_to_handle(svc, &hc_handle);
         if (rc != EOK) {
                 printf(NAME ": Error resolving handle of HC with SID %"
@@ -133 +133 @@
         service_id_t *svcs;
         size_t count;
-        int rc;
+        errno_t rc;
 
         rc = loc_category_get_id(USB_HC_CATEGORY, &usbhc_cat, 0);

uspace/app/usbinfo/main.c

@@ -198 +198 @@
                 /* The initialization is here only to make compiler happy. */
                 devman_handle_t handle = 0;
-                int rc = usb_resolve_device_handle(devpath, &handle);
+                errno_t rc = usb_resolve_device_handle(devpath, &handle);
                 if (rc != EOK) {
                         fprintf(stderr, NAME ": device `%s' not found "

uspace/app/usbinfo/usbinfo.h

@@ -56 +56 @@
 extern void dump_descriptor_tree(uint8_t *, size_t);
 
-static inline void internal_error(int err)
+static inline void internal_error(errno_t err)
 {
         fprintf(stderr, NAME ": internal error (%s).\n", str_error(err));