Changeset fbe148ee in mainline

Timestamp:

2011-10-30T13:13:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

54d1ad9

Parents:

9871bca

Message:

usbhid: Add trivial device_remove implementation.

Add const qualifiers.
Comment fixes.

File:

• uspace/drv/bus/usb/usbhid/main.c (modified) (8 diffs)

uspace/drv/bus/usb/usbhid/main.c

@@ -46 +46 @@
 #include "usbhid.h"
 
-/*----------------------------------------------------------------------------*/
-
 #define NAME "usbhid"
 
@@ -67 +65 @@
  *
  * @param dev Device to add.
- *
- * @retval EOK if successful.
- * @retval ENOMEM if there
- * @return Other error code inherited from one of functions usb_kbd_init(),
- *         ddf_fun_bind() and ddf_fun_add_to_class().
+ * @return Error code.
  */
 static int usb_hid_try_add_device(usb_device_t *dev)
@@ -138 +132 @@
         return EOK;
 }
-
 /*----------------------------------------------------------------------------*/
 /**
@@ -146 +139 @@
  *
  * @param dev Structure representing the new device.
- *
- * @retval EOK if successful. 
- * @retval EREFUSED if the device is not supported.
+ * @return Error code.
  */
 static int usb_hid_device_add(usb_device_t *dev)
@@ -179 +170 @@
         return EOK;
 }
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
+/**
+ * Callback for a device about to be removed from the driver.
+ *
+ * @param dev Structure representing the device.
+ * @return Error code.
+ */
+static int usb_hid_device_rem(usb_device_t *dev)
+{
+        return EOK;
+}
+/*----------------------------------------------------------------------------*/
 /**
  * Callback for removing a device from the driver.
  *
  * @param dev Structure representing the device.
- *
- * @retval EOK if successful. 
- * @retval EREFUSED if the device is not supported.
+ * @return Error code.
  */
 static int usb_hid_device_gone(usb_device_t *dev)
@@ -198 +196 @@
                 if (!tries--) {
                         usb_log_error("Can't remove hub, still running.\n");
-                        return EINPROGRESS;
+                        return EBUSY;
                 }
         }
@@ -207 +205 @@
         return EOK;
 }
-
+/*----------------------------------------------------------------------------*/
 /** USB generic driver callbacks */
-static usb_driver_ops_t usb_hid_driver_ops = {
+static const usb_driver_ops_t usb_hid_driver_ops = {
         .device_add = usb_hid_device_add,
+        .device_rem = usb_hid_device_rem,
         .device_gone = usb_hid_device_gone,
 };
-
-
+/*----------------------------------------------------------------------------*/
 /** The driver itself. */
-static usb_driver_t usb_hid_driver = {
+static const usb_driver_t usb_hid_driver = {
         .name = NAME,
         .ops = &usb_hid_driver_ops,
         .endpoints = usb_hid_endpoints
 };
-
-/*----------------------------------------------------------------------------*/
-
+/*----------------------------------------------------------------------------*/
 int main(int argc, char *argv[])
 {
@@ -232 +228 @@
         return usb_driver_main(&usb_hid_driver);
 }
-
 /**
  * @}