Changeset 3bacee1 in mainline for uspace/lib/drv/generic

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/lib/drv/generic

Files:

• remote_ahci.c (modified) (4 diffs)
• remote_audio_pcm.c (modified) (5 diffs)
• remote_ieee80211.c (modified) (1 diff)
• remote_nic.c (modified) (2 diffs)
• remote_usbdiag.c (modified) (2 diffs)
• remote_usbhc.c (modified) (8 diffs)

uspace/lib/drv/generic/remote_ahci.c

@@ -59 +59 @@
         ((uint32_t) (((uint64_t) ((uintptr_t) (ptr))) >> 32))
 
-async_sess_t* ahci_get_sess(devman_handle_t funh, char **name)
+async_sess_t *ahci_get_sess(devman_handle_t funh, char **name)
 {
         // FIXME: Use a better way than substring match
@@ -116 +116 @@
 
         if (rc == EOK) {
-                *blocks = (((uint64_t) blocks_hi) << 32)
-                    | (((uint64_t) blocks_lo) & 0xffffffff);
+                *blocks = (((uint64_t) blocks_hi) << 32) |
+                    (((uint64_t) blocks_lo) & 0xffffffff);
         }
 
@@ -163 +163 @@
 
 errno_t ahci_write_blocks(async_sess_t *sess, uint64_t blocknum, size_t count,
-    void* buf)
+    void *buf)
 {
         async_exch_t *exch = async_exchange_begin(sess);
@@ -222 +222 @@
             (size_t) DEV_IPC_GET_ARG1(*call);
 
-        char* sata_dev_name = malloc(sata_dev_name_length);
+        char *sata_dev_name = malloc(sata_dev_name_length);
         if (sata_dev_name == NULL) {
                 async_answer_0(chandle, ENOMEM);

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -198 +198 @@
                         /* Make the other side fail
                          * as it waits for read request */
-                        async_data_read_start(exch, (void*)-1, 0);
+                        async_data_read_start(exch, (void *)-1, 0);
                         async_exchange_end(exch);
                         return ENOMEM;
@@ -288 +288 @@
         /* All OK or something has changed. Verify that it was not one of the
          * params we care about */
-        if ((ret == EOK || ret == ELIMIT)
-            && (!channels || *channels == channels_arg)
-            && (!rate || *rate == rate_arg)
-            && (!format || *format == format_arg))
+        if ((ret == EOK || ret == ELIMIT) &&
+            (!channels || *channels == channels_arg) &&
+            (!rate || *rate == rate_arg) &&
+            (!format || *format == format_arg))
                 return EOK;
         if (channels)
@@ -781 +781 @@
 
         ddf_msg(LVL_DEBUG2, "Calling share finalize.");
-        ret = async_share_in_finalize(share_id, buffer, AS_AREA_WRITE
-        | AS_AREA_READ);
+        ret = async_share_in_finalize(share_id, buffer, AS_AREA_WRITE |
+            AS_AREA_READ);
         if (ret != EOK) {
                 ddf_msg(LVL_DEBUG, "Failed to share buffer.");
@@ -812 +812 @@
         const pcm_sample_format_t format = DEV_IPC_GET_ARG3(*call) & UINT16_MAX;
 
-        const errno_t ret = pcm_iface->start_playback
-            ? pcm_iface->start_playback(fun, frames, channels, rate, format)
-            : ENOTSUP;
+        const errno_t ret = pcm_iface->start_playback ?
+            pcm_iface->start_playback(fun, frames, channels, rate, format) :
+            ENOTSUP;
         async_answer_0(chandle, ret);
 }
@@ -839 +839 @@
         const pcm_sample_format_t format = DEV_IPC_GET_ARG3(*call) & UINT16_MAX;
 
-        const errno_t ret = pcm_iface->start_capture
-            ? pcm_iface->start_capture(fun, frames, channels, rate, format)
-            : ENOTSUP;
+        const errno_t ret = pcm_iface->start_capture ?
+            pcm_iface->start_capture(fun, frames, channels, rate, format) :
+            ENOTSUP;
         async_answer_0(chandle, ret);
 }

uspace/lib/drv/generic/remote_ieee80211.c

@@ -78 +78 @@
         async_wait_for(aid, &res);
 
-        if(res != EOK)
+        if (res != EOK)
                 return (errno_t) res;
 

uspace/lib/drv/generic/remote_nic.c

@@ -339 +339 @@
  */
 errno_t nic_get_operation_mode(async_sess_t *dev_sess, int *speed,
-   nic_channel_mode_t *duplex, nic_role_t *role)
+    nic_channel_mode_t *duplex, nic_role_t *role)
 {
         sysarg_t _speed;
@@ -872 +872 @@
         if (address_count)
                 rc = async_data_write_start(exch, address_list,
-                        address_count * sizeof(nic_address_t));
+                    address_count * sizeof(nic_address_t));
         else
                 rc = EOK;

