Changeset 2cc5c835 in mainline for uspace/app

Timestamp:

2012-07-15T15:14:10Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

57e8b3b

Parents:

b497018

Message:

Cleanup audio_pcm interface.

Location:

uspace/app

Files:

• dplay/dplay.c (modified) (6 diffs)
• drec/drec.c (modified) (6 diffs)

uspace/app/dplay/dplay.c

@@ -63 +63 @@
         fibril_mutex_t mutex;
         fibril_condvar_t cv;
-        async_exch_t *device;
+        audio_pcm_sess_t *device;
 } playback_t;
 
-static void playback_initialize(playback_t *pb, async_exch_t *exch)
-{
-        assert(exch);
+static void playback_initialize(playback_t *pb, audio_pcm_sess_t *sess)
+{
+        assert(sess);
         assert(pb);
         pb->buffer.base = NULL;
@@ -75 +75 @@
         pb->playing = false;
         pb->source = NULL;
-        pb->device = exch;
+        pb->device = sess;
         fibril_mutex_initialize(&pb->mutex);
         fibril_condvar_initialize(&pb->cv);
@@ -168 +168 @@
         }
 
-        devman_handle_t pcm_handle;
-        int ret = devman_fun_get_handle(device, &pcm_handle, 0);
-        if (ret != EOK) {
-                printf("Failed to get device(%s) handle: %s.\n",
-                    device, str_error(ret));
-                return 1;
-        }
-
-        async_sess_t *session = devman_device_connect(
-            EXCHANGE_SERIALIZE, pcm_handle, IPC_FLAG_BLOCKING);
+        audio_pcm_sess_t *session = audio_pcm_open(device);
         if (!session) {
                 printf("Failed to connect to device.\n");
@@ -183 +174 @@
         }
 
-        async_exch_t *exch = async_exchange_begin(session);
-        if (!exch) {
-                ret = EPARTY;
-                printf("Failed to start session exchange.\n");
-                goto close_session;
-        }
         const char* info = NULL;
-        ret = audio_pcm_get_info_str(exch, &info);
+        int ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {
                 printf("Failed to get PCM info.\n");
@@ -199 +184 @@
 
         playback_t pb;
-        playback_initialize(&pb, exch);
+        playback_initialize(&pb, session);
 
         ret = audio_pcm_get_buffer(pb.device, &pb.buffer.base,
@@ -236 +221 @@
 cleanup:
         munmap(pb.buffer.base, pb.buffer.size);
-        audio_pcm_release_buffer(exch);
+        audio_pcm_release_buffer(pb.device);
 close_session:
-        async_exchange_end(exch);
-        async_hangup(session);
+        audio_pcm_close(session);
         return ret == EOK ? 0 : 1;
 }

uspace/app/drec/drec.c

@@ -65 +65 @@
         } buffer;
         FILE* file;
-        async_exch_t *device;
+        audio_pcm_sess_t *device;
 } record_t;
 
-static void record_initialize(record_t *rec, async_exch_t *exch)
-{
-        assert(exch);
+static void record_initialize(record_t *rec, audio_pcm_sess_t *sess)
+{
+        assert(sess);
         assert(rec);
         rec->buffer.base = NULL;
@@ -76 +76 @@
         rec->buffer.position = NULL;
         rec->file = NULL;
-        rec->device = exch;
+        rec->device = sess;
 }
 
@@ -151 +151 @@
         }
 
-        devman_handle_t pcm_handle;
-        int ret = devman_fun_get_handle(device, &pcm_handle, 0);
-        if (ret != EOK) {
-                printf("Failed to get device(%s) handle: %s.\n",
-                    device, str_error(ret));
-                return 1;
-        }
-
-        async_sess_t *session = devman_device_connect(
-            EXCHANGE_SERIALIZE, pcm_handle, IPC_FLAG_BLOCKING);
+
+        audio_pcm_sess_t *session = audio_pcm_open(device);
         if (!session) {
                 printf("Failed to connect to device.\n");
@@ -166 +158 @@
         }
 
-        async_exch_t *exch = async_exchange_begin(session);
-        if (!exch) {
-                ret = EPARTY;
-                printf("Failed to start session exchange.\n");
-                goto close_session;
-        }
         const char* info = NULL;
-        ret = audio_pcm_get_info_str(exch, &info);
+        int ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {
                 printf("Failed to get PCM info.\n");
@@ -182 +168 @@
 
         record_t rec;
-        record_initialize(&rec, exch);
+        record_initialize(&rec, session);
 
         ret = audio_pcm_get_buffer(rec.device, &rec.buffer.base,
@@ -220 +206 @@
 cleanup:
         munmap(rec.buffer.base, rec.buffer.size);
-        audio_pcm_release_buffer(exch);
+        audio_pcm_release_buffer(rec.device);
 close_session:
-        async_exchange_end(exch);
         async_hangup(session);
         return ret == EOK ? 0 : 1;