patch-2.1.15 linux/include/linux/blk.h

• Lines: 35
• Date: Thu Dec 12 17:33:06 1996
• Orig file: v2.1.14/linux/include/linux/blk.h
• Orig date: Wed Oct 16 10:48:29 1996

diff -u --recursive --new-file v2.1.14/linux/include/linux/blk.h linux/include/linux/blk.h
@@ -105,6 +105,9 @@
 void initrd_init(void);
 
 #endif
+#ifdef CONFIG_BLK_DEV_PS2
+extern int ps2esdi_init(void);
+#endif
 
 #define RO_IOCTLS(dev,where) \
   case BLKROSET: { int __val;  if (!suser()) return -EACCES; \
@@ -202,6 +205,14 @@
 #define DEVICE_ON(device)
 #define DEVICE_OFF(device)
 
+#elif (MAJOR_NR == PS2ESDI_MAJOR)
+
+#define DEVICE_NAME "PS/2 ESDI"
+#define DEVICE_REQUEST do_ps2esdi_request
+#define DEVICE_NR(device) (MINOR(device) >> 6)
+#define DEVICE_ON(device)
+#define DEVICE_OFF(device)
+
 #elif (MAJOR_NR == CDU31A_CDROM_MAJOR)
 
 #define DEVICE_NAME "CDU31A"
@@ -412,7 +423,8 @@
 	add_blkdev_randomness(MAJOR(req->rq_dev));
 #endif
 #ifdef IDE_DRIVER
-	blk_dev[MAJOR(req->rq_dev)].current_request = req->next;
+	hwgroup->drive->queue = req->next;
+	blk_dev[MAJOR(req->rq_dev)].current_request = NULL;
 	hwgroup->rq = NULL;
 #else
 	DEVICE_OFF(req->rq_dev);