Changeset 46577995 in mainline for uspace/srv/audio/hound/audio_device.c

Timestamp:

2018-01-04T20:50:52Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Children:

e211ea04

Parents:

facacc71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

After this commit, HelenOS is free of code that mixes error codes with non-error
values on the assumption that error codes are negative.

File:

• uspace/srv/audio/hound/audio_device.c (modified) (16 diffs)

uspace/srv/audio/hound/audio_device.c

@@ -51 +51 @@
 #define BUFFER_PARTS   16
 
-static int device_sink_connection_callback(audio_sink_t *sink, bool new);
-static int device_source_connection_callback(audio_source_t *source, bool new);
+static errno_t device_sink_connection_callback(audio_sink_t *sink, bool new);
+static errno_t device_source_connection_callback(audio_source_t *source, bool new);
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void *arg);
-static int device_check_format(audio_sink_t* sink);
-static int get_buffer(audio_device_t *dev);
-static int release_buffer(audio_device_t *dev);
+static errno_t device_check_format(audio_sink_t* sink);
+static errno_t get_buffer(audio_device_t *dev);
+static errno_t release_buffer(audio_device_t *dev);
 static void advance_buffer(audio_device_t *dev, size_t size);
 static inline bool is_running(audio_device_t *dev)
@@ -72 +72 @@
  * @return Error code.
  */
-int audio_device_init(audio_device_t *dev, service_id_t id, const char *name)
+errno_t audio_device_init(audio_device_t *dev, service_id_t id, const char *name)
 {
         assert(dev);
@@ -122 +122 @@
         assert(dev);
         sysarg_t val;
-        int rc = audio_pcm_query_cap(dev->sess, AUDIO_CAP_CAPTURE, &val);
+        errno_t rc = audio_pcm_query_cap(dev->sess, AUDIO_CAP_CAPTURE, &val);
         if (rc == EOK && val)
                 return &dev->source;
@@ -138 +138 @@
         assert(dev);
         sysarg_t val;
-        int rc = audio_pcm_query_cap(dev->sess, AUDIO_CAP_PLAYBACK, &val);
+        errno_t rc = audio_pcm_query_cap(dev->sess, AUDIO_CAP_PLAYBACK, &val);
         if (rc == EOK && val)
                 return &dev->sink;
@@ -153 +153 @@
  * connections.
  */
-static int device_sink_connection_callback(audio_sink_t* sink, bool new)
+static errno_t device_sink_connection_callback(audio_sink_t* sink, bool new)
 {
         assert(sink);
@@ -160 +160 @@
                 log_verbose("First connection on device sink '%s'", sink->name);
 
-                int ret = get_buffer(dev);
+                errno_t ret = get_buffer(dev);
                 if (ret != EOK) {
                         log_error("Failed to get device buffer: %s",
@@ -196 +196 @@
                 log_verbose("Removed last connection on device sink '%s'",
                     sink->name);
-                int ret = audio_pcm_stop_playback(dev->sess);
+                errno_t ret = audio_pcm_stop_playback(dev->sess);
                 if (ret != EOK) {
                         log_error("Failed to stop playback: %s",
@@ -215 +215 @@
  * connections.
  */
-static int device_source_connection_callback(audio_source_t *source, bool new)
+static errno_t device_source_connection_callback(audio_source_t *source, bool new)
 {
         assert(source);
         audio_device_t *dev = source->private_data;
         if (new && list_count(&source->connections) == 1) {
-                int ret = get_buffer(dev);
+                errno_t ret = get_buffer(dev);
                 if (ret != EOK) {
                         log_error("Failed to get device buffer: %s",
@@ -244 +244 @@
         if (list_count(&source->connections) == 0) { /* Disconnected */
                 assert(!new);
-                int ret = audio_pcm_stop_capture_immediate(dev->sess);
+                errno_t ret = audio_pcm_stop_capture_immediate(dev->sess);
                 if (ret != EOK) {
                         log_error("Failed to start recording: %s",
@@ -289 +289 @@
                         log_verbose("Capture terminated");
                         dev->source.format = AUDIO_FORMAT_ANY;
-                        const int ret = release_buffer(dev);
+                        const errno_t ret = release_buffer(dev);
                         if (ret != EOK) {
                                 log_error("Failed to release buffer: %s",
@@ -300 +300 @@
                         log_verbose("Playback Terminated");
                         dev->sink.format = AUDIO_FORMAT_ANY;
-                        const int ret = release_buffer(dev);
+                        const errno_t ret = release_buffer(dev);
                         if (ret != EOK) {
                                 log_error("Failed to release buffer: %s",
@@ -309 +309 @@
                 }
                 case PCM_EVENT_FRAMES_CAPTURED: {
-                        const int ret = audio_source_push_data(&dev->source,
+                        const errno_t ret = audio_source_push_data(&dev->source,
                             dev->buffer.position, dev->buffer.fragment_size);
                         advance_buffer(dev, dev->buffer.fragment_size);
@@ -329 +329 @@
  * @return Error code.
  */
-static int device_check_format(audio_sink_t* sink)
+static errno_t device_check_format(audio_sink_t* sink)
 {
         assert(sink);
@@ -347 +347 @@
  * @return Error code.
  */
-static int get_buffer(audio_device_t *dev)
+static errno_t get_buffer(audio_device_t *dev)
 {
         assert(dev);
@@ -362 +362 @@
         size_t preferred_size = 0;
 
-        const int ret = audio_pcm_get_buffer(dev->sess, &dev->buffer.base,
+        const errno_t ret = audio_pcm_get_buffer(dev->sess, &dev->buffer.base,
             &preferred_size);
         if (ret == EOK) {
@@ -378 +378 @@
  * @return Error code.
  */
-static int release_buffer(audio_device_t *dev)
+static errno_t release_buffer(audio_device_t *dev)
 {
         assert(dev);
         assert(dev->buffer.base);
 
-        const int ret = audio_pcm_release_buffer(dev->sess);
+        const errno_t ret = audio_pcm_release_buffer(dev->sess);
         if (ret == EOK) {
                 as_area_destroy(dev->buffer.base);