Changeset 90f05b0f in mainline for uspace/lib/drv

Timestamp:

2012-07-09T07:46:24Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

68d1313

Parents:

0336354a

Message:

Rename audio pcm interface.

Location:

uspace/lib/drv

Files:

• Makefile (modified) (1 diff)
• generic/dev_iface.c (modified) (1 diff)
• generic/remote_audio_pcm.c (moved) (moved from uspace/lib/drv/generic/remote_audio_pcm_buffer.c ) (17 diffs)
• include/audio_pcm_iface.h (moved) (moved from uspace/lib/drv/include/audio_pcm_buffer_iface.h ) (4 diffs)
• include/remote_audio_pcm.h (moved) (moved from uspace/lib/drv/include/remote_audio_pcm_buffer.h ) (1 diff)

uspace/lib/drv/Makefile

@@ -39 +39 @@
         generic/logbuf.c \
         generic/remote_audio_mixer.c \
-        generic/remote_audio_pcm_buffer.c \
+        generic/remote_audio_pcm.c \
         generic/remote_hw_res.c \
         generic/remote_char_dev.c \

uspace/lib/drv/generic/dev_iface.c

@@ -47 +47 @@
 #include "remote_pci.h"
 #include "remote_audio_mixer.h"
-#include "remote_audio_pcm_buffer.h"
+#include "remote_audio_pcm.h"
 
 static const iface_dipatch_table_t remote_ifaces = {
         .ifaces = {
                 [AUDIO_MIXER_IFACE] = &remote_audio_mixer_iface,
-                [AUDIO_PCM_BUFFER_IFACE] = &remote_audio_pcm_buffer_iface,
+                [AUDIO_PCM_BUFFER_IFACE] = &remote_audio_pcm_iface,
                 [HW_RES_DEV_IFACE] = &remote_hw_res_iface,
                 [CHAR_DEV_IFACE] = &remote_char_dev_iface,

uspace/lib/drv/generic/remote_audio_pcm.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2012 Jan Vesely
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <sys/mman.h>
 
-#include "audio_pcm_buffer_iface.h"
+#include "audio_pcm_iface.h"
 #include "ddf/driver.h"
 
@@ -55 +55 @@
  * CLIENT SIDE
  */
-int audio_pcm_buffer_get_info_str(async_exch_t *exch, const char **name)
+int audio_pcm_get_info_str(async_exch_t *exch, const char **name)
 {
         if (!exch)
@@ -82 +82 @@
 }
 
-int audio_pcm_buffer_get_buffer(async_exch_t *exch, void **buffer, size_t *size,
+int audio_pcm_get_buffer(async_exch_t *exch, void **buffer, size_t *size,
     unsigned *id, async_client_conn_t event_rec, void* arg)
 {
@@ -110 +110 @@
 }
 
-int audio_pcm_buffer_release_buffer(async_exch_t *exch, unsigned id)
+int audio_pcm_release_buffer(async_exch_t *exch, unsigned id)
 {
         if (!exch)
@@ -118 +118 @@
 }
 
-int audio_pcm_buffer_start_playback(async_exch_t *exch, unsigned id,
+int audio_pcm_start_playback(async_exch_t *exch, unsigned id,
     unsigned parts, unsigned sample_rate, uint16_t sample_size,
     uint8_t channels, bool sign)
@@ -131 +131 @@
 }
 
-int audio_pcm_buffer_stop_playback(async_exch_t *exch, unsigned id)
+int audio_pcm_stop_playback(async_exch_t *exch, unsigned id)
 {
         if (!exch)
@@ -139 +139 @@
 }
 
-int audio_pcm_buffer_start_record(async_exch_t *exch, unsigned id,
+int audio_pcm_start_record(async_exch_t *exch, unsigned id,
     unsigned parts, unsigned sample_rate, uint16_t sample_size,
     uint8_t channels, bool sign)
@@ -152 +152 @@
 }
 
-int audio_pcm_buffer_stop_record(async_exch_t *exch, unsigned id)
+int audio_pcm_stop_record(async_exch_t *exch, unsigned id)
 {
         if (!exch)
@@ -183 +183 @@
 
 /** Remote audio mixer interface structure. */
-remote_iface_t remote_audio_pcm_buffer_iface = {
+remote_iface_t remote_audio_pcm_iface = {
         .method_count = sizeof(remote_audio_pcm_iface_ops) /
             sizeof(remote_audio_pcm_iface_ops[0]),
@@ -192 +192 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        const audio_pcm_buffer_iface_t *pcm_iface = iface;
+        const audio_pcm_iface_t *pcm_iface = iface;
 
         if (!pcm_iface->get_info_str) {
@@ -221 +221 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        const audio_pcm_buffer_iface_t *pcm_iface = iface;
+        const audio_pcm_iface_t *pcm_iface = iface;
 
         if (!pcm_iface->get_buffer ||
@@ -294 +294 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        const audio_pcm_buffer_iface_t *pcm_iface = iface;
+        const audio_pcm_iface_t *pcm_iface = iface;
 
         const unsigned id = DEV_IPC_GET_ARG1(*call);
@@ -305 +305 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        const audio_pcm_buffer_iface_t *pcm_iface = iface;
+        const audio_pcm_iface_t *pcm_iface = iface;
 
         const unsigned id = DEV_IPC_GET_ARG1(*call);
@@ -323 +323 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        const audio_pcm_buffer_iface_t *pcm_iface = iface;
+        const audio_pcm_iface_t *pcm_iface = iface;
 
         const unsigned id = DEV_IPC_GET_ARG1(*call);
@@ -334 +334 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        const audio_pcm_buffer_iface_t *pcm_iface = iface;
+        const audio_pcm_iface_t *pcm_iface = iface;
 
         const unsigned id = DEV_IPC_GET_ARG1(*call);
@@ -352 +352 @@
     ipc_callid_t callid, ipc_call_t *call)
 {
-        const audio_pcm_buffer_iface_t *pcm_iface = iface;
+        const audio_pcm_iface_t *pcm_iface = iface;
 
         const unsigned id = DEV_IPC_GET_ARG1(*call);

uspace/lib/drv/include/audio_pcm_iface.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2012 Jan Vesely
  * All rights reserved.
  *
@@ -34 +34 @@
  */
 
-#ifndef LIBDRV_AUDIO_PCM_BUFFER_IFACE_H_
-#define LIBDRV_AUDIO_PCM_BUFFER_IFACE_H_
+#ifndef LIBDRV_AUDIO_PCM_IFACE_H_
+#define LIBDRV_AUDIO_PCM_IFACE_H_
 
 #include <async.h>
@@ -42 +42 @@
 #include "ddf/driver.h"
 
-int audio_pcm_buffer_get_info_str(async_exch_t *, const char **);
-int audio_pcm_buffer_get_buffer(async_exch_t *, void **, size_t *, unsigned *,
+int audio_pcm_get_info_str(async_exch_t *, const char **);
+int audio_pcm_get_buffer(async_exch_t *, void **, size_t *, unsigned *,
     async_client_conn_t, void *);
-int audio_pcm_buffer_release_buffer(async_exch_t *, unsigned);
+int audio_pcm_release_buffer(async_exch_t *, unsigned);
 
-int audio_pcm_buffer_start_playback(async_exch_t *, unsigned, unsigned,
+int audio_pcm_start_playback(async_exch_t *, unsigned, unsigned,
     unsigned, uint16_t, uint8_t, bool);
-int audio_pcm_buffer_stop_playback(async_exch_t *, unsigned);
+int audio_pcm_stop_playback(async_exch_t *, unsigned);
 
-int audio_pcm_buffer_start_record(async_exch_t *, unsigned, unsigned,
+int audio_pcm_start_record(async_exch_t *, unsigned, unsigned,
     unsigned, uint16_t, uint8_t, bool);
-int audio_pcm_buffer_stop_record(async_exch_t *, unsigned);
+int audio_pcm_stop_record(async_exch_t *, unsigned);
 
 /** Audio pcm communication interface. */
@@ -67 +67 @@
             unsigned, unsigned, unsigned, bool);
         int (*stop_record)(ddf_fun_t *, unsigned);
-} audio_pcm_buffer_iface_t;
+} audio_pcm_iface_t;
 
 #endif

uspace/lib/drv/include/remote_audio_pcm.h

@@ -35 +35 @@
 #define LIBDRV_REMOTE_AUDIO_PCM_H_
 
-extern remote_iface_t remote_audio_pcm_buffer_iface;
+extern remote_iface_t remote_audio_pcm_iface;
 
 #endif