Menu
▾
▴
[Gc-linux-cvs] linux/drivers/misc Kconfig, 1.6, 1.7 Makefile, 1.3, 1.4 gcn-gqr.c, 1.1, 1.2 gcn-mi.c, 1.5, 1.6
|
From: Albert H. <he...@us...> - 2007-11-14 23:09:18
|
Update of /cvsroot/gc-linux/linux/drivers/misc In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4431/drivers/misc Modified Files: Kconfig Makefile gcn-gqr.c gcn-mi.c Log Message: Merged 2.6.22. Updated drivers to use in_be* and out_be* instead of read* and write* input/output instructions. Updated DI driver: - do not use debug extensions with unknown drive models - do not load custom firmware on xenogc/duoq - evict alien firmwares and load custom formware on known drive models Index: gcn-gqr.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-gqr.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gcn-gqr.c 2 Dec 2004 15:52:41 -0000 1.1 +++ gcn-gqr.c 14 Nov 2007 23:08:49 -0000 1.2 @@ -2,8 +2,9 @@ * drivers/misc/gcn-gqr.c * * Nintendo GameCube GQR driver + * Copyright (C) 2004-2007 The GameCube Linux Team * Copyright (C) 2004 Todd Jeffreys <to...@vo...> - * Copyright (C) 2004 The GameCube Linux Team + * Copyright (C) 2007 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -121,7 +122,7 @@ int __init gcngqr_init(void) { - if (!(gqr_table_header = register_sysctl_table(gqr_table,1))) { + if (!(gqr_table_header = register_sysctl_table(gqr_table))) { printk(KERN_ERR "Unable to register GQR sysctl table\n"); return -ENOMEM; } Index: Kconfig =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Kconfig,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Kconfig 30 Apr 2007 17:06:12 -0000 1.6 +++ Kconfig 14 Nov 2007 23:08:49 -0000 1.7 @@ -49,6 +49,15 @@ information on the specific driver level and support statement for your IBM server. +config PHANTOM + tristate "Sensable PHANToM" + depends on PCI + help + Say Y here if you want to build a driver for Sensable PHANToM device. + + If you choose to build module, its name will be phantom. If unsure, + say N here. + If unsure, say N. @@ -136,14 +145,71 @@ depends on X86 && ACPI select BACKLIGHT_CLASS_DEVICE ---help--- - This mini-driver drives the SNC device present in the ACPI BIOS of - the Sony Vaio laptops. + This mini-driver drives the SNC and SPIC devices present in the ACPI + BIOS of the Sony Vaio laptops. - It gives access to some extra laptop functionalities. In its current - form, this driver let the user set or query the screen brightness - through the backlight subsystem and remove/apply power to some + It gives access to some extra laptop functionalities like Bluetooth, + screen brightness control, Fn keys and allows powering on/off some devices. Read <file:Documentation/sony-laptop.txt> for more information. +config SONYPI_COMPAT + bool "Sonypi compatibility" + depends on SONY_LAPTOP + ---help--- + Build the sonypi driver compatibility code into the sony-laptop driver. + +config THINKPAD_ACPI + tristate "ThinkPad ACPI Laptop Extras" + depends on X86 && ACPI + select BACKLIGHT_CLASS_DEVICE + select HWMON + ---help--- + This is a driver for the IBM and Lenovo ThinkPad laptops. It adds + support for Fn-Fx key combinations, Bluetooth control, video + output switching, ThinkLight control, UltraBay eject and more. + 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. + + If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. + +config THINKPAD_ACPI_DEBUG + bool "Verbose debug mode" + depends on THINKPAD_ACPI + default n + ---help--- + Enables extra debugging information, at the expense of a slightly + increase in driver size. + + If you are not sure, say N here. + +config THINKPAD_ACPI_DOCK + bool "Legacy Docking Station Support" + depends on THINKPAD_ACPI + depends on ACPI_DOCK=n + default n + ---help--- + Allows the thinkpad_acpi driver to handle docking station events. + This support was made obsolete by the generic ACPI docking station + support (CONFIG_ACPI_DOCK). It will allow locking and removing the + laptop from the docking station, but will not properly connect PCI + devices. + + If you are not sure, say N here. + +config THINKPAD_ACPI_BAY + bool "Legacy Removable Bay Support" + depends on THINKPAD_ACPI + default y + ---help--- + Allows the thinkpad_acpi driver to handle removable bays. It will + eletrically 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. + + endmenu Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile 23 Jun 2005 20:02:18 -0000 1.3 +++ Makefile 14 Nov 2007 23:08:49 -0000 1.4 @@ -3,7 +3,17 @@ # obj- := misc.o # Dummy rule to force built-in.o to be made -obj-$(CONFIG_IBM_ASM) += ibmasm/ +obj-$(CONFIG_IBM_ASM) += ibmasm/ obj-$(CONFIG_HDPU_FEATURES) += hdpuftrs/ +obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o +obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o +obj-$(CONFIG_LKDTM) += lkdtm.o +obj-$(CONFIG_TIFM_CORE) += tifm_core.o +obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o +obj-$(CONFIG_PHANTOM) += phantom.o +obj-$(CONFIG_SGI_IOC4) += ioc4.o +obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o +obj-$(CONFIG_THINKPAD_ACPI) += thinkpad_acpi.o obj-$(CONFIG_GAMECUBE_GQR) += gcn-gqr.o obj-$(CONFIG_GAMECUBE_MI) += gcn-mi.o + Index: gcn-mi.c =================================================================== RCS file: /cvsroot/gc-linux/linux/drivers/misc/gcn-mi.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- gcn-mi.c 18 Feb 2007 22:56:02 -0000 1.5 +++ gcn-mi.c 14 Nov 2007 23:08:49 -0000 1.6 @@ -1,9 +1,9 @@ /* - * arch/ppc/platforms/gcn-mi.c + * drivers/misc/gcn-mi.c * * Nintendo GameCube Memory Interface driver - * Copyright (C) 2004-2005 The GameCube Linux Team - * Copyright (C) 2004,2005 Albert Herranz + * Copyright (C) 2004-2007 The GameCube Linux Team + * Copyright (C) 2004,2005,2007 Albert Herranz * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -110,10 +110,10 @@ spin_lock_irqsave(&priv->lock, flags); - address = readw(MI_ADDRLO) | (readw(MI_ADDRHI)<<16); + address = in_be16(MI_ADDRLO) | (in_be16(MI_ADDRHI)<<16); ack = 0; - cause = readw(MI_ICR); + cause = in_be16(MI_ICR); /* a fault was detected in some of the registered regions */ if ( (cause & 0xf) != 0) { @@ -145,8 +145,8 @@ } } ack |= cause; - writew(ack, MI_ICR); /* ack int */ - writew(0, MI_0x4020); /* kind of ack */ + out_be16(MI_ICR, ack); /* ack int */ + out_be16(MI_0x4020, 0); /* kind of ack */ spin_unlock_irqrestore(&priv->lock, flags); @@ -191,7 +191,7 @@ if (retval) { mi_printk(KERN_ERR, "request of irq%d failed\n", priv->irq); } else { - writew((1<<4), MI_IMR); /* do not mask all MI interrupts */ + out_be16(MI_IMR, (1<<4)); /* do not mask all MI interrupts */ } return retval; @@ -412,13 +412,12 @@ priv->regions_bitmap |= (1 << region); priv->nr_regions++; - writew((readw(MI_PROT_TYPE) & ~(3 << 2*region))|(type << 2*region), - MI_PROT_TYPE); + out_be16(MI_PROT_TYPE, + (in_be16(MI_PROT_TYPE) & ~(3 << 2*region))|(type << 2*region)); pagelo = physlo >> MI_PAGE_SHIFT; pagehi = (physhi >> MI_PAGE_SHIFT) - 1; - writel((pagelo << 16) | pagehi, - MI_PROT_REGION0 + 4*region); - writew(readw(MI_IMR) | (1 << region), MI_IMR); + out_be32(MI_PROT_REGION0 + 4*region, (pagelo << 16) | pagehi); + out_be16(MI_IMR, in_be16(MI_IMR) | (1 << region)); mi_printk(KERN_INFO, "protected region #%d" " from 0x%0lx to 0x%0lx with 0x%0x\n", region, @@ -442,9 +441,9 @@ if (region < 0 || region > MI_MAX_REGIONS) return -EINVAL; - writew(readw(MI_IMR) & ~(1 << region), MI_IMR); - writel(0, MI_PROT_REGION0 + 4*region); - writew(readw(MI_PROT_TYPE) | (MI_PROT_RW << 2*region), MI_PROT_TYPE); + out_be16(MI_IMR, in_be16(MI_IMR) & ~(1 << region)); + out_be32(MI_PROT_REGION0 + 4*region, 0); + out_be16(MI_PROT_TYPE, in_be16(MI_PROT_TYPE) | (MI_PROT_RW << 2*region)); if ( (priv->regions_bitmap & (1<<region)) != 0 ) mi_printk(KERN_INFO, "region #%d unprotected\n", region); @@ -462,7 +461,7 @@ { int region; - writew(0, MI_IMR); + out_be16(MI_IMR, 0); for (region = 0; region < MI_MAX_REGIONS; region++) { gcn_mi_region_unprotect(region); } |