Changeset b7fd2a0 in mainline for uspace/drv/audio/sb16/dsp.c

Timestamp:

2018-01-13T03:10:29Z (7 years ago)

Author:

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

Branches:

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

Children:

a53ed3a

Parents:

36f0738

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.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

• uspace/drv/audio/sb16/dsp.c (modified) (18 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -89 +89 @@
 }
 
-static inline int dsp_read(sb_dsp_t *dsp, uint8_t *data)
+static inline errno_t dsp_read(sb_dsp_t *dsp, uint8_t *data)
 {
         assert(data);
@@ -106 +106 @@
 }
 
-static inline int dsp_write(sb_dsp_t *dsp, uint8_t data)
+static inline errno_t dsp_write(sb_dsp_t *dsp, uint8_t data)
 {
         assert(dsp);
@@ -159 +159 @@
 }
 
-static inline int setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
+static inline errno_t setup_dma(sb_dsp_t *dsp, uintptr_t pa, size_t size)
 {
         async_sess_t *sess = ddf_dev_parent_sess_get(dsp->sb_dev);
@@ -168 +168 @@
 }
 
-static inline int setup_buffer(sb_dsp_t *dsp, size_t size)
+static inline errno_t setup_buffer(sb_dsp_t *dsp, size_t size)
 {
         assert(dsp);
@@ -178 +178 @@
         void *buffer = AS_AREA_ANY;
         
-        int ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff,
+        errno_t ret = dmamem_map_anonymous(size, DMAMEM_16MiB | 0x0000ffff,
             AS_AREA_WRITE | AS_AREA_READ, 0, &pa, &buffer);
         if (ret != EOK) {
@@ -202 +202 @@
 }
 
-int sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
+errno_t sb_dsp_init(sb_dsp_t *dsp, sb16_regs_t *regs, ddf_dev_t *dev,
     int dma8, int dma16)
 {
@@ -215 +215 @@
         dsp_reset(dsp);
         uint8_t response;
-        const int ret = dsp_read(dsp, &response);
+        const errno_t ret = dsp_read(dsp, &response);
         if (ret != EOK) {
                 ddf_log_error("Failed to read DSP reset response value.");
@@ -294 +294 @@
 }
 
-int sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos)
+errno_t sb_dsp_get_buffer_position(sb_dsp_t *dsp, size_t *pos)
 {
         if (dsp->state == DSP_NO_BUFFER)
@@ -304 +304 @@
         // TODO: Assumes DMA 16
         size_t remain;
-        int rc = hw_res_dma_channel_remain(sess, dsp->dma16_channel, &remain);
+        errno_t rc = hw_res_dma_channel_remain(sess, dsp->dma16_channel, &remain);
         if (rc == EOK) {
                 *pos = dsp->buffer.size - remain;
@@ -311 +311 @@
 }
 
-int sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
+errno_t sb_dsp_test_format(sb_dsp_t *dsp, unsigned *channels, unsigned *rate,
   pcm_sample_format_t *format)
 {
-        int ret = EOK;
+        errno_t ret = EOK;
         if (*channels == 0 || *channels > 2) {
                 *channels = 2;
@@ -336 +336 @@
 }
 
-int sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session)
+errno_t sb_dsp_set_event_session(sb_dsp_t *dsp, async_sess_t *session)
 {
         assert(dsp);
@@ -353 +353 @@
 }
 
-int sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size)
+errno_t sb_dsp_get_buffer(sb_dsp_t *dsp, void **buffer, size_t *size)
 {
         assert(dsp);
@@ -364 +364 @@
         assert(dsp->buffer.data == NULL);
 
-        const int ret = setup_buffer(dsp, *size);
+        const errno_t ret = setup_buffer(dsp, *size);
         if (ret == EOK) {
                 ddf_log_debug("Providing buffer: %p, %zu B.",
@@ -378 +378 @@
 }
 
-int sb_dsp_release_buffer(sb_dsp_t *dsp)
+errno_t sb_dsp_release_buffer(sb_dsp_t *dsp)
 {
         assert(dsp);
@@ -392 +392 @@
 }
 
-int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
+errno_t sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
@@ -441 +441 @@
 }
 
-int sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate)
+errno_t sb_dsp_stop_playback(sb_dsp_t *dsp, bool immediate)
 {
         assert(dsp);
@@ -471 +471 @@
 }
 
-int sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
+errno_t sb_dsp_start_capture(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
@@ -517 +517 @@
 }
 
-int sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate)
+errno_t sb_dsp_stop_capture(sb_dsp_t *dsp, bool immediate)
 {
         assert(dsp);