kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: speakup: keyhelp.c: style fixes

Browse source 
Clean up this file based on reports from checkpatch.pl.

Signed-off-by: William Hubbs <w.d.hubbs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
William Hubbs 2010-10-12 11:39:29 -05:00 committed by Greg Kroah-Hartman
parent d09d3e2cdd
commit 09adcb52a6
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
drivers/staging/speakup/keyhelp.c
View file

@ -1,24 +1,24 @@
/* speakup_keyhelp.c /* speakup_keyhelp.c
help module for speakup * help module for speakup
*
written by David Borowski. *written by David Borowski.
*
Copyright (C) 2003 David Borowski. * Copyright (C) 2003 David Borowski.
*
This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. * (at your option) any later version.
*
This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. * GNU General Public License for more details.
*
You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <linux/keyboard.h> #include <linux/keyboard.h>
#include "spk_priv.h" #include "spk_priv.h"
@ -30,7 +30,7 @@ static const int num_key_names = MSG_KEYNAMES_END - MSG_KEYNAMES_START + 1;
static u_short key_offsets[MAXFUNCS], key_data[MAXKEYS]; static u_short key_offsets[MAXFUNCS], key_data[MAXKEYS];
static u_short masks[] = { 32, 16, 8, 4, 2, 1 }; static u_short masks[] = { 32, 16, 8, 4, 2, 1 };
static short letter_offsets[26] = { static short letter_offsets[26] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@ -87,8 +87,9 @@ static void build_key_data(void)
break; break;
} }
/* leave counters set so high keycodes come first. /* leave counters set so high keycodes come first.
this is done so num pad and other extended keys maps are spoken before * this is done so num pad and other extended keys maps are spoken before
the alpha with speakup type mapping. */ * the alpha with speakup type mapping.
*/
kp = state_tbl + nstates + 1; kp = state_tbl + nstates + 1;
while ((ch = *kp++)) { while ((ch = *kp++)) {
for (i = 0; i < nstates; i++) { for (i = 0; i < nstates; i++) {
@ -174,7 +175,8 @@ int handle_help(struct vc_data *vc, u_char type, u_char ch, u_short key)
} else { } else {
name = NULL; name = NULL;
if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) { if ((type != KT_SPKUP) && (key > 0) && (key <= num_key_names)) {
synth_printf("%s\n", msg_get(MSG_KEYNAMES_START + key-1)); synth_printf("%s\n",
msg_get(MSG_KEYNAMES_START + key-1));
return 1; return 1;
} }
for (i = 0; funcvals[i] != 0 && !name; i++) { for (i = 0; funcvals[i] != 0 && !name; i++) {