Changeset d08aa42d in mainline

Timestamp:

2018-01-25T18:09:43Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7d5287db

Parents:

fa4b12d5

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-25 18:09:25)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-25 18:09:43)

Message:

libusb: privatize another misleading function

Location:

uspace/lib/usbdev

Files:

• include/usb/dev/request.h (modified) (1 diff)
• src/devpoll.c (modified) (1 diff)
• src/pipes.c (modified) (2 diffs)
• src/request.c (modified) (1 diff)

uspace/lib/usbdev/include/usb/dev/request.h

@@ -85 +85 @@
     char **);
 
-int usb_request_clear_endpoint_halt(usb_pipe_t *, uint16_t);
 int usb_pipe_clear_halt(usb_pipe_t *, usb_pipe_t *);
 int usb_request_get_endpoint_status(usb_pipe_t *, usb_pipe_t *, uint16_t *);

uspace/lib/usbdev/src/devpoll.c

@@ -154 +154 @@
                          * attempt anyway.
                          */
-                        usb_request_clear_endpoint_halt(
-                            usb_device_get_default_pipe(polling->device),
-                            pipe->desc.endpoint_no);
+                        usb_pipe_clear_halt(
+                            usb_device_get_default_pipe(polling->device), pipe);
                 }
 

uspace/lib/usbdev/src/pipes.c

@@ -56 +56 @@
         /* Prevent infinite recursion. */
         pipe->auto_reset_halt = false;
-        usb_request_clear_endpoint_halt(pipe, 0);
+        usb_pipe_clear_halt(pipe, pipe);
         pipe->auto_reset_halt = true;
 }
@@ -194 +194 @@
                 exch = async_exchange_begin(pipe->isoch_session);
         else
-                exch = async_exchange_begin(pipe->bus_session);
+                exch = async_exchange_begin(pipe->bus_session);
         size_t act_size = 0;
         const int rc =

uspace/lib/usbdev/src/request.c

@@ -824 +824 @@
  * @return Error code.
  */
-int usb_request_clear_endpoint_halt(usb_pipe_t *pipe, uint16_t ep_index)
+static int usb_request_clear_endpoint_halt(usb_pipe_t *pipe, uint16_t ep_index)
 {
         return usb_request_clear_feature(pipe,