Menu
▾
▴
[Gc-linux-cvs] linux/drivers/input/si Kconfig, 1.2, 1.3 Makefile, 1.1, 1.2 gcn-keymap.h, 1.2, 1.3 gcn-si.c, 1.12, 1.13
|
From: Albert H. <he...@us...> - 2009-02-01 18:29:46
|
Update of /cvsroot/gc-linux/linux/drivers/input/si In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv17186/drivers/input/si Modified Files: Kconfig Makefile gcn-keymap.h gcn-si.c Log Message: Merge 2.6.28. Also: - run checkpatch against the non-broken source code - add GPIO driver fixes - implement getgeo for the special block drivers - small fixes Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/si/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Makefile 6 Jul 2005 16:46:44 -0000 1.1 +++ Makefile 1 Feb 2009 18:29:35 -0000 1.2 @@ -1,5 +1,5 @@ # -# Makefile for the Nintendo GameCube Serial Interface. +# Makefile for the Nintendo GameCube/Wii Serial Interface (SI). # obj-$(CONFIG_GAMECUBE_SI) += gcn-si.o Index: gcn-keymap.h =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/si/gcn-keymap.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gcn-keymap.h 26 Mar 2008 23:25:11 -0000 1.2 +++ gcn-keymap.h 1 Feb 2009 18:29:35 -0000 1.3 @@ -12,36 +12,68 @@ */ static unsigned char gamecube_keymap[] = { - /* 00 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_HOME, KEY_END, - /* 08 */ KEY_PAGEUP, KEY_PAGEDOWN, KEY_SCROLLLOCK, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* 10 */ KEY_A, KEY_B, KEY_C, KEY_D, KEY_E, KEY_F, KEY_G, KEY_H, - /* 18 */ KEY_I, KEY_J, KEY_K, KEY_L, KEY_M, KEY_N, KEY_O, KEY_P, - /* 20 */ KEY_Q, KEY_R, KEY_S, KEY_T, KEY_U, KEY_V, KEY_W, KEY_X, - /* 28 */ KEY_Y, KEY_Z, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, - /* 30 */ KEY_7, KEY_8, KEY_9, KEY_0, KEY_MINUS, KEY_EQUAL, KEY_RESERVED, KEY_KPASTERISK, - /* 38 */ KEY_LEFTBRACE, KEY_SEMICOLON, KEY_APOSTROPHE, KEY_RIGHTBRACE, KEY_COMMA, KEY_DOT, KEY_SLASH, KEY_BACKSLASH, - /* 40 */ KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, - /* 48 */ KEY_F9, KEY_F10, KEY_F11, KEY_F12, KEY_ESC, KEY_INSERT, KEY_DELETE, KEY_GRAVE, - /* 50 */ KEY_BACKSPACE, KEY_TAB, KEY_RESERVED, KEY_CAPSLOCK, KEY_LEFTSHIFT, KEY_RIGHTSHIFT, KEY_LEFTCTRL, KEY_LEFTALT, - /* 58 */ KEY_RESERVED, KEY_SPACE, KEY_RESERVED, KEY_RESERVED, KEY_LEFT, KEY_DOWN, KEY_UP, KEY_RIGHT, - /* 60 */ KEY_RESERVED, KEY_ENTER, KEY_RESERVED, KEY_RESERVED, KEY_SEMICOLON, KEY_KPPLUS, KEY_RESERVED, KEY_RESERVED, - /* 68 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* 70 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* 78 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* 80 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* 88 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* 90 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* 98 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* a0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* a8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* b0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* b8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* c0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* c8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* d0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* d8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* e0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* e8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* f0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, - /* f8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED + /* 00 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_HOME, KEY_END, + /* 08 */ KEY_PAGEUP, KEY_PAGEDOWN, KEY_SCROLLLOCK, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* 10 */ KEY_A, KEY_B, KEY_C, KEY_D, + KEY_E, KEY_F, KEY_G, KEY_H, + /* 18 */ KEY_I, KEY_J, KEY_K, KEY_L, + KEY_M, KEY_N, KEY_O, KEY_P, + /* 20 */ KEY_Q, KEY_R, KEY_S, KEY_T, + KEY_U, KEY_V, KEY_W, KEY_X, + /* 28 */ KEY_Y, KEY_Z, KEY_1, KEY_2, + KEY_3, KEY_4, KEY_5, KEY_6, + /* 30 */ KEY_7, KEY_8, KEY_9, KEY_0, + KEY_MINUS, KEY_EQUAL, KEY_RESERVED, KEY_KPASTERISK, + /* 38 */ KEY_LEFTBRACE, KEY_SEMICOLON, KEY_APOSTROPHE, KEY_RIGHTBRACE, + KEY_COMMA, KEY_DOT, KEY_SLASH, KEY_BACKSLASH, + /* 40 */ KEY_F1, KEY_F2, KEY_F3, KEY_F4, + KEY_F5, KEY_F6, KEY_F7, KEY_F8, + /* 48 */ KEY_F9, KEY_F10, KEY_F11, KEY_F12, + KEY_ESC, KEY_INSERT, KEY_DELETE, KEY_GRAVE, + /* 50 */ KEY_BACKSPACE, KEY_TAB, KEY_RESERVED, KEY_CAPSLOCK, + KEY_LEFTSHIFT, KEY_RIGHTSHIFT, KEY_LEFTCTRL, KEY_LEFTALT, + /* 58 */ KEY_RESERVED, KEY_SPACE, KEY_RESERVED, KEY_RESERVED, + KEY_LEFT, KEY_DOWN, KEY_UP, KEY_RIGHT, + /* 60 */ KEY_RESERVED, KEY_ENTER, KEY_RESERVED, KEY_RESERVED, + KEY_SEMICOLON, KEY_KPPLUS, KEY_RESERVED, KEY_RESERVED, + /* 68 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* 70 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* 78 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* 80 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* 88 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* 90 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* 98 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* a0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* a8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* b0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* b8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* c0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* c8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* d0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* d8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* e0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* e8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* f0 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + /* f8 */ KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, + KEY_RESERVED, KEY_RESERVED, KEY_RESERVED, KEY_RESERVED }; Index: gcn-si.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/si/gcn-si.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gcn-si.c 13 Sep 2008 19:42:56 -0000 1.12 +++ gcn-si.c 1 Feb 2009 18:29:35 -0000 1.13 @@ -2,9 +2,9 @@ * drivers/input/gcn-si.c * * Nintendo GameCube/Wii Serial Interface (SI) driver. - * Copyright (C) 2004-2008 The GameCube Linux Team + * Copyright (C) 2004-2009 The GameCube Linux Team * Copyright (C) 2004 Steven Looman - * Copyright (C) 2005,2008 Albert Herranz + * Copyright (C) 2005,2008,2009 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -45,10 +45,10 @@ static char si_driver_version[] = "1.0i"; #define drv_printk(level, format, arg...) \ - printk(level DRV_MODULE_NAME ": " format , ## arg) + printk(level DRV_MODULE_NAME ": " format , ## arg) -#define SI_MAX_PORTS 4 /* the four controller ports */ -#define SI_REFRESH_TIME HZ/100 /* polling interval */ +#define SI_MAX_PORTS 4 /* the four controller ports */ +#define SI_REFRESH_TIME (HZ/100) /* polling interval */ /* * Hardware registers @@ -106,11 +106,11 @@ struct input_dev *idev; struct timer_list timer; char name[32]; - + union { struct si_keyboard_status keyboard; }; - + }; struct si_drvdata { @@ -133,10 +133,9 @@ #else static int __init si_force_keyboard_port_setup(char *line) { - if (sscanf(line, "%d", &si_force_keyboard_port) != 1) { + if (sscanf(line, "%d", &si_force_keyboard_port) != 1) si_force_keyboard_port = -1; - } - return 1; + return 1; } __setup("force_keyboard_port=", si_force_keyboard_port_setup); #endif /* MODULE */ @@ -183,7 +182,7 @@ static void si_set_rumbling(void __iomem *io_base, unsigned int index, int rumble) { - out_be32(io_base + SICOUTBUF(index), 0x00400000 | (rumble)?1:0); + out_be32(io_base + SICOUTBUF(index), 0x00400000 | (rumble) ? 1 : 0); out_be32(io_base + SISR, 0x80000000); } @@ -192,7 +191,7 @@ unsigned long deadline = jiffies + 2*HZ; int borked = 0; - while(!(in_be32(io_base + SICOMCSR) & (1 << 31)) && !borked) { + while (!(in_be32(io_base + SICOMCSR) & (1 << 31)) && !borked) { cpu_relax(); borked = time_after(jiffies, deadline); } @@ -312,7 +311,7 @@ raw[1] >> 0 & 0xFF); break; - + case CTL_KEYBOARD: /* raw nibbles: @@ -320,7 +319,7 @@ where: [n] = fixed to n <nH> <nL> = high / low nibble of n-th key pressed - (0 if not pressed) + (0 if not pressed) <X> = <1H> xor <2H> xor <3H> <C> = counter: 0, 0, 1, 1, 2, 2, ..., F, F, 0, 0, ... */ @@ -388,9 +387,8 @@ void __iomem *io_base = port->drvdata->io_base; if (type == EV_FF) { - if (code == FF_RUMBLE) { + if (code == FF_RUMBLE) si_set_rumbling(io_base, index, value); - } } return value; @@ -501,7 +499,7 @@ } else if (port->id & ID_WIRELESS_BIT) { /* wireless pad */ port->type = CTL_PAD; - strcpy(port->name,(port->id & ID_WAVEBIRD_BIT) ? + strcpy(port->name, (port->id & ID_WAVEBIRD_BIT) ? "Nintendo Wavebird" : "wireless pad"); } else if (port->id == ID_KEYBOARD) { port->type = CTL_KEYBOARD; @@ -509,7 +507,7 @@ } else { port->type = CTL_UNKNOWN; if (port->id) { - sprintf(port->name, "unknown (%x)", + sprintf(port->name, "unknown (%x)", port->id); #ifdef HACK_FORCE_KEYBOARD_PORT if (index+1 == si_force_keyboard_port) { @@ -531,7 +529,7 @@ goto done; } - idev = input_allocate_device(); + idev = input_allocate_device(); if (!idev) { drv_printk(KERN_ERR, "failed to allocate input_dev\n"); retval = -ENOMEM; @@ -541,7 +539,7 @@ idev->open = si_open; idev->close = si_close; idev->name = port->name; - + switch (port->type) { case CTL_PAD: retval = si_setup_pad(idev); @@ -575,21 +573,29 @@ struct si_port *port; int index; int retval; + int error; drvdata->io_base = ioremap(mem->start, mem->end - mem->start + 1); for (index = 0; index < SI_MAX_PORTS; ++index) { port = &drvdata->ports[index]; - memset(port, 0, sizeof(*port)); + memset(port, 0, sizeof(*port)); port->index = index; port->drvdata = drvdata; retval = si_port_probe(port); - if (!retval) - input_register_device(port->idev); - - drv_printk(KERN_INFO, "port %d: %s\n", index+1, port->name); + if (!retval) { + error = input_register_device(port->idev); + if (error) { + drv_printk(KERN_ERR, + "input device registration failed" + " (%d) for port %d", error, index+1); + port->idev = NULL; + } else + drv_printk(KERN_INFO, "port %d: %s\n", + index+1, port->name); + } } si_setup_polling(drvdata); @@ -608,10 +614,10 @@ input_unregister_device(port->idev); } - if (drvdata->io_base) { - iounmap(drvdata->io_base); - drvdata->io_base = NULL; - } + if (drvdata->io_base) { + iounmap(drvdata->io_base); + drvdata->io_base = NULL; + } } /* @@ -621,36 +627,36 @@ static int si_do_probe(struct device *dev, struct resource *mem) { - struct si_drvdata *drvdata; - int retval; + struct si_drvdata *drvdata; + int retval; - drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL); - if (!drvdata) { - drv_printk(KERN_ERR, "failed to allocate si_drvdata\n"); - return -ENOMEM; - } - dev_set_drvdata(dev, drvdata); - drvdata->dev = dev; + drvdata = kzalloc(sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) { + drv_printk(KERN_ERR, "failed to allocate si_drvdata\n"); + return -ENOMEM; + } + dev_set_drvdata(dev, drvdata); + drvdata->dev = dev; - retval = si_init(drvdata, mem); - if (retval) { - dev_set_drvdata(dev, NULL); - kfree(drvdata); - } - return retval; + retval = si_init(drvdata, mem); + if (retval) { + dev_set_drvdata(dev, NULL); + kfree(drvdata); + } + return retval; } static int si_do_remove(struct device *dev) { - struct si_drvdata *drvdata = dev_get_drvdata(dev); + struct si_drvdata *drvdata = dev_get_drvdata(dev); - if (drvdata) { - si_exit(drvdata); - dev_set_drvdata(dev, NULL); - kfree(drvdata); - return 0; - } - return -ENODEV; + if (drvdata) { + si_exit(drvdata); + dev_set_drvdata(dev, NULL); + kfree(drvdata); + return 0; + } + return -ENODEV; } @@ -660,40 +666,40 @@ */ static int __init si_of_probe(struct of_device *odev, - const struct of_device_id *match) + const struct of_device_id *match) { - struct resource mem; - int retval; + struct resource mem; + int retval; - retval = of_address_to_resource(odev->node, 0, &mem); - if (retval) { - drv_printk(KERN_ERR, "no io memory range found\n"); - return -ENODEV; - } + retval = of_address_to_resource(odev->node, 0, &mem); + if (retval) { + drv_printk(KERN_ERR, "no io memory range found\n"); + return -ENODEV; + } - return si_do_probe(&odev->dev, &mem); + return si_do_probe(&odev->dev, &mem); } static int __exit si_of_remove(struct of_device *odev) { - return si_do_remove(&odev->dev); + return si_do_remove(&odev->dev); } static struct of_device_id si_of_match[] = { - { .compatible = "nintendo,flipper-serial" }, - { .compatible = "nintendo,hollywood-serial" }, - { }, + { .compatible = "nintendo,flipper-serial" }, + { .compatible = "nintendo,hollywood-serial" }, + { }, }; MODULE_DEVICE_TABLE(of, si_of_match); static struct of_platform_driver si_of_driver = { - .owner = THIS_MODULE, - .name = DRV_MODULE_NAME, - .match_table = si_of_match, - .probe = si_of_probe, - .remove = si_of_remove, + .owner = THIS_MODULE, + .name = DRV_MODULE_NAME, + .match_table = si_of_match, + .probe = si_of_probe, + .remove = si_of_remove, }; @@ -704,15 +710,15 @@ static int __init si_init_module(void) { - drv_printk(KERN_INFO, "%s - version %s\n", DRV_DESCRIPTION, - si_driver_version); + drv_printk(KERN_INFO, "%s - version %s\n", DRV_DESCRIPTION, + si_driver_version); - return of_register_platform_driver(&si_of_driver); + return of_register_platform_driver(&si_of_driver); } static void __exit si_exit_module(void) { - of_unregister_platform_driver(&si_of_driver); + of_unregister_platform_driver(&si_of_driver); } module_init(si_init_module); Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/input/si/Kconfig,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Kconfig 26 Mar 2008 20:02:28 -0000 1.2 +++ Kconfig 1 Feb 2009 18:29:35 -0000 1.3 @@ -1,5 +1,5 @@ # -# Nintendo GameCube Serial Interface (SI) support +# Nintendo GameCube/Wii Serial Interface (SI) configuration # config GAMECUBE_SI |
