diff options
Diffstat (limited to 'drivers/usb/input')
-rw-r--r-- | drivers/usb/input/fixp-arith.h | 15 | ||||
-rw-r--r-- | drivers/usb/input/hid-debug.h | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/drivers/usb/input/fixp-arith.h b/drivers/usb/input/fixp-arith.h index b44d398de071..ed3d2da0c485 100644 --- a/drivers/usb/input/fixp-arith.h +++ b/drivers/usb/input/fixp-arith.h | |||
@@ -2,8 +2,6 @@ | |||
2 | #define _FIXP_ARITH_H | 2 | #define _FIXP_ARITH_H |
3 | 3 | ||
4 | /* | 4 | /* |
5 | * $$ | ||
6 | * | ||
7 | * Simplistic fixed-point arithmetics. | 5 | * Simplistic fixed-point arithmetics. |
8 | * Hmm, I'm probably duplicating some code :( | 6 | * Hmm, I'm probably duplicating some code :( |
9 | * | 7 | * |
@@ -31,20 +29,20 @@ | |||
31 | 29 | ||
32 | #include <linux/types.h> | 30 | #include <linux/types.h> |
33 | 31 | ||
34 | // The type representing fixed-point values | 32 | /* The type representing fixed-point values */ |
35 | typedef s16 fixp_t; | 33 | typedef s16 fixp_t; |
36 | 34 | ||
37 | #define FRAC_N 8 | 35 | #define FRAC_N 8 |
38 | #define FRAC_MASK ((1<<FRAC_N)-1) | 36 | #define FRAC_MASK ((1<<FRAC_N)-1) |
39 | 37 | ||
40 | // Not to be used directly. Use fixp_{cos,sin} | 38 | /* Not to be used directly. Use fixp_{cos,sin} */ |
41 | static const fixp_t cos_table[45] = { | 39 | static const fixp_t cos_table[46] = { |
42 | 0x0100, 0x00FF, 0x00FF, 0x00FE, 0x00FD, 0x00FC, 0x00FA, 0x00F8, | 40 | 0x0100, 0x00FF, 0x00FF, 0x00FE, 0x00FD, 0x00FC, 0x00FA, 0x00F8, |
43 | 0x00F6, 0x00F3, 0x00F0, 0x00ED, 0x00E9, 0x00E6, 0x00E2, 0x00DD, | 41 | 0x00F6, 0x00F3, 0x00F0, 0x00ED, 0x00E9, 0x00E6, 0x00E2, 0x00DD, |
44 | 0x00D9, 0x00D4, 0x00CF, 0x00C9, 0x00C4, 0x00BE, 0x00B8, 0x00B1, | 42 | 0x00D9, 0x00D4, 0x00CF, 0x00C9, 0x00C4, 0x00BE, 0x00B8, 0x00B1, |
45 | 0x00AB, 0x00A4, 0x009D, 0x0096, 0x008F, 0x0087, 0x0080, 0x0078, | 43 | 0x00AB, 0x00A4, 0x009D, 0x0096, 0x008F, 0x0087, 0x0080, 0x0078, |
46 | 0x0070, 0x0068, 0x005F, 0x0057, 0x004F, 0x0046, 0x003D, 0x0035, | 44 | 0x0070, 0x0068, 0x005F, 0x0057, 0x004F, 0x0046, 0x003D, 0x0035, |
47 | 0x002C, 0x0023, 0x001A, 0x0011, 0x0008 | 45 | 0x002C, 0x0023, 0x001A, 0x0011, 0x0008, 0x0000 |
48 | }; | 46 | }; |
49 | 47 | ||
50 | 48 | ||
@@ -68,9 +66,8 @@ static inline fixp_t fixp_cos(unsigned int degrees) | |||
68 | int quadrant = (degrees / 90) & 3; | 66 | int quadrant = (degrees / 90) & 3; |
69 | unsigned int i = degrees % 90; | 67 | unsigned int i = degrees % 90; |
70 | 68 | ||
71 | if (quadrant == 1 || quadrant == 3) { | 69 | if (quadrant == 1 || quadrant == 3) |
72 | i = 89 - i; | 70 | i = 90 - i; |
73 | } | ||
74 | 71 | ||
75 | i >>= 1; | 72 | i >>= 1; |
76 | 73 | ||
diff --git a/drivers/usb/input/hid-debug.h b/drivers/usb/input/hid-debug.h index 702c48c2f81b..f04d6d75c098 100644 --- a/drivers/usb/input/hid-debug.h +++ b/drivers/usb/input/hid-debug.h | |||
@@ -563,7 +563,7 @@ static char *keys[KEY_MAX + 1] = { | |||
563 | [KEY_VOLUMEUP] = "VolumeUp", [KEY_POWER] = "Power", | 563 | [KEY_VOLUMEUP] = "VolumeUp", [KEY_POWER] = "Power", |
564 | [KEY_KPEQUAL] = "KPEqual", [KEY_KPPLUSMINUS] = "KPPlusMinus", | 564 | [KEY_KPEQUAL] = "KPEqual", [KEY_KPPLUSMINUS] = "KPPlusMinus", |
565 | [KEY_PAUSE] = "Pause", [KEY_KPCOMMA] = "KPComma", | 565 | [KEY_PAUSE] = "Pause", [KEY_KPCOMMA] = "KPComma", |
566 | [KEY_HANGUEL] = "Hanguel", [KEY_HANJA] = "Hanja", | 566 | [KEY_HANGUEL] = "Hangeul", [KEY_HANJA] = "Hanja", |
567 | [KEY_YEN] = "Yen", [KEY_LEFTMETA] = "LeftMeta", | 567 | [KEY_YEN] = "Yen", [KEY_LEFTMETA] = "LeftMeta", |
568 | [KEY_RIGHTMETA] = "RightMeta", [KEY_COMPOSE] = "Compose", | 568 | [KEY_RIGHTMETA] = "RightMeta", [KEY_COMPOSE] = "Compose", |
569 | [KEY_STOP] = "Stop", [KEY_AGAIN] = "Again", | 569 | [KEY_STOP] = "Stop", [KEY_AGAIN] = "Again", |