aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Farrugia <mark.farrugia@fiberdyne.com.au>2019-04-03 17:55:13 +1100
committerMark Farrugia <mark.farrugia@fiberdyne.com.au>2019-04-04 10:32:43 +1100
commitc6e6cf2c36b08504bae115ddab97b45abc3750c7 (patch)
tree99fa51b9f5b8a1d0ad6cf2cdf61bc640feb2f1e1
parentf415e56c855c97a1bb0179734f649a623b209f65 (diff)
Refactor 'sealed' to 'configured', as per kernel module
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
-rw-r--r--include/avirt/avirt.h4
-rw-r--r--src/avirt-config.c22
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);