Changeset 365f259 in mainline

Timestamp:

2013-03-03T17:14:26Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

90c1d80

Parents:

80d5307

Message:

sb16: Use arrays_size macro.

Location:

uspace/drv/audio/sb16

Files:

• dsp.c (modified) (2 diffs)
• mixer.c (modified) (2 diffs)
• sb16.c (modified) (2 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -40 +40 @@
 #include <libarch/ddi.h>
 #include <libarch/barrier.h>
+#include <macros.h>
 #include <str_error.h>
 #include <audio_pcm_iface.h>
@@ -74 +75 @@
                 [DSP_NO_BUFFER] = "NO BUFFER",
         };
-        if (state < (sizeof(state_names) / sizeof(state_names[0])))
+        if (state < ARRAY_SIZE(state_names))
                 return state_names[state];
         return "UNKNOWN";

uspace/drv/audio/sb16/mixer.c

@@ -31 +31 @@
 #include <errno.h>
 #include <libarch/ddi.h>
+#include <macros.h>
 #include <unistd.h>
 
@@ -128 +129 @@
 
 static const struct {
+        const volume_item_t *table;
         size_t count;
-        const volume_item_t *table;
 } volume_table[] = {
-        [SB_MIXER_NONE] = { 0, NULL },
-        [SB_MIXER_UNKNOWN] = { 0, NULL },
-        [SB_MIXER_CT1335] = {
-            sizeof(volume_ct1335) / sizeof(volume_item_t), volume_ct1335 },
-        [SB_MIXER_CT1345] = {
-            sizeof(volume_ct1345) / sizeof(volume_item_t), volume_ct1345 },
-        [SB_MIXER_CT1745] = {
-            sizeof(volume_ct1745) / sizeof(volume_item_t), volume_ct1745 },
+        [SB_MIXER_NONE] = { NULL, 0 },
+        [SB_MIXER_UNKNOWN] = { NULL, 0 },
+        [SB_MIXER_CT1335] = { volume_ct1335, ARRAY_SIZE(volume_ct1335) },
+        [SB_MIXER_CT1345] = { volume_ct1345, ARRAY_SIZE(volume_ct1345) },
+        [SB_MIXER_CT1745] = { volume_ct1745, ARRAY_SIZE(volume_ct1745) },
 };
 
 const char * sb_mixer_type_str(sb_mixer_type_t type)
 {
-        static const char * names[] = {
+        static const char *names[] = {
+                [SB_MIXER_NONE] = "No mixer",
                 [SB_MIXER_CT1335] = "CT 1335",
                 [SB_MIXER_CT1345] = "CT 1345",

uspace/drv/audio/sb16/sb16.c

@@ -31 +31 @@
 #include <errno.h>
 #include <str_error.h>
+#include <macros.h>
 #include <audio_mixer_iface.h>
 #include <audio_pcm_iface.h>
@@ -73 +74 @@
 size_t sb16_irq_code_size(void)
 {
-        return sizeof(irq_cmds) / sizeof(irq_cmds[0]);
+        return ARRAY_SIZE(irq_cmds);
 }