Changeset 5ab4a48 in mainline

Timestamp:

2011-04-17T10:48:44Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4125b7d

Parents:

2c2cbcf

Message:

Remove usb_pipe_start_session & co (#196)

Location:

uspace

Files:

• drv/usbmouse/init.c (modified) (2 diffs)
• lib/usb/include/usb/pipes.h (modified) (1 diff)
• lib/usb/src/pipes.c (modified) (1 diff)

uspace/drv/usbmouse/init.c

@@ -125 +125 @@
         }
         
-        /* Open the control pipe. */
-        rc = usb_pipe_start_session(&dev->ctrl_pipe);
-        if (rc != EOK) {
-                goto leave;
-        }
-        
         /* Set the boot protocol. */
         rc = usb_control_request_set(&dev->ctrl_pipe,
@@ -140 +134 @@
         }
         
-        /* Close the control pipe (ignore errors). */
-        usb_pipe_end_session(&dev->ctrl_pipe);
-
-
-        /* Everything allright. */
+        /* Everything all right. */
         dev->driver_data = mouse;
         mouse->mouse_fun->driver_data = mouse;

uspace/lib/usb/include/usb/pipes.h

@@ -177 +177 @@
 int usb_pipe_unregister(usb_pipe_t *, usb_hc_connection_t *);
 
-int usb_pipe_start_session(usb_pipe_t *);
-int usb_pipe_end_session(usb_pipe_t *);
-bool usb_pipe_is_session_started(usb_pipe_t *);
-
 void usb_pipe_start_long_transfer(usb_pipe_t *);
 void usb_pipe_end_long_transfer(usb_pipe_t *);

uspace/lib/usb/src/pipes.c

@@ -229 +229 @@
 }
 
-
-/** Start a session on the endpoint pipe.
- *
- * A session is something inside what any communication occurs.
- * It is expected that sessions would be started right before the transfer
- * and ended - see usb_pipe_end_session() - after the last
- * transfer.
- * The reason for this is that session actually opens some communication
- * channel to the host controller (or to the physical hardware if you
- * wish) and thus it involves acquiring kernel resources.
- * Since they are limited, sessions shall not be longer than strictly
- * necessary.
- *
- * @deprecated
- * Obsoleted with introduction of usb_pipe_start_long_transfer
- *
- * @param pipe Endpoint pipe to start the session on.
- * @return Error code.
- */
-int usb_pipe_start_session(usb_pipe_t *pipe)
-{
-        usb_log_warning("usb_pipe_start_session() was deprecated.\n");
-        return EOK;
-}
-
-
-/** Ends a session on the endpoint pipe.
- *
- * @deprecated
- * Obsoleted with introduction of usb_pipe_end_long_transfer
- *
- * @see usb_pipe_start_session
- *
- * @param pipe Endpoint pipe to end the session on.
- * @return Error code.
- */
-int usb_pipe_end_session(usb_pipe_t *pipe)
-{
-        usb_log_warning("usb_pipe_end_session() was deprecated.\n");
-        return EOK;
-}
-
-/** Tell whether a session is started (open) on the endpoint pipe.
- *
- * The expected usage of this function is in assertions for some
- * nested functions.
- *
- * @param pipe Endpoint pipe in question.
- * @return Whether @p pipe has opened a session.
- */
-bool usb_pipe_is_session_started(usb_pipe_t *pipe)
-{
-        pipe_acquire(pipe);
-        bool started = pipe->refcount > 0;
-        pipe_release(pipe);
-        return started;
-}
-
 /** Prepare pipe for a long transfer.
  *