From 693aa3ed7c0bd83bd2026ba00ade47c845520fbf Mon Sep 17 00:00:00 2001 From: Mark Farrugia Date: Wed, 3 Apr 2019 17:55:13 +1100 Subject: Refactor 'sealed' to 'configured', as per kernel module Signed-off-by: Mark Farrugia --- include/avirt/avirt.h | 4 ++-- src/avirt-config.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/include/avirt/avirt.h b/include/avirt/avirt.h index 1ebed32..46c2c19 100644 --- a/include/avirt/avirt.h +++ b/include/avirt/avirt.h @@ -104,7 +104,7 @@ int snd_avirt_streams(struct snd_avirt_stream **streams, int *count); int snd_avirt_audiopaths(struct snd_avirt_audiopath **audiopaths, int *count); /** - * snd_avirt_card_seal - Finalize AVIRT stream creation and register sound card + * snd_avirt_card_configure - Finalize AVIRT stream creation and register sound card * @return: 0 on success, negative ERRNO otherwise * * This should be called once all streams have been created via @@ -114,7 +114,7 @@ int snd_avirt_audiopaths(struct snd_avirt_audiopath **audiopaths, int *count); * * NOTE: Once this function is called, no more streams may be added. */ -int snd_avirt_card_seal(); +int snd_avirt_card_configure(); /** * snd_avirt_pcm_info - Get PCM info for a given PCM name diff --git a/src/avirt-config.c b/src/avirt-config.c index 267c727..45a54b7 100644 --- a/src/avirt-config.c +++ b/src/avirt-config.c @@ -100,7 +100,7 @@ } while (0) static bool configfs_mounted = false; -static bool card_sealed = false; +static bool card_configured = false; static int card_index = -1; static int mount_configfs() @@ -216,10 +216,10 @@ static int snd_avirt_configfs_item_new(const char *name, IS_CONFIGFS_MOUNTED(); - // Check if card is already sealed - if (card_sealed) + // Check if card is already configured + if (card_configured) { - AVIRT_ERROR("Card is already sealed!"); + AVIRT_ERROR("Card is already configured!"); return -EPERM; } @@ -468,28 +468,28 @@ int snd_avirt_route_new(const char *name, int channels, int direction, return 0; } -int snd_avirt_card_seal() +int snd_avirt_card_configure() { char cmd[128]; char path_sealed[AVIRT_CONFIGFS_PATH_MAXLEN]; snd_pcm_info_t *route_pcm_info; int err = 0; - // Check if card is already sealed - if (card_sealed) + // Check if card is already configured + if (card_configured) { - AVIRT_ERROR("Card is already sealed!"); + AVIRT_ERROR("Card is already configured!"); return -EPERM; } IS_CONFIGFS_MOUNTED(); strcpy(path_sealed, AVIRT_CONFIGFS_PATH_STREAMS); - strcat(path_sealed, "/sealed"); + strcat(path_sealed, "/configured"); WRITE_TO_PATH(path_sealed, "%d", 1); - AVIRT_DEBUG("Card sealed!"); - card_sealed = true; + AVIRT_DEBUG("Card configured!"); + card_configured = true; if (card_index < 0) card_index = snd_avirt_card_index_get(0); -- cgit 1.2.3-korg