[Gc-linux-cvs] linux/drivers/block Kconfig,1.17,1.18 gcn-sd.c,1.3,1.4

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

Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16983

Modified Files:
	Kconfig gcn-sd.c 
Log Message:
MMC/SD card block driver rewrite.
Both MMC and SD cards are properly detected, including their size.
Only read support is enabled (no writes yet).
Performance is not optimal as the source code explains. Solutions?


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Kconfig	6 Jul 2005 18:28:01 -0000	1.17
+++ Kconfig	14 Sep 2005 19:52:47 -0000	1.18
@@ -107,20 +107,22 @@
 
 config GAMECUBE_SD
 	tristate "Nintendo GameCube SD and MMC memory card (EXPERIMENTAL)"
-	depends on GAMECUBE && GAMECUBE_EXI && EXPERIMENTAL && BROKEN
+	depends on GAMECUBE && GAMECUBE_EXI && EXPERIMENTAL
 	help
-	  This enables support for SD and MMC cards
-	  WARNING: driver is in alpha stage. Only reading supported. Card
-	  is reported as around 100MB, its size is not read from the card.
-	  Cards are NOT hot-pluggable. Compilation as module is broken.
+	  This enables support for using SD and MMC cards through
+	  the Nintendo SD Card Adapter (DOL-019) or compatible hardware.
+	  
+	  Currently, only read support is enabled.
 	  
 	  You probably want to compile FAT support, and the required
-	  codepages, or mount wil complain. See Filesystems -> DOS/FAT/NT
+	  codepages, or mount will complain. See Filesystems -> DOS/FAT/NT
 	  filesystems and Filesystems -> Native Language Support
-	  
-	  For schematic to connect the SD or MMC card, and more notes and
-	  warnings, see drivers/block/gcn-sd.c
 
+	  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 ATARI_ACSI
 	tristate "Atari ACSI support"
 	depends on ATARI && BROKEN

Index: gcn-sd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-sd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gcn-sd.c	6 Jul 2005 18:28:02 -0000	1.3
+++ gcn-sd.c	14 Sep 2005 19:52:47 -0000	1.4
@@ -1,9 +1,11 @@
 /*
  * drivers/block/gcn-sd.c
  *
- * Nintendo GameCube SD/MMC memory card driver
- * Copyright (C) 2004-2005 The GameCube Linux Team
- * Copyright (C) 2004,2005 by Rob Reilink (ro...@re...)
+ * MMC/SD card block driver for the Nintendo GameCube
+ * Copyright (C) 2005 The GameCube Linux Team
+ * Copyright (C) 2004,2005 Rob Reylink
+ * Copyright (C) 2005 Todd Jeffreys
+ * Copyright (C) 2005 Albert Herranz
[...1712 lines suppressed...]
+	if (register_blkdev(SD_MAJOR, DRV_MODULE_NAME)) {
+		sd_printk(KERN_ERR, "unable to register major %d\n", SD_MAJOR);
+		retval = -EIO;
+		goto out;
+	}
+
+	retval = exi_driver_register(&sd_driver);
+
+      out:
+	return retval;
+}
+
+static void __exit sd_exit_module(void)
+{
+	unregister_blkdev(SD_MAJOR, DRV_MODULE_NAME);
+	exi_driver_unregister(&sd_driver);
+}
+
+module_init(sd_init_module);
+module_exit(sd_exit_module);