Changeset 3bacee1 in mainline for uspace/drv/audio/sb16/mixer.c

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.

File:

• uspace/drv/audio/sb16/mixer.c (modified) (3 diffs)

uspace/drv/audio/sb16/mixer.c

@@ -98 +98 @@
         [SB_MIXER_UNKNOWN] = { NULL, 0 },
         [SB_MIXER_CT1335] = {
-            channels_table_ct1335,
-            ARRAY_SIZE(channels_table_ct1335),
+                channels_table_ct1335,
+                ARRAY_SIZE(channels_table_ct1335),
         },
         [SB_MIXER_CT1345] = {
-            channels_table_ct1345,
-            ARRAY_SIZE(channels_table_ct1345),
+                channels_table_ct1345,
+                ARRAY_SIZE(channels_table_ct1345),
         },
         [SB_MIXER_CT1745] = {
-            channels_table_ct1745,
-            ARRAY_SIZE(channels_table_ct1745),
+                channels_table_ct1745,
+                ARRAY_SIZE(channels_table_ct1745),
         },
 };
 
-const char * sb_mixer_type_str(sb_mixer_type_t type)
+const char *sb_mixer_type_str(sb_mixer_type_t type)
 {
         static const char *names[] = {
@@ -150 +150 @@
 
 errno_t sb_mixer_get_control_item_info(const sb_mixer_t *mixer, unsigned item,
-    const char** name, unsigned *levels)
+    const char **name, unsigned *levels)
 {
         assert(mixer);
@@ -182 +182 @@
         const channel_t *chan = &volume_table[mixer->type].table[item];
         pio_write_8(&mixer->regs->mixer_address, chan->address);
-        *value = (pio_read_8(&mixer->regs->mixer_data) >> chan->shift)
-            & (chan->volume_levels - 1);
+        *value = (pio_read_8(&mixer->regs->mixer_data) >> chan->shift) &
+            (chan->volume_levels - 1);
         return EOK;
 }