Changeset 5828554 in mainline for uspace/lib/drv/generic/remote_audio_mixer.c

Timestamp:

2014-01-19T14:37:22Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/drv/generic/remote_audio_mixer.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_audio_mixer.c

@@ -37 +37 @@
 #include <assert.h>
 #include <str.h>
+#include <macros.h>
 
 #include "audio_mixer_iface.h"
@@ -204 +205 @@
 
 /** Remote audio mixer interface operations. */
-static remote_iface_func_ptr_t remote_audio_mixer_iface_ops[] = {
+static const remote_iface_func_ptr_t remote_audio_mixer_iface_ops[] = {
         [IPC_M_AUDIO_MIXER_GET_INFO] = remote_audio_mixer_get_info,
         [IPC_M_AUDIO_MIXER_GET_ITEM_INFO] = remote_audio_mixer_get_item_info,
@@ -212 +213 @@
 
 /** Remote audio mixer interface structure. */
-remote_iface_t remote_audio_mixer_iface = {
-        .method_count = sizeof(remote_audio_mixer_iface_ops) /
-            sizeof(remote_audio_mixer_iface_ops[0]),
+const remote_iface_t remote_audio_mixer_iface = {
+        .method_count = ARRAY_SIZE(remote_audio_mixer_iface_ops),
         .methods = remote_audio_mixer_iface_ops
 };