Update of /cvsroot/gc-linux/linux/drivers/block
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22863/drivers/block
Modified Files:
Kconfig Makefile rvl-stsd.c
Log Message:
- merge 2.6.27
- add gcnvi_udbg driver
- add starlet-gpio driver
- add initial SDHC support to rvl-stsd driver
- add support for MEM1+MEM2 as normal RAM
- enhanced rvl-sthcd device detection
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile 13 Sep 2008 19:42:53 -0000 1.20
+++ Makefile 15 Nov 2008 20:10:14 -0000 1.21
@@ -36,5 +36,6 @@
obj-$(CONFIG_VIODASD) += viodasd.o
obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
obj-$(CONFIG_BLK_DEV_UB) += ub.o
+obj-$(CONFIG_BLK_DEV_HD) += hd.o
obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o
Index: rvl-stsd.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/rvl-stsd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rvl-stsd.c 13 Sep 2008 19:42:53 -0000 1.4
+++ rvl-stsd.c 15 Nov 2008 20:10:14 -0000 1.5
@@ -21,8 +21,8 @@
#define DEBUG
-#define DBG(fmt, arg...) pr_debug(fmt, ##arg)
-//#define DBG(fmt, arg...) drv_printk(KERN_ERR, fmt, ##arg)
+//#define DBG(fmt, arg...) pr_debug(fmt, ##arg)
+#define DBG(fmt, arg...) drv_printk(KERN_ERR, fmt, ##arg)
#include <linux/blkdev.h>
#include <linux/delay.h>
@@ -45,12 +45,13 @@
[...1260 lines suppressed...]
static void stsd_exit_xfer(struct stsd_host *host)
{
- struct stsd_transfer *xfer = host->xfer;
+ struct stsd_xfer *xfer = host->xfer;
- starlet_kfree(xfer->reply);
+ starlet_ioh_kfree(xfer->cmd);
+ starlet_ioh_kfree(xfer->reply);
starlet_kfree(host->xfer);
}
@@ -1539,7 +2061,7 @@
host->max_phys_segments = 1;
blk_queue_max_phys_segments(queue, host->max_phys_segments);
blk_queue_max_hw_segments(queue, host->max_phys_segments);
- blk_queue_max_sectors(queue, 16); /* 16 * 512 = 8K */
+ blk_queue_max_sectors(queue, STSD_MAX_SECTORS); /* 16 * 512 = 8K */
blk_queue_dma_alignment(queue, STARLET_IPC_DMA_ALIGN);
queue->queuedata = host;
host->queue = queue;
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Kconfig 13 Sep 2008 19:42:53 -0000 1.33
+++ Kconfig 15 Nov 2008 20:10:14 -0000 1.34
@@ -522,4 +522,16 @@
This is the virtual block driver for virtio. It can be used with
lguest or QEMU based VMMs (like KVM or Xen). Say Y or M.
+config BLK_DEV_HD
+ bool "Very old hard disk (MFM/RLL/IDE) driver"
+ depends on HAVE_IDE
+ depends on !ARM || ARCH_RPC || ARCH_SHARK || BROKEN
+ help
+ This is a very old hard disk driver that lacks the enhanced
+ functionality of the newer ones.
+
+ It is required for systems with ancient MFM/RLL/ESDI drives.
+
+ If unsure, say N.
+
endif # BLK_DEV
|
