redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: speakup: enlosed macros with complex values in parenthesis 

Enclosed all macros with complex values in parenthesis

Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
hifive-unleashed-5.1
Timo von Holtz 2011-02-04 21:29:46 +01:00 committed by Greg Kroah-Hartman
parent 0838b87cae
commit 2c62c674e0
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/staging/speakup/spk_priv_keyinfo.h
View File

@ -84,27 +84,27 @@
/* keys for setting variables, must be ordered same as the enum for var_ids */
/* with dec being even and inc being 1 greater */
#define SPELL_DELAY_DEC VAR_START+0
#define SPELL_DELAY_INC SPELL_DELAY_DEC+1
#define PUNC_LEVEL_DEC SPELL_DELAY_DEC+2
#define PUNC_LEVEL_INC PUNC_LEVEL_DEC+1
#define READING_PUNC_DEC PUNC_LEVEL_DEC+2
#define READING_PUNC_INC READING_PUNC_DEC+1
#define ATTRIB_BLEEP_DEC READING_PUNC_DEC+2
#define ATTRIB_BLEEP_INC ATTRIB_BLEEP_DEC+1
#define BLEEPS_DEC ATTRIB_BLEEP_DEC+2
#define BLEEPS_INC BLEEPS_DEC+1
#define RATE_DEC BLEEPS_DEC+2
#define RATE_INC RATE_DEC+1
#define PITCH_DEC RATE_DEC+2
#define PITCH_INC PITCH_DEC+1
#define VOL_DEC PITCH_DEC+2
#define VOL_INC VOL_DEC+1
#define TONE_DEC VOL_DEC+2
#define TONE_INC TONE_DEC+1
#define PUNCT_DEC TONE_DEC+2
#define PUNCT_INC PUNCT_DEC+1
#define VOICE_DEC PUNCT_DEC+2
#define VOICE_INC VOICE_DEC+1
#define SPELL_DELAY_DEC (VAR_START+0)
#define SPELL_DELAY_INC (SPELL_DELAY_DEC+1)
#define PUNC_LEVEL_DEC (SPELL_DELAY_DEC+2)
#define PUNC_LEVEL_INC (PUNC_LEVEL_DEC+1)
#define READING_PUNC_DEC (PUNC_LEVEL_DEC+2)
#define READING_PUNC_INC (READING_PUNC_DEC+1)
#define ATTRIB_BLEEP_DEC (READING_PUNC_DEC+2)
#define ATTRIB_BLEEP_INC (ATTRIB_BLEEP_DEC+1)
#define BLEEPS_DEC (ATTRIB_BLEEP_DEC+2)
#define BLEEPS_INC (BLEEPS_DEC+1)
#define RATE_DEC (BLEEPS_DEC+2)
#define RATE_INC (RATE_DEC+1)
#define PITCH_DEC (RATE_DEC+2)
#define PITCH_INC (PITCH_DEC+1)
#define VOL_DEC (PITCH_DEC+2)
#define VOL_INC (VOL_DEC+1)
#define TONE_DEC (VOL_DEC+2)
#define TONE_INC (TONE_DEC+1)
#define PUNCT_DEC (TONE_DEC+2)
#define PUNCT_INC (PUNCT_DEC+1)
#define VOICE_DEC (PUNCT_DEC+2)
#define VOICE_INC (VOICE_DEC+1)
#endif

18
drivers/staging/speakup/spk_types.h
View File

@ -79,14 +79,14 @@ struct st_spk_t {
};
/* now some defines to make these easier to use. */
#define spk_shut_up speakup_console[vc->vc_num]->shut_up
#define spk_shut_up (speakup_console[vc->vc_num]->shut_up)
#define spk_killed (speakup_console[vc->vc_num]->shut_up & 0x40)
#define spk_x speakup_console[vc->vc_num]->reading_x
#define spk_cx speakup_console[vc->vc_num]->cursor_x
#define spk_y speakup_console[vc->vc_num]->reading_y
#define spk_cy speakup_console[vc->vc_num]->cursor_y
#define spk_x (speakup_console[vc->vc_num]->reading_x)
#define spk_cx (speakup_console[vc->vc_num]->cursor_x)
#define spk_y (speakup_console[vc->vc_num]->reading_y)
#define spk_cy (speakup_console[vc->vc_num]->cursor_y)
#define spk_pos (speakup_console[vc->vc_num]->reading_pos)
#define spk_cp speakup_console[vc->vc_num]->cursor_pos
#define spk_cp (speakup_console[vc->vc_num]->cursor_pos)
#define goto_pos (speakup_console[vc->vc_num]->go_pos)
#define goto_x (speakup_console[vc->vc_num]->go_x)
#define win_top (speakup_console[vc->vc_num]->w_top)
@ -95,9 +95,9 @@ struct st_spk_t {
#define win_right (speakup_console[vc->vc_num]->w_right)
#define win_start (speakup_console[vc->vc_num]->w_start)
#define win_enabled (speakup_console[vc->vc_num]->w_enabled)
#define spk_attr speakup_console[vc->vc_num]->reading_attr
#define spk_old_attr speakup_console[vc->vc_num]->old_attr
#define spk_parked speakup_console[vc->vc_num]->parked
#define spk_attr (speakup_console[vc->vc_num]->reading_attr)
#define spk_old_attr (speakup_console[vc->vc_num]->old_attr)
#define spk_parked (speakup_console[vc->vc_num]->parked)
struct st_var_header {
char *name;