[Gc-linux-cvs] linux/drivers/block Kconfig, 1.38, 1.39 Makefile, 1.26, 1.27 rvl-mem2.c, 1.6, 1.7 rvl-stsd.c, 1.7, 1.8

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/block
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31074/drivers/block

Modified Files:
	Kconfig Makefile rvl-mem2.c rvl-stsd.c 
Log Message:
Merge gc-linux-v2.6.30.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Kconfig	25 Oct 2009 18:45:35 -0000	1.38
--- Kconfig	25 Oct 2009 18:50:27 -0000	1.39
***************
*** 64,67 ****
--- 64,132 ----
  	  module will be called z2ram.
  
+ config GAMECUBE_SD
+ 	tristate "Nintendo GameCube/Wii MMC/SD card"
+ 	depends on GAMECUBE_EXI
+ 	help
+ 	  This enables support for using SD and MMC cards through
+ 	  the Nintendo SD Card Adapter (DOL-019) or compatible hardware.
+ 
+ 	  You probably want to compile FAT support, and the required
+ 	  codepages, or mount will complain. See Filesystems -> DOS/FAT/NT
+ 	  filesystems and Filesystems -> Native Language Support
+ 
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-sd.
+ 
+ config GAMECUBE_ARAM
+ 	tristate "Nintendo GameCube Auxiliary RAM (ARAM)"
+ 	depends on GAMECUBE
+ 	help
+ 	  This enables support for using the 16MB of ARAM found in the
+ 	  Nintendo GameCube as a block device.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-aram.
+ 
+ config GAMECUBE_DI
+ 	tristate "Nintendo GameCube Disk Interface (DI)"
+ 	depends on GAMECUBE
+ 	help
+ 	  This enables support for using the DVD drive unit found
+ 	  in the Nintendo GameCube.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called gcn-di.
+ 
+ config WII_MEM2
+ 	tristate "Nintendo Wii MEM2"
+ 	depends on WII
+ 	help
+ 	  This enables support for using the MEM2 found in the
+ 	  Nintendo Wii as a block device.
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-mem2.
+ 
+ config WII_SD
+ 	tristate "Nintendo Wii front slot MMC/SD"
+ 	depends on STARLET_IOS
+ 	help
+ 	  This enables support for MMC/SD cards using the front SD card
+ 	  slot of the Nintendo Wii.
+ 
+ 	  You probably want to compile FAT support, and the required
+ 	  codepages, or mount will complain. See Filesystems -> DOS/FAT/NT
+ 	  filesystems and Filesystems -> Native Language Support
+ 
+ 	  Say Y if you want to include this driver in the kernel.
+ 
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called rvl-stsd.
+ 
  config BLK_DEV_XD
  	tristate "XT hard disk support"

Index: rvl-mem2.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-mem2.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rvl-mem2.c	2 Mar 2009 18:51:03 -0000	1.6
--- rvl-mem2.c	25 Oct 2009 18:50:27 -0000	1.7
***************
*** 100,104 ****
  				error = 0;
  			}
! 			blk_end_request(req, error, len);
  		} else {
  			end_request(req, 0);
--- 100,104 ----
  				error = 0;
  			}
! 			__blk_end_request(req, error, len);
  		} else {
  			end_request(req, 0);

Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Makefile	25 Oct 2009 18:45:35 -0000	1.26
--- Makefile	25 Oct 2009 18:50:27 -0000	1.27
***************
*** 14,17 ****
--- 14,22 ----
  obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o
  obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o
+ obj-$(CONFIG_GAMECUBE_SD)	+= gcn-sd.o
+ obj-$(CONFIG_GAMECUBE_ARAM)	+= gcn-aram.o
+ obj-$(CONFIG_GAMECUBE_DI)	+= gcn-di/
+ obj-$(CONFIG_WII_MEM2)		+= rvl-mem2.o
+ obj-$(CONFIG_WII_SD)		+= rvl-stsd.o
  obj-$(CONFIG_BLK_DEV_RAM)	+= brd.o
  obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o

Index: rvl-stsd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-stsd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rvl-stsd.c	2 Mar 2009 18:49:41 -0000	1.7
--- rvl-stsd.c	25 Oct 2009 18:50:27 -0000	1.8
***************
*** 36,39 ****
--- 36,40 ----
  #include <linux/of_platform.h>
  #include <asm/starlet.h>
+ #include <asm/starlet-ios.h>
  
  /*
***************
*** 52,56 ****
  #define DRV_AUTHOR      "Albert Herranz"
  
! static char stsd_driver_version[] = "0.3i";
  
  #define drv_printk(level, format, arg...) \
--- 53,57 ----
  #define DRV_AUTHOR      "Albert Herranz"
  
! static char stsd_driver_version[] = "0.4i";
  
  #define drv_printk(level, format, arg...) \
***************
*** 2199,2202 ****
--- 2200,2206 ----
  	int error;
  
+ 	if (starlet_get_ipc_flavour() != STARLET_IPC_IOS)
+ 		return -ENODEV;
+ 
  	host = kzalloc(sizeof(*host), GFP_KERNEL);
  	if (!host) {
***************
*** 2247,2251 ****
  
  static struct of_device_id stsd_of_match[] = {
! 	{ .compatible = "nintendo,starlet-sd" },
  	{ },
  };
--- 2251,2255 ----
  
  static struct of_device_id stsd_of_match[] = {
! 	{ .compatible = "nintendo,starlet-ios-sd" },
  	{ },
  };