Commit 9744f41f authored by Osama Muhammad's avatar Osama Muhammad Committed by Greg Kroah-Hartman
Browse files

Accessiblity: speakup_spkout: 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_spkout 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: default avatarOsama Muhammad <osmtendev@gmail.com>
Reviewed-by: default avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Link: https://lore.kernel.org/r/20221109215108.7933-13-osmtendev@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88dce45b

drivers/accessibility/speakup/speakup_spkout.c

+34 −9
Original line number Diff line number Diff line
@@ -18,15 +18,26 @@ 


static void synth_flush(struct spk_synth *synth);



static struct var_t vars[] = {

	{ CAPS_START, .u.s = {"\x05P+" } },

	{ CAPS_STOP, .u.s = {"\x05P-" } },

	{ RATE, .u.n = {"\x05R%d", 7, 0, 9, 0, 0, NULL } },

	{ PITCH, .u.n = {"\x05P%d", 3, 0, 9, 0, 0, NULL } },

	{ VOL, .u.n = {"\x05V%d", 9, 0, 9, 0, 0, NULL } },

	{ TONE, .u.n = {"\x05T%c", 8, 0, 25, 65, 0, NULL } },

	{ PUNCT, .u.n = {"\x05M%c", 0, 0, 3, 0, 0, "nsma" } },

	{ 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 = {"\x05P+" } },

	[CAPS_STOP_ID] = { CAPS_STOP, .u.s = {"\x05P-" } },

	[RATE_ID] = { RATE, .u.n = {"\x05R%d", 7, 0, 9, 0, 0, NULL } },

	[PITCH_ID] = { PITCH, .u.n = {"\x05P%d", 3, 0, 9, 0, 0, NULL } },

	[VOL_ID] = { VOL, .u.n = {"\x05V%d", 9, 0, 9, 0, 0, NULL } },

	[TONE_ID] = { TONE, .u.n = {"\x05T%c", 8, 0, 25, 65, 0, NULL } },

	[PUNCT_ID] = { PUNCT, .u.n = {"\x05M%c", 0, 0, 3, 0, 0, "nsma" } },

	[DIRECT_ID] = { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },

	V_LAST_VAR

};
@@ -124,10 +135,24 @@ static void synth_flush(struct spk_synth *synth) 
module_param_named(ser, synth_spkout.ser, int, 0444);

module_param_named(dev, synth_spkout.dev_name, charp, 0444);

module_param_named(start, synth_spkout.startup, short, 0444);

module_param_named(rate, vars[RATE_ID].u.n.default_val, int, 0444);

module_param_named(vol, vars[PITCH_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(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_spkout);