Changes in uspace/drv/bus/usb/usbhid/main.c [fbe148ee:a8c4e871] in mainline

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"
 
@@ -65 +67 @@
  *
  * @param dev Device to add.
- * @return Error code.
+ *
+ * @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().
  */
 static int usb_hid_try_add_device(usb_device_t *dev)
@@ -132 +138 @@
         return EOK;
 }
+
 /*----------------------------------------------------------------------------*/
 /**
@@ -139 +146 @@
  *
  * @param dev Structure representing the new device.
- * @return Error code.
+ *
+ * @retval EOK if successful. 
+ * @retval EREFUSED if the device is not supported.
  */
 static int usb_hid_device_add(usb_device_t *dev)
@@ -170 +179 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
-/**
- * Callback for a device about to be removed from the driver.
+
+/*----------------------------------------------------------------------------*/
+
+/**
+ * Callback for removing a device 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.
- * @return Error code.
+ *
+ * @retval EOK if successful. 
+ * @retval EREFUSED if the device is not supported.
  */
 static int usb_hid_device_gone(usb_device_t *dev)
@@ -196 +198 @@
                 if (!tries--) {
                         usb_log_error("Can't remove hub, still running.\n");
-                        return EBUSY;
+                        return EINPROGRESS;
                 }
         }
@@ -205 +207 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** USB generic driver callbacks */
-static const usb_driver_ops_t usb_hid_driver_ops = {
+static 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 const usb_driver_t usb_hid_driver = {
+static usb_driver_t usb_hid_driver = {
         .name = NAME,
         .ops = &usb_hid_driver_ops,
         .endpoints = usb_hid_endpoints
 };
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
 int main(int argc, char *argv[])
 {
@@ -228 +232 @@
         return usb_driver_main(&usb_hid_driver);
 }
+
 /**
  * @}