From c268a4bf560790dff0b42dd77793d7e5adb9bd5f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 21 Dec 2000 21:52:40 +0000 Subject: [PATCH] Removed dig_info & dig_params.. --- aserver/aserver.c | 6 ------ include/aserver.h | 2 -- include/pcm.h | 2 -- src/pcm/pcm.c | 12 ------------ src/pcm/pcm_adpcm.c | 2 -- src/pcm/pcm_alaw.c | 2 -- src/pcm/pcm_copy.c | 2 -- src/pcm/pcm_file.c | 14 -------------- src/pcm/pcm_hw.c | 24 ------------------------ src/pcm/pcm_linear.c | 2 -- src/pcm/pcm_local.h | 2 -- src/pcm/pcm_mulaw.c | 2 -- src/pcm/pcm_multi.c | 14 -------------- src/pcm/pcm_null.c | 13 ------------- src/pcm/pcm_params.c | 9 --------- src/pcm/pcm_plug.c | 15 --------------- src/pcm/pcm_plugin.c | 12 ------------ src/pcm/pcm_plugin.h | 2 -- src/pcm/pcm_rate.c | 2 -- src/pcm/pcm_route.c | 2 -- src/pcm/pcm_share.c | 26 -------------------------- src/pcm/pcm_shm.c | 30 ------------------------------ 22 files changed, 197 deletions(-) diff --git a/aserver/aserver.c b/aserver/aserver.c index cf8119ce..ebedb059 100644 --- a/aserver/aserver.c +++ b/aserver/aserver.c @@ -388,12 +388,6 @@ int pcm_shm_cmd(client_t *client) case SND_PCM_IOCTL_SW_PARAMS: ctrl->result = snd_pcm_sw_params(pcm, (snd_pcm_sw_params_t *) &ctrl->u.sw_params); break; - case SND_PCM_IOCTL_DIG_PARAMS: - ctrl->result = snd_pcm_dig_params(pcm, (snd_pcm_dig_params_t *) &ctrl->u.dig_params); - break; - case SND_PCM_IOCTL_DIG_INFO: - ctrl->result = snd_pcm_dig_info(pcm, (snd_pcm_dig_info_t *) &ctrl->u.dig_info); - break; case SND_PCM_IOCTL_STATUS: ctrl->result = snd_pcm_status(pcm, (snd_pcm_status_t *) &ctrl->u.status); break; diff --git a/include/aserver.h b/include/aserver.h index f66944c7..209f4425 100644 --- a/include/aserver.h +++ b/include/aserver.h @@ -45,8 +45,6 @@ typedef struct { snd_pcm_hw_params_t hw_refine; snd_pcm_hw_params_t hw_params; snd_pcm_sw_params_t sw_params; - snd_pcm_dig_params_t dig_params; - snd_pcm_dig_info_t dig_info; snd_pcm_status_t status; struct { ssize_t frames; diff --git a/include/pcm.h b/include/pcm.h index 01ba3149..c5d49af5 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -59,8 +59,6 @@ int snd_pcm_async(snd_pcm_t *pcm, int sig, pid_t pid); int snd_pcm_info(snd_pcm_t *pcm, snd_pcm_info_t *info); int snd_pcm_hw_refine(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); int snd_pcm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params); -int snd_pcm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info); -int snd_pcm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params); int snd_pcm_status(snd_pcm_t *pcm, snd_pcm_status_t *status); int snd_pcm_prepare(snd_pcm_t *pcm); int snd_pcm_reset(snd_pcm_t *pcm); diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 7de083cb..bb96a900 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -112,18 +112,6 @@ int snd_pcm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params) return 0; } -int snd_pcm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params) -{ - assert(pcm && params); - return pcm->ops->dig_params(pcm->op_arg, params); -} - -int snd_pcm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info) -{ - assert(pcm && info); - return pcm->ops->dig_info(pcm->op_arg, info); -} - int snd_pcm_status(snd_pcm_t *pcm, snd_pcm_status_t *status) { assert(pcm && status); diff --git a/src/pcm/pcm_adpcm.c b/src/pcm/pcm_adpcm.c index 2946b48e..18307132 100644 --- a/src/pcm/pcm_adpcm.c +++ b/src/pcm/pcm_adpcm.c @@ -536,8 +536,6 @@ snd_pcm_ops_t snd_pcm_adpcm_ops = { hw_refine: snd_pcm_adpcm_hw_refine, hw_params: snd_pcm_adpcm_hw_params, sw_params: snd_pcm_plugin_sw_params, - dig_info: snd_pcm_plugin_dig_info, - dig_params: snd_pcm_plugin_dig_params, channel_info: snd_pcm_plugin_channel_info, dump: snd_pcm_adpcm_dump, nonblock: snd_pcm_plugin_nonblock, diff --git a/src/pcm/pcm_alaw.c b/src/pcm/pcm_alaw.c index d29dab8f..6459b0b5 100644 --- a/src/pcm/pcm_alaw.c +++ b/src/pcm/pcm_alaw.c @@ -404,8 +404,6 @@ snd_pcm_ops_t snd_pcm_alaw_ops = { hw_refine: snd_pcm_alaw_hw_refine, hw_params: snd_pcm_alaw_hw_params, sw_params: snd_pcm_plugin_sw_params, - dig_info: snd_pcm_plugin_dig_info, - dig_params: snd_pcm_plugin_dig_params, channel_info: snd_pcm_plugin_channel_info, dump: snd_pcm_alaw_dump, nonblock: snd_pcm_plugin_nonblock, diff --git a/src/pcm/pcm_copy.c b/src/pcm/pcm_copy.c index 4a9ea503..25773dfa 100644 --- a/src/pcm/pcm_copy.c +++ b/src/pcm/pcm_copy.c @@ -162,8 +162,6 @@ snd_pcm_ops_t snd_pcm_copy_ops = { hw_refine: snd_pcm_copy_hw_refine, hw_params: snd_pcm_copy_hw_params, sw_params: snd_pcm_plugin_sw_params, - dig_info: snd_pcm_plugin_dig_info, - dig_params: snd_pcm_plugin_dig_params, channel_info: snd_pcm_plugin_channel_info, dump: snd_pcm_copy_dump, nonblock: snd_pcm_plugin_nonblock, diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index bd464cb7..55ca5693 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -272,18 +272,6 @@ static int snd_pcm_file_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params) return snd_pcm_sw_params(file->slave, params); } -static int snd_pcm_file_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info) -{ - snd_pcm_file_t *file = pcm->private; - return snd_pcm_dig_info(file->slave, info); -} - -static int snd_pcm_file_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params) -{ - snd_pcm_file_t *file = pcm->private; - return snd_pcm_dig_params(file->slave, params); -} - static int snd_pcm_file_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED) { snd_pcm_file_t *file = pcm->private; @@ -317,8 +305,6 @@ snd_pcm_ops_t snd_pcm_file_ops = { hw_refine: snd_pcm_file_hw_refine, hw_params: snd_pcm_file_hw_params, sw_params: snd_pcm_file_sw_params, - dig_info: snd_pcm_file_dig_info, - dig_params: snd_pcm_file_dig_params, channel_info: snd_pcm_file_channel_info, dump: snd_pcm_file_dump, nonblock: snd_pcm_file_nonblock, diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index 78e1ecf3..63dea446 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -153,28 +153,6 @@ static int snd_pcm_hw_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params) return 0; } -static int snd_pcm_hw_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info) -{ - snd_pcm_hw_t *hw = pcm->private; - int fd = hw->fd; - if (ioctl(fd, SND_PCM_IOCTL_DIG_INFO, info) < 0) { - SYSERR("SND_PCM_IOCTL_DIG_INFO failed"); - return -errno; - } - return 0; -} - -static int snd_pcm_hw_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params) -{ - snd_pcm_hw_t *hw = pcm->private; - int fd = hw->fd; - if (ioctl(fd, SND_PCM_IOCTL_DIG_PARAMS, params) < 0) { - SYSERR("SND_PCM_IOCTL_DIG_PARAMS failed"); - return -errno; - } - return 0; -} - static int snd_pcm_hw_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t * info) { snd_pcm_hw_t *hw = pcm->private; @@ -525,8 +503,6 @@ snd_pcm_ops_t snd_pcm_hw_ops = { hw_refine: snd_pcm_hw_hw_refine, hw_params: snd_pcm_hw_hw_params, sw_params: snd_pcm_hw_sw_params, - dig_info: snd_pcm_hw_dig_info, - dig_params: snd_pcm_hw_dig_params, channel_info: snd_pcm_hw_channel_info, dump: snd_pcm_hw_dump, nonblock: snd_pcm_hw_nonblock, diff --git a/src/pcm/pcm_linear.c b/src/pcm/pcm_linear.c index 0647ee07..9ecb5252 100644 --- a/src/pcm/pcm_linear.c +++ b/src/pcm/pcm_linear.c @@ -243,8 +243,6 @@ snd_pcm_ops_t snd_pcm_linear_ops = { hw_refine: snd_pcm_linear_hw_refine, hw_params: snd_pcm_linear_hw_params, sw_params: snd_pcm_plugin_sw_params, - dig_info: snd_pcm_plugin_dig_info, - dig_params: snd_pcm_plugin_dig_params, channel_info: snd_pcm_plugin_channel_info, dump: snd_pcm_linear_dump, nonblock: snd_pcm_plugin_nonblock, diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h index 0bf9796b..6bfdb707 100644 --- a/src/pcm/pcm_local.h +++ b/src/pcm/pcm_local.h @@ -62,8 +62,6 @@ typedef struct { int (*hw_refine)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); int (*hw_params)(snd_pcm_t *pcm, snd_pcm_hw_params_t *params); int (*sw_params)(snd_pcm_t *pcm, snd_pcm_sw_params_t *params); - int (*dig_info)(snd_pcm_t *pcm, snd_pcm_dig_info_t *info); - int (*dig_params)(snd_pcm_t *pcm, snd_pcm_dig_params_t *params); int (*channel_info)(snd_pcm_t *pcm, snd_pcm_channel_info_t *info); void (*dump)(snd_pcm_t *pcm, FILE *fp); int (*mmap)(snd_pcm_t *pcm); diff --git a/src/pcm/pcm_mulaw.c b/src/pcm/pcm_mulaw.c index 4b937911..ec0642f1 100644 --- a/src/pcm/pcm_mulaw.c +++ b/src/pcm/pcm_mulaw.c @@ -421,8 +421,6 @@ snd_pcm_ops_t snd_pcm_mulaw_ops = { hw_refine: snd_pcm_mulaw_hw_refine, hw_params: snd_pcm_mulaw_hw_params, sw_params: snd_pcm_plugin_sw_params, - dig_info: snd_pcm_plugin_dig_info, - dig_params: snd_pcm_plugin_dig_params, channel_info: snd_pcm_plugin_channel_info, dump: snd_pcm_mulaw_dump, nonblock: snd_pcm_plugin_nonblock, diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c index 57578a3e..f36dd222 100644 --- a/src/pcm/pcm_multi.c +++ b/src/pcm/pcm_multi.c @@ -220,18 +220,6 @@ static int snd_pcm_multi_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params) return 0; } -static int snd_pcm_multi_dig_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_info_t *info ATTRIBUTE_UNUSED) -{ - /* FIXME */ - return -ENOSYS; -} - -static int snd_pcm_multi_dig_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_params_t *params ATTRIBUTE_UNUSED) -{ - /* FIXME */ - return -ENOSYS; -} - static int snd_pcm_multi_status(snd_pcm_t *pcm, snd_pcm_status_t *status) { snd_pcm_multi_t *multi = pcm->private; @@ -406,8 +394,6 @@ snd_pcm_ops_t snd_pcm_multi_ops = { hw_refine: snd_pcm_multi_hw_refine, hw_params: snd_pcm_multi_hw_params, sw_params: snd_pcm_multi_sw_params, - dig_info: snd_pcm_multi_dig_info, - dig_params: snd_pcm_multi_dig_params, channel_info: snd_pcm_multi_channel_info, dump: snd_pcm_multi_dump, nonblock: snd_pcm_multi_nonblock, diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c index bdedd22f..171a79e4 100644 --- a/src/pcm/pcm_null.c +++ b/src/pcm/pcm_null.c @@ -234,7 +234,6 @@ static int snd_pcm_null_hw_refine(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_hw_pa { _snd_pcm_hw_refine(params); params->fifo_size = 0; - params->dig_groups = 0; return 0; } @@ -260,16 +259,6 @@ static int snd_pcm_null_sw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_sw_pa return 0; } -static int snd_pcm_null_dig_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_params_t *params ATTRIBUTE_UNUSED) -{ - return 0; -} - -static int snd_pcm_null_dig_info(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_dig_info_t *info ATTRIBUTE_UNUSED) -{ - return 0; -} - static int snd_pcm_null_mmap(snd_pcm_t *pcm) { snd_pcm_null_t *null = pcm->private; @@ -310,8 +299,6 @@ snd_pcm_ops_t snd_pcm_null_ops = { hw_refine: snd_pcm_null_hw_refine, hw_params: snd_pcm_null_hw_params, sw_params: snd_pcm_null_sw_params, - dig_params: snd_pcm_null_dig_params, - dig_info: snd_pcm_null_dig_info, channel_info: snd_pcm_null_channel_info, dump: snd_pcm_null_dump, nonblock: snd_pcm_null_nonblock, diff --git a/src/pcm/pcm_params.c b/src/pcm/pcm_params.c index b944ed9c..3adab781 100644 --- a/src/pcm/pcm_params.c +++ b/src/pcm/pcm_params.c @@ -93,7 +93,6 @@ void _snd_pcm_hw_params_any(snd_pcm_hw_params_t *params) interval_setreal(params_interval(params, SND_PCM_HW_PARAM_FRAGMENT_LENGTH)); interval_setreal(params_interval(params, SND_PCM_HW_PARAM_BUFFER_LENGTH)); params->info = ~0U; - params->dig_groups = UINT_MAX; } /* Fill PARAMS with full configuration space boundaries */ @@ -606,14 +605,6 @@ int snd_pcm_hw_params_info_fifo_size(const snd_pcm_hw_params_t *params) return params->fifo_size; } -/* Return count of digital groups for configuration space defined by PARAMS */ -int snd_pcm_hw_params_info_dig_groups(const snd_pcm_hw_params_t *params) -{ - if (params->dig_groups == UINT_MAX) - return -EINVAL; - return params->dig_groups; -} - /* Choose one configuration from configuration space defined by PARAMS The configuration choosen is that obtained fixing in this order: first access diff --git a/src/pcm/pcm_plug.c b/src/pcm/pcm_plug.c index 1a833f5b..0019c6e2 100644 --- a/src/pcm/pcm_plug.c +++ b/src/pcm/pcm_plug.c @@ -620,19 +620,6 @@ static int snd_pcm_plug_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params) return err; } -static int snd_pcm_plug_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info) -{ - snd_pcm_plug_t *plug = pcm->private; - return snd_pcm_dig_info(plug->slave, info); -} - -static int snd_pcm_plug_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params) -{ - snd_pcm_plug_t *plug = pcm->private; - return snd_pcm_dig_params(plug->slave, params); -} - - static int snd_pcm_plug_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info) { snd_pcm_plug_t *plug = pcm->private; @@ -662,8 +649,6 @@ snd_pcm_ops_t snd_pcm_plug_ops = { hw_refine: snd_pcm_plug_hw_refine, hw_params: snd_pcm_plug_hw_params, sw_params: snd_pcm_plug_sw_params, - dig_info: snd_pcm_plug_dig_info, - dig_params: snd_pcm_plug_dig_params, channel_info: snd_pcm_plug_channel_info, dump: snd_pcm_plug_dump, nonblock: snd_pcm_plug_nonblock, diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index d8d36232..342cbe27 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c @@ -58,18 +58,6 @@ int snd_pcm_plugin_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params) return snd_pcm_sw_params(plugin->slave, params); } -int snd_pcm_plugin_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info) -{ - snd_pcm_plugin_t *plugin = pcm->private; - return snd_pcm_dig_info(plugin->slave, info); -} - -int snd_pcm_plugin_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params) -{ - snd_pcm_plugin_t *plugin = pcm->private; - return snd_pcm_dig_params(plugin->slave, params); -} - int snd_pcm_plugin_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t *info) { snd_pcm_plugin_t *plugin = pcm->private; diff --git a/src/pcm/pcm_plugin.h b/src/pcm/pcm_plugin.h index 1cab1044..cf58714e 100644 --- a/src/pcm/pcm_plugin.h +++ b/src/pcm/pcm_plugin.h @@ -35,8 +35,6 @@ int snd_pcm_plugin_nonblock(snd_pcm_t *pcm, int nonblock); int snd_pcm_plugin_async(snd_pcm_t *pcm, int sig, pid_t pid); int snd_pcm_plugin_info(snd_pcm_t *pcm, snd_pcm_info_t * info); int snd_pcm_plugin_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t *params); -int snd_pcm_plugin_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info); -int snd_pcm_plugin_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params); int snd_pcm_plugin_channel_info(snd_pcm_t *pcm, snd_pcm_channel_info_t * info); int snd_pcm_plugin_status(snd_pcm_t *pcm, snd_pcm_status_t * status); int snd_pcm_plugin_state(snd_pcm_t *pcm); diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 74dfbdb3..ffb9349c 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -515,8 +515,6 @@ snd_pcm_ops_t snd_pcm_rate_ops = { hw_refine: snd_pcm_rate_hw_refine, hw_params: snd_pcm_rate_hw_params, sw_params: snd_pcm_rate_sw_params, - dig_info: snd_pcm_plugin_dig_info, - dig_params: snd_pcm_plugin_dig_params, channel_info: snd_pcm_plugin_channel_info, dump: snd_pcm_rate_dump, nonblock: snd_pcm_plugin_nonblock, diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c index cbebad8b..3aec22a2 100644 --- a/src/pcm/pcm_route.c +++ b/src/pcm/pcm_route.c @@ -664,8 +664,6 @@ snd_pcm_ops_t snd_pcm_route_ops = { hw_refine: snd_pcm_route_hw_refine, hw_params: snd_pcm_route_hw_params, sw_params: snd_pcm_plugin_sw_params, - dig_info: snd_pcm_plugin_dig_info, - dig_params: snd_pcm_plugin_dig_params, channel_info: snd_pcm_plugin_channel_info, dump: snd_pcm_route_dump, nonblock: snd_pcm_plugin_nonblock, diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c index 0bf9d664..071f59f0 100644 --- a/src/pcm/pcm_share.c +++ b/src/pcm/pcm_share.c @@ -591,30 +591,6 @@ static int snd_pcm_share_sw_params(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_sw_p return 0; } -static int snd_pcm_share_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t *info) -{ - snd_pcm_share_t *share = pcm->private; - snd_pcm_share_slave_t *slave = share->slave; - int err; - /* FIXME */ - Pthread_mutex_lock(&slave->mutex); - err = snd_pcm_dig_info(slave->pcm, info); - Pthread_mutex_unlock(&slave->mutex); - return err; -} - -static int snd_pcm_share_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t *params) -{ - snd_pcm_share_t *share = pcm->private; - snd_pcm_share_slave_t *slave = share->slave; - int err; - /* FIXME */ - Pthread_mutex_lock(&slave->mutex); - err = snd_pcm_dig_params(slave->pcm, params); - Pthread_mutex_unlock(&slave->mutex); - return err; -} - static int snd_pcm_share_status(snd_pcm_t *pcm, snd_pcm_status_t *status) { snd_pcm_share_t *share = pcm->private; @@ -1110,8 +1086,6 @@ snd_pcm_ops_t snd_pcm_share_ops = { hw_refine: snd_pcm_share_hw_refine, hw_params: snd_pcm_share_hw_params, sw_params: snd_pcm_share_sw_params, - dig_info: snd_pcm_share_dig_info, - dig_params: snd_pcm_share_dig_params, channel_info: snd_pcm_share_channel_info, dump: snd_pcm_share_dump, nonblock: snd_pcm_share_nonblock, diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c index cac1108d..c9e73057 100644 --- a/src/pcm/pcm_shm.c +++ b/src/pcm/pcm_shm.c @@ -217,34 +217,6 @@ static int snd_pcm_shm_sw_params(snd_pcm_t *pcm, snd_pcm_sw_params_t * params) return err; } -static int snd_pcm_shm_dig_info(snd_pcm_t *pcm, snd_pcm_dig_info_t * info) -{ - snd_pcm_shm_t *shm = pcm->private; - volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl; - int err; - ctrl->cmd = SND_PCM_IOCTL_DIG_INFO; - ctrl->u.dig_info = *info; - err = snd_pcm_shm_action(pcm); - if (err < 0) - return err; - *info = ctrl->u.dig_info; - return err; -} - -static int snd_pcm_shm_dig_params(snd_pcm_t *pcm, snd_pcm_dig_params_t * params) -{ - snd_pcm_shm_t *shm = pcm->private; - volatile snd_pcm_shm_ctrl_t *ctrl = shm->ctrl; - int err; - ctrl->cmd = SND_PCM_IOCTL_DIG_PARAMS; - ctrl->u.dig_params = *params; - err = snd_pcm_shm_action(pcm); - *params = ctrl->u.dig_params; - if (err < 0) - return err; - return err; -} - static int snd_pcm_shm_mmap(snd_pcm_t *pcm ATTRIBUTE_UNUSED) { return 0; @@ -474,8 +446,6 @@ snd_pcm_ops_t snd_pcm_shm_ops = { hw_refine: snd_pcm_shm_hw_refine, hw_params: snd_pcm_shm_hw_params, sw_params: snd_pcm_shm_sw_params, - dig_info: snd_pcm_shm_dig_info, - dig_params: snd_pcm_shm_dig_params, channel_info: snd_pcm_shm_channel_info, dump: snd_pcm_shm_dump, nonblock: snd_pcm_shm_nonblock, -- 2.47.3