Accessiblity: speakup: specifying the default driver parameters among the module params
PATCH 1/1 Accessiblity: speakup: 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 a default variables to the speakup_soft 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
--- drivers/accessibility/speakup/speakup_soft.c | 34 +++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)
drivers/accessibility/speakup/speakup_soft.c +33 -1
@@ -33,6 +33,15 @@ static struct miscdevice synth_device, synthu_device;static int init_pos;static int misc_registered; + +enum default_vars_id { +DIRECT_ID =0 ,CAPS_START_ID ,CAPS_STOP_ID , +PAUSE_ID ,RATE_ID ,PITCH_ID ,INFLECTION_ID , +VOL_ID ,TONE_ID ,PUNCT_ID ,VOICE_ID , +FREQUENCY_ID , +}; + +static struct var_t vars[] = {/* DIRECT is put first so that module_param_named can access it easily */ {DIRECT , .u.n = {NULL ,0 ,0 ,1 ,0 ,0 ,NULL } },
@@ -451,10 +460,33 @@ static int softsynth_adjust(struct spk_synth *synth, struct st_var_header *var) }module_param_named (start, synth_soft.startup, short,0444 ); -module_param_named (direct, vars[0 ].u.n.default_val, int,0444 ); +module_param_named (direct, vars[DIRECT_ID ].u.n.default_val, int,0444 ); +module_param_named (caps_start, vars[CAPS_START_ID ].u.s.default_val, charp,0444 ); +module_param_named (caps_stop, vars[CAPS_STOP_ID ].u.s.default_val, charp,0444 ); +module_param_named (pause, vars[PAUSE_ID ].u.n.default_val, int,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 (tone, vars[TONE_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 (frequency, vars[FREQUENCY_ID ].u.n.default_val, int,0444 ); + +MODULE_PARM_DESC (start,"Start the synthesizer once it is loaded." );MODULE_PARM_DESC (direct,"Set the direct variable on load." ); +MODULE_PARM_DESC (caps_start,"Set the caps_start variable on load." ); +MODULE_PARM_DESC (caps_stop,"Set the caps_stop variable on load." ); +MODULE_PARM_DESC (rate,"Sets the rate of the synthesizer." ); +MODULE_PARM_DESC (pitch,"Sets the pitch of the synthesizer." ); +MODULE_PARM_DESC (inflection,"Sets the inflection of the synthesizer." ); +MODULE_PARM_DESC (vol,"Sets the volume of the speech synthesizer." ); +MODULE_PARM_DESC (tone,"Sets the tone of the speech synthesizer." ); +MODULE_PARM_DESC (punct,"Sets the amount of punctuation spoken by the synthesizer." ); +MODULE_PARM_DESC (voice,"Sets the voice used by the synthesizer." ); +MODULE_PARM_DESC (frequency,"Sets the frequency of speech synthesizer." );module_spk_synth (synth_soft);
Signature · 1 line
2.25.1
Samuel Thibault
maintainerHello,
Osama Muhammad, le jeu. 13 oct. 2022 01:47:23 +0500, a ecrit:
drivers/accessibility/speakup/speakup_soft.c static int softsynth_adjust(struct spk_synth *synth, struct st_var_header *var)
Quoted 12 lines
drivers/accessibility/speakup/speakup_soft.c +8
-0+enum default_vars_id { +DIRECT_ID =0 ,CAPS_START_ID ,CAPS_STOP_ID , +PAUSE_ID ,RATE_ID ,PITCH_ID ,INFLECTION_ID , +VOL_ID ,TONE_ID ,PUNCT_ID ,VOICE_ID , +FREQUENCY_ID , +}; + +static struct var_t vars[] = {/* DIRECT is put first so that module_param_named can access it easily */ {DIRECT , .u.n = {NULL ,0 ,0 ,1 ,0 ,0 ,NULL } },@@ -451,10 +460,33 @@ static int softsynth_adjust(struct spk_synth *synth, struct st_var_header *var)
We need to make sure that the entries in vars are in the same order, so use
[DIRECT_ID] = { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
etc. to make sure that the indexes are correct. Also add NB_ID as last member of the enum, and use it for the "vars" array length, so we're sure we're not missing anything.
Quoted 4 lines
drivers/accessibility/speakup/speakup_soft.c +2
-1module_param_named (start, synth_soft.startup, short,0444 ); -module_param_named (direct, vars[0 ].u.n.default_val, int,0444 ); +module_param_named (direct, vars[DIRECT_ID ].u.n.default_val, int,0444 ); +module_param_named (caps_start, vars[CAPS_START_ID ].u.s.default_val, charp,0444 );
drivers/accessibility/speakup/speakup_soft.c static int softsynth_adjust(struct spk_synth *synth, struct st_var_header *var) · line 474
Quoted 10 lines
drivers/accessibility/speakup/speakup_soft.c +10
-0+module_param_named (caps_stop, vars[CAPS_STOP_ID ].u.s.default_val, charp,0444 ); +module_param_named (pause, vars[PAUSE_ID ].u.n.default_val, int,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 (tone, vars[TONE_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 (frequency, vars[FREQUENCY_ID ].u.n.default_val, int,0444 );
Not all vars make sense as parameters: caps_start, caps_stop and pause are not actually tunable, so don't add a parameter for them.
Samuel