Changeset 58563585 in mainline for uspace/lib/drv

Timestamp:

2016-08-31T11:15:39Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

10cb47e

Parents:

7a67416

Message:

code review and cstyle cleanup (no change in functionality)

Location:

uspace/lib/drv

Files:

• generic/driver.c (modified) (2 diffs)
• generic/remote_ahci.c (modified) (2 diffs)
• generic/remote_usb.c (modified) (4 diffs)
• include/usb_iface.h (modified) (1 diff)
• include/usbhc_iface.h (modified) (1 diff)

uspace/lib/drv/generic/driver.c

@@ -126 +126 @@
                 return;
         }
-
+        
         ddf_dev_t *dev = create_device();
         if (!dev) {
@@ -133 +133 @@
                 return;
         }
-
+        
         /* Add one reference that will be dropped by driver_dev_remove() */
         dev_add_ref(dev);

uspace/lib/drv/generic/remote_ahci.c

@@ -226 +226 @@
                 return;
         }       
-
+        
         const int ret = ahci_iface->get_sata_device_name(fun,
             sata_dev_name_length, sata_dev_name);
@@ -235 +235 @@
             (real_size == sata_dev_name_length))
                 async_data_read_finalize(cid, sata_dev_name, sata_dev_name_length);
-
+        
         free(sata_dev_name);
         async_answer_0(callid, ret);

uspace/lib/drv/generic/remote_usb.c

@@ -91 +91 @@
 
 /** Tell devman handle of the usb device function.
- * @param[in] exch IPC communication exchange
+ *
+ * @param[in]  exch   IPC communication exchange
  * @param[out] handle devman handle of the HC used by the target device.
+ *
  * @return Error code.
+ *
  */
 int usb_get_my_device_handle(async_exch_t *exch, devman_handle_t *handle)
@@ -119 +122 @@
 
 /** Release default USB address.
+ *
  * @param[in] exch IPC communication exchange
+ *
  * @return Error code.
+ *
  */
 int usb_release_default_address(async_exch_t *exch)
@@ -131 +137 @@
 
 /** Trigger USB device enumeration
- * @param[in] exch IPC communication exchange
+ *
+ * @param[in]  exch   IPC communication exchange
  * @param[out] handle Identifier of the newly added device (if successful)
+ *
  * @return Error code.
+ *
  */
 int usb_device_enumerate(async_exch_t *exch, unsigned port)
@@ -145 +154 @@
 
 /** Trigger USB device enumeration
- * @param[in] exch IPC communication exchange
+ *
+ * @param[in] exch   IPC communication exchange
  * @param[in] handle Identifier of the device
+ *
  * @return Error code.
+ *
  */
 int usb_device_remove(async_exch_t *exch, unsigned port)

uspace/lib/drv/include/usb_iface.h

@@ -44 +44 @@
 typedef async_sess_t usb_dev_session_t;
 
-usb_dev_session_t *usb_dev_connect(devman_handle_t);
-usb_dev_session_t *usb_dev_connect_to_self(ddf_dev_t *);
-void usb_dev_disconnect(usb_dev_session_t *);
+extern usb_dev_session_t *usb_dev_connect(devman_handle_t);
+extern usb_dev_session_t *usb_dev_connect_to_self(ddf_dev_t *);
+extern void usb_dev_disconnect(usb_dev_session_t *);
 
-int usb_get_my_interface(async_exch_t *, int *);
-int usb_get_my_device_handle(async_exch_t *, devman_handle_t *);
+extern int usb_get_my_interface(async_exch_t *, int *);
+extern int usb_get_my_device_handle(async_exch_t *, devman_handle_t *);
 
-int usb_reserve_default_address(async_exch_t *, usb_speed_t);
-int usb_release_default_address(async_exch_t *);
+extern int usb_reserve_default_address(async_exch_t *, usb_speed_t);
+extern int usb_release_default_address(async_exch_t *);
 
-int usb_device_enumerate(async_exch_t *, unsigned port);
-int usb_device_remove(async_exch_t *, unsigned port);
+extern int usb_device_enumerate(async_exch_t *, unsigned port);
+extern int usb_device_remove(async_exch_t *, unsigned port);
 
-int usb_register_endpoint(async_exch_t *, usb_endpoint_t, usb_transfer_type_t,
-    usb_direction_t, size_t, unsigned, unsigned);
-int usb_unregister_endpoint(async_exch_t *, usb_endpoint_t, usb_direction_t);
-int usb_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t, size_t *);
-int usb_write(async_exch_t *, usb_endpoint_t, uint64_t, const void *, size_t);
+extern int usb_register_endpoint(async_exch_t *, usb_endpoint_t,
+    usb_transfer_type_t, usb_direction_t, size_t, unsigned, unsigned);
+extern int usb_unregister_endpoint(async_exch_t *, usb_endpoint_t,
+    usb_direction_t);
+extern int usb_read(async_exch_t *, usb_endpoint_t, uint64_t, void *, size_t,
+    size_t *);
+extern int usb_write(async_exch_t *, usb_endpoint_t, uint64_t, const void *,
+    size_t);
 
 /** Callback for outgoing transfer. */

uspace/lib/drv/include/usbhc_iface.h

@@ -44 +44 @@
 #include <stdbool.h>
 
-int usbhc_read(async_exch_t *, usb_address_t, usb_endpoint_t,
+extern int usbhc_read(async_exch_t *, usb_address_t, usb_endpoint_t,
     uint64_t, void *, size_t, size_t *);
-int usbhc_write(async_exch_t *, usb_address_t, usb_endpoint_t,
+extern int usbhc_write(async_exch_t *, usb_address_t, usb_endpoint_t,
     uint64_t, const void *, size_t);