mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-01-24 01:09:38 -05:00
Accessiblity: speakup_decpc: specifying the default driver parameters among the module params
This is an enhancement which allows to specify the default driver parameters among the module parameters. Adding default variables to the speakup_decpc module allows to easily set that at boot, rather than setting the sys variables after boot. More details can be found here: https://github.com/linux-speakup/speakup/issues/7 Signed-off-by: Osama Muhammad <osmtendev@gmail.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Link: https://lore.kernel.org/r/20221109215108.7933-7-osmtendev@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
f613f00eb0
commit
b75cfeb116
1 changed files with 38 additions and 10 deletions
|
@ -134,16 +134,27 @@ static int synth_portlist[] = { 0x340, 0x350, 0x240, 0x250, 0 };
|
|||
static int in_escape, is_flushing;
|
||||
static int dt_stat, dma_state;
|
||||
|
||||
static struct var_t vars[] = {
|
||||
{ CAPS_START, .u.s = {"[:dv ap 200]" } },
|
||||
{ CAPS_STOP, .u.s = {"[:dv ap 100]" } },
|
||||
{ RATE, .u.n = {"[:ra %d]", 9, 0, 18, 150, 25, NULL } },
|
||||
{ PITCH, .u.n = {"[:dv ap %d]", 80, 0, 100, 20, 0, NULL } },
|
||||
{ INFLECTION, .u.n = {"[:dv pr %d] ", 100, 0, 10000, 0, 0, NULL } },
|
||||
{ VOL, .u.n = {"[:vo se %d]", 5, 0, 9, 5, 10, NULL } },
|
||||
{ PUNCT, .u.n = {"[:pu %c]", 0, 0, 2, 0, 0, "nsa" } },
|
||||
{ VOICE, .u.n = {"[:n%c]", 0, 0, 9, 0, 0, "phfdburwkv" } },
|
||||
{ DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
|
||||
|
||||
enum default_vars_id {
|
||||
CAPS_START_ID = 0, CAPS_STOP_ID,
|
||||
RATE_ID, PITCH_ID, INFLECTION_ID,
|
||||
VOL_ID, PUNCT_ID, VOICE_ID,
|
||||
DIRECT_ID, V_LAST_VAR_ID,
|
||||
NB_ID,
|
||||
};
|
||||
|
||||
|
||||
|
||||
static struct var_t vars[NB_ID] = {
|
||||
[CAPS_START_ID] = { CAPS_START, .u.s = {"[:dv ap 200]" } },
|
||||
[CAPS_STOP_ID] = { CAPS_STOP, .u.s = {"[:dv ap 100]" } },
|
||||
[RATE_ID] = { RATE, .u.n = {"[:ra %d]", 9, 0, 18, 150, 25, NULL } },
|
||||
[PITCH_ID] = { PITCH, .u.n = {"[:dv ap %d]", 80, 0, 100, 20, 0, NULL } },
|
||||
[INFLECTION_ID] = { INFLECTION, .u.n = {"[:dv pr %d] ", 100, 0, 10000, 0, 0, NULL } },
|
||||
[VOL_ID] = { VOL, .u.n = {"[:vo se %d]", 5, 0, 9, 5, 10, NULL } },
|
||||
[PUNCT_ID] = { PUNCT, .u.n = {"[:pu %c]", 0, 0, 2, 0, 0, "nsa" } },
|
||||
[VOICE_ID] = { VOICE, .u.n = {"[:n%c]", 0, 0, 9, 0, 0, "phfdburwkv" } },
|
||||
[DIRECT_ID] = { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
|
||||
V_LAST_VAR
|
||||
};
|
||||
|
||||
|
@ -483,8 +494,25 @@ static void dtpc_release(struct spk_synth *synth)
|
|||
}
|
||||
|
||||
module_param_named(start, synth_dec_pc.startup, short, 0444);
|
||||
module_param_named(rate, vars[RATE_ID].u.n.default_val, int, 0444);
|
||||
module_param_named(pitch, vars[PITCH_ID].u.n.default_val, int, 0444);
|
||||
module_param_named(inflection, vars[INFLECTION_ID].u.n.default_val, int, 0444);
|
||||
module_param_named(vol, vars[VOL_ID].u.n.default_val, int, 0444);
|
||||
module_param_named(punct, vars[PUNCT_ID].u.n.default_val, int, 0444);
|
||||
module_param_named(voice, vars[VOICE_ID].u.n.default_val, int, 0444);
|
||||
module_param_named(direct, vars[DIRECT_ID].u.n.default_val, int, 0444);
|
||||
|
||||
|
||||
|
||||
|
||||
MODULE_PARM_DESC(start, "Start the synthesizer once it is loaded.");
|
||||
MODULE_PARM_DESC(rate, "Set the rate variable on load.");
|
||||
MODULE_PARM_DESC(pitch, "Set the pitch variable on load.");
|
||||
MODULE_PARM_DESC(inflection, "Set the inflection variable on load.");
|
||||
MODULE_PARM_DESC(vol, "Set the vol variable on load.");
|
||||
MODULE_PARM_DESC(punct, "Set the punct variable on load.");
|
||||
MODULE_PARM_DESC(voice, "Set the voice variable on load.");
|
||||
MODULE_PARM_DESC(direct, "Set the direct variable on load.");
|
||||
|
||||
module_spk_synth(synth_dec_pc);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue