Changeset cb59f787 in mainline for uspace/lib/drv/include/usbhc_iface.h

Timestamp:

2010-11-21T09:22:41Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3f8c1f7

Parents:

32eceb4f

Message:

Rename USB interface to USBHC

USB devices themselves could have their own interface for some
general querying. This name thus seems more apropriate.

File:

• uspace/lib/drv/include/usbhc_iface.h (moved) (moved from uspace/lib/drv/include/usb_iface.h ) (9 diffs)

uspace/lib/drv/include/usbhc_iface.h

@@ -34 +34 @@
  */
 
-#ifndef LIBDRV_USB_IFACE_H_
-#define LIBDRV_USB_IFACE_H_
+#ifndef LIBDRV_USBHC_IFACE_H_
+#define LIBDRV_USBHC_IFACE_H_
 
 #include "driver.h"
@@ -46 +46 @@
  *
  * Methods for sending data to device (OUT transactions)
- * - e.g. IPC_M_USB_INTERRUPT_OUT -
+ * - e.g. IPC_M_USBHC_INTERRUPT_OUT -
  * always use the same semantics:
  * - first, IPC call with given method is made
@@ -59 +59 @@
  *
  * Methods for retrieving data from device (IN transactions)
- * - e.g. IPC_M_USB_INTERRUPT_IN -
+ * - e.g. IPC_M_USBHC_INTERRUPT_IN -
  * also use the same semantics:
  * - first, IPC call with given method is made
@@ -76 +76 @@
  * The mentioned data retrieval can be done any time after receiving EOK
  * answer to IN method.
- * This retrieval is done using the IPC_M_USB_GET_BUFFER where
+ * This retrieval is done using the IPC_M_USBHC_GET_BUFFER where
  * the first argument is buffer hash from call answer.
  * This call must be immediately followed by data read-in and after the
- * data are transferred, the initial call (IPC_M_USB_GET_BUFFER)
+ * data are transferred, the initial call (IPC_M_USBHC_GET_BUFFER)
  * is answered. Each buffer can be retrieved only once.
  *
@@ -97 +97 @@
          * as it is handled by the remote part itself.
          */
-        IPC_M_USB_GET_BUFFER,
+        IPC_M_USBHC_GET_BUFFER,
 
 
@@ -103 +103 @@
          * See explanation at usb_iface_funcs_t (OUT transaction).
          */
-        IPC_M_USB_INTERRUPT_OUT,
+        IPC_M_USBHC_INTERRUPT_OUT,
 
         /** Get interrupt data from device.
          * See explanation at usb_iface_funcs_t (IN transaction).
          */
-        IPC_M_USB_INTERRUPT_IN,
+        IPC_M_USBHC_INTERRUPT_IN,
 
 
@@ -114 +114 @@
          * See explanation at usb_iface_funcs_t (OUT transaction).
          */
-        IPC_M_USB_CONTROL_WRITE_SETUP,
+        IPC_M_USBHC_CONTROL_WRITE_SETUP,
 
         /** Send control-transfer data to device.
          * See explanation at usb_iface_funcs_t (OUT transaction).
          */
-        IPC_M_USB_CONTROL_WRITE_DATA,
+        IPC_M_USBHC_CONTROL_WRITE_DATA,
 
         /** Terminate WRITE control transfer.
          * See explanation at usb_iface_funcs_t (NO-DATA transaction).
          */
-        IPC_M_USB_CONTROL_WRITE_STATUS,
+        IPC_M_USBHC_CONTROL_WRITE_STATUS,
 
 
@@ -131 +131 @@
          * See explanation at usb_iface_funcs_t (OUT transaction).
          */
-        IPC_M_USB_CONTROL_READ_SETUP,
+        IPC_M_USBHC_CONTROL_READ_SETUP,
 
         /** Get control-transfer data from device.
          * See explanation at usb_iface_funcs_t (IN transaction).
          */
-        IPC_M_USB_CONTROL_READ_DATA,
+        IPC_M_USBHC_CONTROL_READ_DATA,
 
         /** Terminate READ control transfer.
          * See explanation at usb_iface_funcs_t (NO-DATA transaction).
          */
-        IPC_M_USB_CONTROL_READ_STATUS,
+        IPC_M_USBHC_CONTROL_READ_STATUS,
 
 
         /* IPC_M_USB_ */
-} usb_iface_funcs_t;
+} usbhc_iface_funcs_t;
 
 /** Callback for outgoing transfer. */
-typedef void (*usb_iface_transfer_out_callback_t)(device_t *,
+typedef void (*usbhc_iface_transfer_out_callback_t)(device_t *,
     usb_transaction_outcome_t, void *);
 
 /** Callback for incoming transfer. */
-typedef void (*usb_iface_transfer_in_callback_t)(device_t *,
+typedef void (*usbhc_iface_transfer_in_callback_t)(device_t *,
     usb_transaction_outcome_t, size_t, void *);
 
@@ -159 +159 @@
         int (*interrupt_out)(device_t *, usb_target_t,
             void *, size_t,
-            usb_iface_transfer_out_callback_t, void *);
+            usbhc_iface_transfer_out_callback_t, void *);
         int (*interrupt_in)(device_t *, usb_target_t,
             void *, size_t,
-            usb_iface_transfer_in_callback_t, void *);
-} usb_iface_t;
+            usbhc_iface_transfer_in_callback_t, void *);
+} usbhc_iface_t;