Skip to content

Commit 12b7731

Browse files
neuschaeferBenjamin Tissoires
authored andcommitted
HID: wiimote: Fix table layout and whitespace errors
Some tab characters snuck into the data layout table for turntable extensions, which resulted in the table only looking right at a tabstop of 4, which is uncommon in the kernel. Change them to the equivalent amount of spaces, which should look correct in any editor. While at it, also fix the other whitespace errors (trailing spaces at end of line) introduced in the same commit. Fixes: 05086f3 ("HID: wiimote: Add support for the DJ Hero turntable") Reviewed-by: David Rheinsberg <david@readahead.eu> Signed-off-by: J. Neuschäfer <j.ne@posteo.net> Signed-off-by: Benjamin Tissoires <bentiss@kernel.org>
1 parent e6f4f08 commit 12b7731

1 file changed

Lines changed: 29 additions & 29 deletions

File tree

drivers/hid/hid-wiimote-modules.c

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2403,7 +2403,7 @@ static const struct wiimod_ops wiimod_guitar = {
24032403
.in_ext = wiimod_guitar_in_ext,
24042404
};
24052405

2406-
/*
2406+
/*
24072407
* Turntable
24082408
* DJ Hero came with a Turntable Controller that was plugged in
24092409
* as an extension.
@@ -2439,15 +2439,15 @@ static const __u16 wiimod_turntable_map[] = {
24392439
static void wiimod_turntable_in_ext(struct wiimote_data *wdata, const __u8 *ext)
24402440
{
24412441
__u8 be, cs, sx, sy, ed, rtt, rbg, rbr, rbb, ltt, lbg, lbr, lbb, bp, bm;
2442-
/*
2442+
/*
24432443
* Byte | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
24442444
*------+------+-----+-----+-----+-----+------+------+--------+
2445-
* 0 | RTT<4:3> | SX <5:0> |
2446-
* 1 | RTT<2:1> | SY <5:0> |
2445+
* 0 | RTT<4:3> | SX <5:0> |
2446+
* 1 | RTT<2:1> | SY <5:0> |
24472447
*------+------+-----+-----+-----+-----+------+------+--------+
24482448
* 2 |RTT<0>| ED<4:3> | CS<3:0> | RTT<5> |
24492449
*------+------+-----+-----+-----+-----+------+------+--------+
2450-
* 3 | ED<2:0> | LTT<4:0> |
2450+
* 3 | ED<2:0> | LTT<4:0> |
24512451
*------+------+-----+-----+-----+-----+------+------+--------+
24522452
* 4 | 0 | 0 | LBR | B- | 0 | B+ | RBR | LTT<5> |
24532453
*------+------+-----+-----+-----+-----+------+------+--------+
@@ -2458,20 +2458,20 @@ static void wiimod_turntable_in_ext(struct wiimote_data *wdata, const __u8 *ext)
24582458
* With Motion+ enabled, it will look like this:
24592459
* Byte | 8 | 7 | 6 | 5 | 4 | 3 | 2 | 1 |
24602460
*------+------+-----+-----+-----+-----+------+------+--------+
2461-
* 1 | RTT<4:3> | SX <5:1> | 0 |
2462-
* 2 | RTT<2:1> | SY <5:1> | 0 |
2461+
* 1 | RTT<4:3> | SX <5:1> | 0 |
2462+
* 2 | RTT<2:1> | SY <5:1> | 0 |
24632463
*------+------+-----+-----+-----+-----+------+------+--------+
24642464
* 3 |RTT<0>| ED<4:3> | CS<3:0> | RTT<5> |
24652465
*------+------+-----+-----+-----+-----+------+------+--------+
2466-
* 4 | ED<2:0> | LTT<4:0> |
2466+
* 4 | ED<2:0> | LTT<4:0> |
24672467
*------+------+-----+-----+-----+-----+------+------+--------+
24682468
* 5 | 0 | 0 | LBR | B- | 0 | B+ | RBR | XXXX |
24692469
*------+------+-----+-----+-----+-----+------+------+--------+
24702470
* 6 | LBB | 0 | RBG | BE | LBG | RBB | XXXX | XXXX |
24712471
*------+------+-----+-----+-----+-----+------+------+--------+
24722472
*/
2473-
2474-
be = !(ext[5] & 0x10);
2473+
2474+
be = !(ext[5] & 0x10);
24752475
cs = ((ext[2] & 0x1e));
24762476
sx = ext[0] & 0x3f;
24772477
sy = ext[1] & 0x3f;
@@ -2499,32 +2499,32 @@ static void wiimod_turntable_in_ext(struct wiimote_data *wdata, const __u8 *ext)
24992499
input_report_abs(wdata->extension.input, ABS_HAT1X, ltt);
25002500
input_report_abs(wdata->extension.input, ABS_HAT2X, cs);
25012501
input_report_abs(wdata->extension.input, ABS_HAT3X, ed);
2502-
input_report_key(wdata->extension.input,
2503-
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_G_RIGHT],
2502+
input_report_key(wdata->extension.input,
2503+
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_G_RIGHT],
25042504
rbg);
25052505
input_report_key(wdata->extension.input,
25062506
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_R_RIGHT],
25072507
rbr);
2508-
input_report_key(wdata->extension.input,
2509-
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_B_RIGHT],
2508+
input_report_key(wdata->extension.input,
2509+
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_B_RIGHT],
25102510
rbb);
2511-
input_report_key(wdata->extension.input,
2512-
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_G_LEFT],
2511+
input_report_key(wdata->extension.input,
2512+
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_G_LEFT],
25132513
lbg);
2514-
input_report_key(wdata->extension.input,
2515-
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_R_LEFT],
2514+
input_report_key(wdata->extension.input,
2515+
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_R_LEFT],
25162516
lbr);
2517-
input_report_key(wdata->extension.input,
2518-
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_B_LEFT],
2517+
input_report_key(wdata->extension.input,
2518+
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_B_LEFT],
25192519
lbb);
2520-
input_report_key(wdata->extension.input,
2521-
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_EUPHORIA],
2520+
input_report_key(wdata->extension.input,
2521+
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_EUPHORIA],
25222522
be);
2523-
input_report_key(wdata->extension.input,
2524-
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_PLUS],
2523+
input_report_key(wdata->extension.input,
2524+
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_PLUS],
25252525
bp);
2526-
input_report_key(wdata->extension.input,
2527-
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_MINUS],
2526+
input_report_key(wdata->extension.input,
2527+
wiimod_turntable_map[WIIMOD_TURNTABLE_KEY_MINUS],
25282528
bm);
25292529

25302530
input_sync(wdata->extension.input);
@@ -2557,7 +2557,7 @@ static void wiimod_turntable_close(struct input_dev *dev)
25572557
static int wiimod_turntable_probe(const struct wiimod_ops *ops,
25582558
struct wiimote_data *wdata)
25592559
{
2560-
int ret, i;
2560+
int ret, i;
25612561

25622562
wdata->extension.input = input_allocate_device();
25632563
if (!wdata->extension.input)
@@ -2594,9 +2594,9 @@ static int wiimod_turntable_probe(const struct wiimod_ops *ops,
25942594
input_set_abs_params(wdata->extension.input,
25952595
ABS_HAT1X, -8, 8, 0, 0);
25962596
input_set_abs_params(wdata->extension.input,
2597-
ABS_HAT2X, 0, 31, 1, 1);
2597+
ABS_HAT2X, 0, 31, 1, 1);
25982598
input_set_abs_params(wdata->extension.input,
2599-
ABS_HAT3X, 0, 7, 0, 0);
2599+
ABS_HAT3X, 0, 7, 0, 0);
26002600
ret = input_register_device(wdata->extension.input);
26012601
if (ret)
26022602
goto err_free;

0 commit comments

Comments
 (0)