Osama Muhammad, le ven. 21 oct. 2022 18:53:09 +0500, a ecrit: > This is an enhancement which allows to specify the default driver > parameters among the module parameters. > > Adding default variables to the speakup_audptr 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@xxxxxxxxx> Reviewed-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx> Thanks! > --- > .../accessibility/speakup/speakup_audptr.c | 42 +++++++++++++++---- > 1 file changed, 33 insertions(+), 9 deletions(-) > > diff --git a/drivers/accessibility/speakup/speakup_audptr.c b/drivers/accessibility/speakup/speakup_audptr.c > index 4d16d60db9b2..55813f3e40ff 100644 > --- a/drivers/accessibility/speakup/speakup_audptr.c > +++ b/drivers/accessibility/speakup/speakup_audptr.c > @@ -19,15 +19,24 @@ > static int synth_probe(struct spk_synth *synth); > static void synth_flush(struct spk_synth *synth); > > -static struct var_t vars[] = { > - { CAPS_START, .u.s = {"\x05[f99]" } }, > - { CAPS_STOP, .u.s = {"\x05[f80]" } }, > - { RATE, .u.n = {"\x05[r%d]", 10, 0, 20, 100, -10, NULL } }, > - { PITCH, .u.n = {"\x05[f%d]", 80, 39, 4500, 0, 0, NULL } }, > - { VOL, .u.n = {"\x05[g%d]", 21, 0, 40, 0, 0, NULL } }, > - { TONE, .u.n = {"\x05[s%d]", 9, 0, 63, 0, 0, NULL } }, > - { PUNCT, .u.n = {"\x05[A%c]", 0, 0, 3, 0, 0, "nmsa" } }, > - { 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, > + VOL_ID, TONE_ID, PUNCT_ID, > + DIRECT_ID, V_LAST_VAR_ID, > + NB_ID > +}; > + > +static struct var_t vars[NB_ID] = { > + [CAPS_START_ID] = { CAPS_START, .u.s = {"\x05[f99]" } }, > + [CAPS_STOP_ID] = { CAPS_STOP, .u.s = {"\x05[f80]" } }, > + [RATE_ID] = { RATE, .u.n = {"\x05[r%d]", 10, 0, 20, 100, -10, NULL } }, > + [PITCH_ID] = { PITCH, .u.n = {"\x05[f%d]", 80, 39, 4500, 0, 0, NULL } }, > + [VOL_ID] = { VOL, .u.n = {"\x05[g%d]", 21, 0, 40, 0, 0, NULL } }, > + [TONE_ID] = { TONE, .u.n = {"\x05[s%d]", 9, 0, 63, 0, 0, NULL } }, > + [PUNCT_ID] = { PUNCT, .u.n = {"\x05[A%c]", 0, 0, 3, 0, 0, "nmsa" } }, > + [DIRECT_ID] = { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } }, > V_LAST_VAR > }; > > @@ -158,10 +167,25 @@ static int synth_probe(struct spk_synth *synth) > module_param_named(ser, synth_audptr.ser, int, 0444); > module_param_named(dev, synth_audptr.dev_name, charp, 0444); > module_param_named(start, synth_audptr.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(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(direct, vars[DIRECT_ID].u.n.default_val, int, 0444); > + > + > > MODULE_PARM_DESC(ser, "Set the serial port for the synthesizer (0-based)."); > MODULE_PARM_DESC(dev, "Set the device e.g. ttyUSB0, for the synthesizer."); > 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(vol, "Set the vol variable on load."); > +MODULE_PARM_DESC(tone, "Set the tone variable on load."); > +MODULE_PARM_DESC(punct, "Set the punct variable on load."); > +MODULE_PARM_DESC(direct, "Set the direct variable on load."); > + > > module_spk_synth(synth_audptr); > > -- > 2.25.1 > -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.