uspace/lib/drv/generic/remote_usbdiag.c

@@ -169 +169 @@
 
         usbdiag_test_results_t results;
-        const errno_t ret = !diag_iface->test_in ? ENOTSUP
-            : diag_iface->test_in(fun, &params, &results);
+        const errno_t ret = !diag_iface->test_in ? ENOTSUP :
+            diag_iface->test_in(fun, &params, &results);
 
         if (ret != EOK) {
@@ -223 +223 @@
 
         usbdiag_test_results_t results;
-        const errno_t ret = !diag_iface->test_out ? ENOTSUP
-            : diag_iface->test_out(fun, &params, &results);
+        const errno_t ret = !diag_iface->test_out ? ENOTSUP :
+            diag_iface->test_out(fun, &params, &results);
 
         if (ret != EOK) {

uspace/lib/drv/generic/remote_usbhc.c

@@ -159 +159 @@
 
         aid_t opening_request = async_send_1(exch,
-                DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_UNREGISTER_ENDPOINT, NULL);
+            DEV_IFACE_ID(USBHC_DEV_IFACE), IPC_M_USB_UNREGISTER_ENDPOINT, NULL);
 
         if (opening_request == 0) {
@@ -207 +207 @@
         /* Share the data, if any. */
         if (req->size > 0) {
-                unsigned flags = (req->dir == USB_DIRECTION_IN)
-                        ? AS_AREA_WRITE : AS_AREA_READ;
+                unsigned flags = (req->dir == USB_DIRECTION_IN) ?
+                    AS_AREA_WRITE : AS_AREA_READ;
 
                 const errno_t ret = async_share_out_start(exch, req->buffer.virt, flags);
@@ -321 +321 @@
         size_t len;
 
-        if (!async_data_write_receive(&data_chandle, &len)
-            || len != sizeof(ep_desc)) {
+        if (!async_data_write_receive(&data_chandle, &len) ||
+            len != sizeof(ep_desc)) {
                 async_answer_0(chandle, EINVAL);
                 return;
@@ -333 +333 @@
         async_answer_0(chandle, rc);
 
-        if (!async_data_read_receive(&data_chandle, &len)
-            || len != sizeof(pipe_desc)) {
+        if (!async_data_read_receive(&data_chandle, &len) ||
+            len != sizeof(pipe_desc)) {
                 return;
         }
@@ -358 +358 @@
         size_t len;
 
-        if (!async_data_write_receive(&data_chandle, &len)
-            || len != sizeof(pipe_desc)) {
+        if (!async_data_write_receive(&data_chandle, &len) ||
+            len != sizeof(pipe_desc)) {
                 async_answer_0(chandle, EINVAL);
                 return;
@@ -406 +406 @@
         const size_t required_size = trans->request.offset + trans->request.size;
         const unsigned required_flags =
-                (trans->request.dir == USB_DIRECTION_IN)
-                ? AS_AREA_WRITE : AS_AREA_READ;
+            (trans->request.dir == USB_DIRECTION_IN) ?
+            AS_AREA_WRITE : AS_AREA_READ;
 
         errno_t err;
@@ -468 +468 @@
         cap_call_handle_t data_chandle;
         size_t len;
-        if (!async_data_write_receive(&data_chandle, &len)
-            || len != sizeof(trans->request)) {
+        if (!async_data_write_receive(&data_chandle, &len) ||
+            len != sizeof(trans->request)) {
                 async_answer_0(data_chandle, EINVAL);
                 goto err;
@@ -475 +475 @@
 
         if ((err = async_data_write_finalize(data_chandle,
-                            &trans->request, sizeof(trans->request))))
+            &trans->request, sizeof(trans->request))))
                 goto err;