patch-2.0.21-2.1.0 linux/drivers/block/floppy.c

• Lines: 40
• Date: Sat Sep 28 23:05:16 1996
• Orig file: lx2.0/v2.0.21/linux/drivers/block/floppy.c
• Orig date: Mon Sep 2 15:18:25 1996

diff -u --recursive --new-file lx2.0/v2.0.21/linux/drivers/block/floppy.c linux/drivers/block/floppy.c
@@ -1043,7 +1043,7 @@
 	fd_cacheflush(raw_cmd->kernel_data, raw_cmd->length);
 	fd_set_dma_mode((raw_cmd->flags & FD_RAW_READ)?
 			DMA_MODE_READ : DMA_MODE_WRITE);
-	fd_set_dma_addr(virt_to_bus(raw_cmd->kernel_data));
+	fd_set_dma_addr(raw_cmd->kernel_data);
 	fd_set_dma_count(raw_cmd->length);
 	virtual_dma_port = FDCS->address;
 	fd_enable_dma();
@@ -2087,7 +2087,7 @@
 
 	/* determine interleave */
 	il = 1;
-	if (_floppy->sect > DP->interleave_sect && F_SIZECODE == 2)
+	if (_floppy->fmt_gap < 0x22)
 		il++;
 
 	/* initialize field */
@@ -3485,8 +3485,8 @@
 		printk("\n");
 }
 
-static int floppy_read(struct inode * inode, struct file * filp,
-		       char * buf, int count)
+static long floppy_read(struct inode * inode, struct file * filp,
+		       char * buf, unsigned long count)
 {
 	int drive = DRIVE(inode->i_rdev);
 
@@ -3496,8 +3496,8 @@
 	return block_read(inode, filp, buf, count);
 }
 
-static int floppy_write(struct inode * inode, struct file * filp,
-			const char * buf, int count)
+static long floppy_write(struct inode * inode, struct file * filp,
+			const char * buf, unsigned long count)
 {
 	int block;
 	int ret;