diff options
| -rw-r--r-- | drivers/accessibility/speakup/speakup_acntpc.c | 38 | 
1 files changed, 30 insertions, 8 deletions
| diff --git a/drivers/accessibility/speakup/speakup_acntpc.c b/drivers/accessibility/speakup/speakup_acntpc.c index a55b60754eb1..a27e6bbf05da 100644 --- a/drivers/accessibility/speakup/speakup_acntpc.c +++ b/drivers/accessibility/speakup/speakup_acntpc.c @@ -34,14 +34,23 @@ static int synth_port_control;  static int port_forced;  static unsigned int synth_portlist[] = { 0x2a8, 0 }; -static struct var_t vars[] = { -	{ CAPS_START, .u.s = {"\033P8" } }, -	{ CAPS_STOP, .u.s = {"\033P5" } }, -	{ RATE, .u.n = {"\033R%c", 9, 0, 17, 0, 0, "0123456789abcdefgh" } }, -	{ PITCH, .u.n = {"\033P%d", 5, 0, 9, 0, 0, NULL } }, -	{ VOL, .u.n = {"\033A%d", 5, 0, 9, 0, 0, NULL } }, -	{ TONE, .u.n = {"\033V%d", 5, 0, 9, 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, TONE_ID, +	DIRECT_ID, V_LAST_VAR_ID, +	NB_ID +}; + + +static struct var_t vars[NB_ID] = { +	[CAPS_START_ID] = { CAPS_START, .u.s = {"\033P8" } }, +	[CAPS_STOP_ID] = { CAPS_STOP, .u.s = {"\033P5" } }, +	[RATE_ID] = { RATE, .u.n = {"\033R%c", 9, 0, 17, 0, 0, "0123456789abcdefgh" } }, +	[PITCH_ID] = { PITCH, .u.n = {"\033P%d", 5, 0, 9, 0, 0, NULL } }, +	[VOL_ID] = { VOL, .u.n = {"\033A%d", 5, 0, 9, 0, 0, NULL } }, +	[TONE_ID] = { TONE, .u.n = {"\033V%d", 5, 0, 9, 0, 0, NULL } }, +	[DIRECT_ID] = { DIRECT, .u.n = {NULL, 0, 0, 1, 0, 0, NULL } },  	V_LAST_VAR  }; @@ -305,9 +314,22 @@ static void accent_release(struct spk_synth *synth)  module_param_hw_named(port, port_forced, int, ioport, 0444);  module_param_named(start, synth_acntpc.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(direct, vars[DIRECT_ID].u.n.default_val, int, 0444); + +  MODULE_PARM_DESC(port, "Set the port for the synthesizer (override probing).");  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(direct, "Set the direct variable on load."); +  module_spk_synth(synth_acntpc); |