Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Osama Muhammad and committed by
Greg Kroah-Hartman
b75cfeb1 f613f00e

+38 -10
+38 -10
drivers/accessibility/speakup/speakup_decpc.c
··· 134 134 static int in_escape, is_flushing; 135 135 static int dt_stat, dma_state; 136 136 137 - static struct var_t vars[] = { 138 - { CAPS_START, .u.s = {"[:dv ap 200]" } }, 139 - { CAPS_STOP, .u.s = {"[:dv ap 100]" } }, 140 - { RATE, .u.n = {"[:ra %d]", 9, 0, 18, 150, 25, NULL } }, 141 - { PITCH, .u.n = {"[:dv ap %d]", 80, 0, 100, 20, 0, NULL } }, 142 - { INFLECTION, .u.n = {"[:dv pr %d] ", 100, 0, 10000, 0, 0, NULL } }, 143 - { VOL, .u.n = {"[:vo se %d]", 5, 0, 9, 5, 10, NULL } }, 144 - { PUNCT, .u.n = {"[:pu %c]", 0, 0, 2, 0, 0, "nsa" } }, 145 - { VOICE, .u.n = {"[:n%c]", 0, 0, 9, 0, 0, "phfdburwkv" } }, 146 - { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } }, 137 + 138 + enum default_vars_id { 139 + CAPS_START_ID = 0, CAPS_STOP_ID, 140 + RATE_ID, PITCH_ID, INFLECTION_ID, 141 + VOL_ID, PUNCT_ID, VOICE_ID, 142 + DIRECT_ID, V_LAST_VAR_ID, 143 + NB_ID, 144 + }; 145 + 146 + 147 + 148 + static struct var_t vars[NB_ID] = { 149 + [CAPS_START_ID] = { CAPS_START, .u.s = {"[:dv ap 200]" } }, 150 + [CAPS_STOP_ID] = { CAPS_STOP, .u.s = {"[:dv ap 100]" } }, 151 + [RATE_ID] = { RATE, .u.n = {"[:ra %d]", 9, 0, 18, 150, 25, NULL } }, 152 + [PITCH_ID] = { PITCH, .u.n = {"[:dv ap %d]", 80, 0, 100, 20, 0, NULL } }, 153 + [INFLECTION_ID] = { INFLECTION, .u.n = {"[:dv pr %d] ", 100, 0, 10000, 0, 0, NULL } }, 154 + [VOL_ID] = { VOL, .u.n = {"[:vo se %d]", 5, 0, 9, 5, 10, NULL } }, 155 + [PUNCT_ID] = { PUNCT, .u.n = {"[:pu %c]", 0, 0, 2, 0, 0, "nsa" } }, 156 + [VOICE_ID] = { VOICE, .u.n = {"[:n%c]", 0, 0, 9, 0, 0, "phfdburwkv" } }, 157 + [DIRECT_ID] = { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } }, 147 158 V_LAST_VAR 148 159 }; 149 160 ··· 494 483 } 495 484 496 485 module_param_named(start, synth_dec_pc.startup, short, 0444); 486 + module_param_named(rate, vars[RATE_ID].u.n.default_val, int, 0444); 487 + module_param_named(pitch, vars[PITCH_ID].u.n.default_val, int, 0444); 488 + module_param_named(inflection, vars[INFLECTION_ID].u.n.default_val, int, 0444); 489 + module_param_named(vol, vars[VOL_ID].u.n.default_val, int, 0444); 490 + module_param_named(punct, vars[PUNCT_ID].u.n.default_val, int, 0444); 491 + module_param_named(voice, vars[VOICE_ID].u.n.default_val, int, 0444); 492 + module_param_named(direct, vars[DIRECT_ID].u.n.default_val, int, 0444); 493 + 494 + 495 + 497 496 498 497 MODULE_PARM_DESC(start, "Start the synthesizer once it is loaded."); 498 + MODULE_PARM_DESC(rate, "Set the rate variable on load."); 499 + MODULE_PARM_DESC(pitch, "Set the pitch variable on load."); 500 + MODULE_PARM_DESC(inflection, "Set the inflection variable on load."); 501 + MODULE_PARM_DESC(vol, "Set the vol variable on load."); 502 + MODULE_PARM_DESC(punct, "Set the punct variable on load."); 503 + MODULE_PARM_DESC(voice, "Set the voice variable on load."); 504 + MODULE_PARM_DESC(direct, "Set the direct variable on load."); 499 505 500 506 module_spk_synth(synth_dec_pc); 501 507