This is an enhancement which allows to specify the default driver
parameters among the module parameters.
Adding default variables to the speakup_apollo 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 <[email protected]>
---
.../accessibility/speakup/speakup_apollo.c | 46 +++++++++++++++----
1 file changed, 37 insertions(+), 9 deletions(-)
diff --git a/drivers/accessibility/speakup/speakup_apollo.c b/drivers/accessibility/speakup/speakup_apollo.c
index c84a7e0864b7..d2fbb3f57221 100644
--- a/drivers/accessibility/speakup/speakup_apollo.c
+++ b/drivers/accessibility/speakup/speakup_apollo.c
@@ -24,15 +24,28 @@
static void do_catch_up(struct spk_synth *synth);
-static struct var_t vars[] = {
- { CAPS_START, .u.s = {"cap, " } },
- { CAPS_STOP, .u.s = {"" } },
- { RATE, .u.n = {"@W%d", 6, 1, 9, 0, 0, NULL } },
- { PITCH, .u.n = {"@F%x", 10, 0, 15, 0, 0, NULL } },
- { VOL, .u.n = {"@A%x", 10, 0, 15, 0, 0, NULL } },
- { VOICE, .u.n = {"@V%d", 1, 1, 6, 0, 0, NULL } },
- { LANG, .u.n = {"@=%d,", 1, 1, 4, 0, 0, NULL } },
- { 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, VOICE_ID, LANG_ID,
+ DIRECT_ID, V_LAST_VAR_ID,
+ NB_ID
+};
+
+
+
+
+static struct var_t vars[NB_ID] = {
+ [CAPS_START_ID] = { CAPS_START, .u.s = {"cap, " } },
+ [CAPS_STOP_ID] = { CAPS_STOP, .u.s = {"" } },
+ [RATE_ID] = { RATE, .u.n = {"@W%d", 6, 1, 9, 0, 0, NULL } },
+ [PITCH_ID] = { PITCH, .u.n = {"@F%x", 10, 0, 15, 0, 0, NULL } },
+ [VOL_ID] = { VOL, .u.n = {"@A%x", 10, 0, 15, 0, 0, NULL } },
+ [VOICE_ID] = { VOICE, .u.n = {"@V%d", 1, 1, 6, 0, 0, NULL } },
+ [LANG_ID] = { LANG, .u.n = {"@=%d,", 1, 1, 4, 0, 0, NULL } },
+ [DIRECT_ID] = { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
V_LAST_VAR
};
@@ -193,10 +206,25 @@ static void do_catch_up(struct spk_synth *synth)
module_param_named(ser, synth_apollo.ser, int, 0444);
module_param_named(dev, synth_apollo.dev_name, charp, 0444);
module_param_named(start, synth_apollo.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(voice, vars[VOICE_ID].u.n.default_val, int, 0444);
+module_param_named(lang, vars[LANG_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(voice, "Set the voice variable on load.");
+MODULE_PARM_DESC(lang, "Set the lang variable on load.");
+MODULE_PARM_DESC(direct, "Set the direct variable on load.");
+
+
module_spk_synth(synth_apollo);
--
2.25.1
Osama Muhammad, le ven. 21 oct. 2022 18:52:16 +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_apollo 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 <[email protected]>
Reviewed-by: Samuel Thibault <[email protected]>
thanks!
> ---
> .../accessibility/speakup/speakup_apollo.c | 46 +++++++++++++++----
> 1 file changed, 37 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/accessibility/speakup/speakup_apollo.c b/drivers/accessibility/speakup/speakup_apollo.c
> index c84a7e0864b7..d2fbb3f57221 100644
> --- a/drivers/accessibility/speakup/speakup_apollo.c
> +++ b/drivers/accessibility/speakup/speakup_apollo.c
> @@ -24,15 +24,28 @@
>
> static void do_catch_up(struct spk_synth *synth);
>
> -static struct var_t vars[] = {
> - { CAPS_START, .u.s = {"cap, " } },
> - { CAPS_STOP, .u.s = {"" } },
> - { RATE, .u.n = {"@W%d", 6, 1, 9, 0, 0, NULL } },
> - { PITCH, .u.n = {"@F%x", 10, 0, 15, 0, 0, NULL } },
> - { VOL, .u.n = {"@A%x", 10, 0, 15, 0, 0, NULL } },
> - { VOICE, .u.n = {"@V%d", 1, 1, 6, 0, 0, NULL } },
> - { LANG, .u.n = {"@=%d,", 1, 1, 4, 0, 0, NULL } },
> - { 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, VOICE_ID, LANG_ID,
> + DIRECT_ID, V_LAST_VAR_ID,
> + NB_ID
> +};
> +
> +
> +
> +
> +static struct var_t vars[NB_ID] = {
> + [CAPS_START_ID] = { CAPS_START, .u.s = {"cap, " } },
> + [CAPS_STOP_ID] = { CAPS_STOP, .u.s = {"" } },
> + [RATE_ID] = { RATE, .u.n = {"@W%d", 6, 1, 9, 0, 0, NULL } },
> + [PITCH_ID] = { PITCH, .u.n = {"@F%x", 10, 0, 15, 0, 0, NULL } },
> + [VOL_ID] = { VOL, .u.n = {"@A%x", 10, 0, 15, 0, 0, NULL } },
> + [VOICE_ID] = { VOICE, .u.n = {"@V%d", 1, 1, 6, 0, 0, NULL } },
> + [LANG_ID] = { LANG, .u.n = {"@=%d,", 1, 1, 4, 0, 0, NULL } },
> + [DIRECT_ID] = { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },
> V_LAST_VAR
> };
>
> @@ -193,10 +206,25 @@ static void do_catch_up(struct spk_synth *synth)
> module_param_named(ser, synth_apollo.ser, int, 0444);
> module_param_named(dev, synth_apollo.dev_name, charp, 0444);
> module_param_named(start, synth_apollo.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(voice, vars[VOICE_ID].u.n.default_val, int, 0444);
> +module_param_named(lang, vars[LANG_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(voice, "Set the voice variable on load.");
> +MODULE_PARM_DESC(lang, "Set the lang variable on load.");
> +MODULE_PARM_DESC(direct, "Set the direct variable on load.");
> +
> +
>
> module_spk_synth(synth_apollo);
>
> --
> 2.25.1
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.