Commit 44d3e977 authored by Osama Muhammad's avatar Osama Muhammad Committed by Greg Kroah-Hartman
Browse files

Accessiblity: speakup_dectlk: 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_dectlk 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-8-osmtendev@gmail.com


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

drivers/accessibility/speakup/speakup_dectlk.c

+35 −10
Original line number Diff line number Diff line
@@ -40,16 +40,24 @@ static int is_flushing; 
static DEFINE_SPINLOCK(flush_lock);

static DECLARE_WAIT_QUEUE_HEAD(flush);



static struct var_t vars[] = {

	{ CAPS_START, .u.s = {"[:dv ap 160] " } },

	{ CAPS_STOP, .u.s = {"[:dv ap 100 ] " } },

	{ RATE, .u.n = {"[:ra %d] ", 180, 75, 650, 0, 0, NULL } },

	{ PITCH, .u.n = {"[:dv ap %d] ", 122, 50, 350, 0, 0, NULL } },

	{ INFLECTION, .u.n = {"[:dv pr %d] ", 100, 0, 10000, 0, 0, NULL } },

	{ VOL, .u.n = {"[:dv g5 %d] ", 86, 60, 86, 0, 0, NULL } },

	{ PUNCT, .u.n = {"[:pu %c] ", 0, 0, 2, 0, 0, "nsa" } },

	{ VOICE, .u.n = {"[:n%c] ", 0, 0, 9, 0, 0, "phfdburwkv" } },

	{ 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, INFLECTION_ID,

	VOL_ID, PUNCT_ID, VOICE_ID,

	DIRECT_ID, V_LAST_VAR_ID,

	NB_ID,

};



static struct var_t vars[NB_ID] = {

	[CAPS_START_ID] = { CAPS_START, .u.s = {"[:dv ap 160] " } },

	[CAPS_STOP_ID] = { CAPS_STOP, .u.s = {"[:dv ap 100 ] " } },

	[RATE_ID] = { RATE, .u.n = {"[:ra %d] ", 180, 75, 650, 0, 0, NULL } },

	[PITCH_ID] = { PITCH, .u.n = {"[:dv ap %d] ", 122, 50, 350, 0, 0, NULL } },

	[INFLECTION_ID] = { INFLECTION, .u.n = {"[:dv pr %d] ", 100, 0, 10000, 0, 0, NULL } },

	[VOL_ID] = { VOL, .u.n = {"[:dv g5 %d] ", 86, 60, 86, 0, 0, NULL } },

	[PUNCT_ID] = { PUNCT, .u.n = {"[:pu %c] ", 0, 0, 2, 0, 0, "nsa" } },

	[VOICE_ID] = { VOICE, .u.n = {"[:n%c] ", 0, 0, 9, 0, 0, "phfdburwkv" } },

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

	V_LAST_VAR

};
@@ -306,10 +314,27 @@ static void synth_flush(struct spk_synth *synth) 
module_param_named(ser, synth_dectlk.ser, int, 0444);

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

module_param_named(start, synth_dectlk.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(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(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(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(inflection, "Set the inflection variable on load.");

MODULE_PARM_DESC(vol, "Set the vol variable on load.");

MODULE_PARM_DESC(punct, "Set the punct variable on load.");

MODULE_PARM_DESC(voice, "Set the voice variable on load.");

MODULE_PARM_DESC(direct, "Set the direct variable on load.");





module_spk_synth(synth_dectlk);