Menu
▾
▴
[Gc-linux-cvs] linux/drivers/misc Kconfig, 1.8, 1.9 Makefile, 1.5, 1.6 gcn-gqr.c, 1.2, 1.3
|
From: Albert H. <he...@us...> - 2008-02-24 18:06:01
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4818/drivers/misc Modified Files: Kconfig Makefile gcn-gqr.c Log Message: Merged 2.6.24. Added usbgecko driver. Added fixes for: exi, gcn-sd, gcn-mic, gcn-gqr. Adapted: gcn-bba, gcn-gqr, gcn-rtc. Added very primitive support for the Nintendo Wii. Index: gcn-gqr.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-gqr.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gcn-gqr.c 14 Nov 2007 23:08:49 -0000 1.2 +++ gcn-gqr.c 24 Feb 2008 18:05:32 -0000 1.3 @@ -2,9 +2,9 @@ * drivers/misc/gcn-gqr.c * * Nintendo GameCube GQR driver - * Copyright (C) 2004-2007 The GameCube Linux Team + * Copyright (C) 2004-2008 The GameCube Linux Team * Copyright (C) 2004 Todd Jeffreys <to...@vo...> - * Copyright (C) 2007 Albert Herranz + * Copyright (C) 2007,2008 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -25,18 +25,6 @@ static u32 gqr_values[8]; static struct ctl_table_header *gqr_table_header = NULL; -enum { - CTL_GQRDIR = 1, - CTL_GQR0, - CTL_GQR1, - CTL_GQR2, - CTL_GQR3, - CTL_GQR4, - CTL_GQR5, - CTL_GQR6, - CTL_GQR7, -}; - #define SPR_GQR0 912 #define SPR_GQR1 913 #define SPR_GQR2 914 @@ -46,8 +34,8 @@ #define SPR_GQR6 918 #define SPR_GQR7 919 -#define MFSPR_CASE(i) case CTL_GQR##i: *((u32*)table->data) = mfspr(SPR_GQR##i) -#define MTSPR_CASE(i) case CTL_GQR##i: mtspr(SPR_GQR##i,*((u32*)table->data)) +#define MFSPR_CASE(i) case (i): *((u32*)table->data) = mfspr(SPR_GQR##i) +#define MTSPR_CASE(i) case (i): mtspr(SPR_GQR##i,*((u32*)table->data)) static int proc_dogqr(ctl_table *table,int write,struct file *file, void __user *buffer,size_t *lenp,loff_t *ppos) @@ -55,7 +43,7 @@ int r; if (!write) { /* if they are reading, update the variable */ - switch (table->ctl_name) { + switch (table->data - (void *)gqr_values) { MFSPR_CASE(0); break; MFSPR_CASE(1); break; MFSPR_CASE(2); break; @@ -72,7 +60,7 @@ r = proc_dointvec(table,write,file,buffer,lenp,ppos); if ((r == 0) && write) { /* if they are writing, update the reg */ - switch (table->ctl_name) { + switch (table->data - (void *)gqr_values) { MTSPR_CASE(0); break; MTSPR_CASE(1); break; MTSPR_CASE(2); break; @@ -90,7 +78,7 @@ } #define DECLARE_GQR(i) { \ - .ctl_name = CTL_GQR##i, \ + .ctl_name = CTL_UNNUMBERED, \ .procname = "gqr" #i, \ .data = gqr_values + i, \ .maxlen = sizeof(int), \ @@ -112,7 +100,7 @@ static ctl_table gqr_table[] = { { - .ctl_name = CTL_GQRDIR, + .ctl_name = CTL_UNNUMBERED, .procname = "gqr", .mode = 0555, .child = gqr_members Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Kconfig 16 Nov 2007 23:26:07 -0000 1.8 +++ Kconfig 24 Feb 2008 18:05:32 -0000 1.9 @@ -135,6 +135,21 @@ If you have an ACPI-compatible ASUS laptop, say Y or M here. +config FUJITSU_LAPTOP + tristate "Fujitsu Laptop Extras" + depends on X86 + depends on ACPI + depends on BACKLIGHT_CLASS_DEVICE + ---help--- + This is a driver for laptops built by Fujitsu: + + * P2xxx/P5xxx/S6xxx/S7xxx series Lifebooks + * Possibly other Fujitsu laptop models + + It adds support for LCD brightness control. + + If you have a Fujitsu laptop, say Y or M here. + config MSI_LAPTOP tristate "MSI Laptop Extras" depends on X86 @@ -158,6 +173,7 @@ tristate "Sony Laptop Extras" depends on X86 && ACPI select BACKLIGHT_CLASS_DEVICE + depends on INPUT ---help--- This mini-driver drives the SNC and SPIC devices present in the ACPI BIOS of the Sony Vaio laptops. @@ -180,6 +196,7 @@ select BACKLIGHT_CLASS_DEVICE select HWMON select NVRAM + depends on INPUT ---help--- This is a driver for the IBM and Lenovo ThinkPad laptops. It adds support for Fn-Fx key combinations, Bluetooth control, video @@ -187,7 +204,7 @@ For more information about this driver see <file:Documentation/thinkpad-acpi.txt> and <http://ibm-acpi.sf.net/> . - This driver was formely known as ibm-acpi. + This driver was formerly known as ibm-acpi. If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. @@ -221,10 +238,22 @@ default y ---help--- Allows the thinkpad_acpi driver to handle removable bays. It will - eletrically disable the device in the bay, and also generate + electrically disable the device in the bay, and also generate notifications when the bay lever is ejected or inserted. If you are not sure, say Y here. +config ATMEL_SSC + tristate "Device driver for Atmel SSC peripheral" + depends on AVR32 || ARCH_AT91 + ---help--- + This option enables device driver support for Atmel Syncronized + Serial Communication peripheral (SSC). + + The SSC peripheral supports a wide variety of serial frame based + communications, i.e. I2S, SPI, etc. + + If unsure, say N. + endif # MISC_DEVICES Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Makefile 16 Nov 2007 23:26:08 -0000 1.5 +++ Makefile 24 Feb 2008 18:05:32 -0000 1.6 @@ -7,6 +7,7 @@ obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o +obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o obj-$(CONFIG_LKDTM) += lkdtm.o obj-$(CONFIG_TIFM_CORE) += tifm_core.o obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o @@ -14,6 +15,7 @@ obj-$(CONFIG_SGI_IOC4) += ioc4.o obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o +obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o obj-$(CONFIG_GAMECUBE_GQR) += gcn-gqr.o obj-$(CONFIG_GAMECUBE_MI) += gcn-mi.o |
