patch-1.3.48 linux/drivers/block/cmd640.c

• Lines: 53
• Date: Sun Dec 17 11:17:19 1995
• Orig file: v1.3.47/linux/drivers/block/cmd640.c
• Orig date: Mon Dec 11 15:42:00 1995

diff -u --recursive --new-file v1.3.47/linux/drivers/block/cmd640.c linux/drivers/block/cmd640.c
@@ -237,7 +237,7 @@
 {
 	int  i;
 	int  second_port;
-	int  read_ahead;
+	int  cmd_read_ahead;
 	byte b;
 
 	for (i = 0; i < MAX_HWIFS; i++)
@@ -287,13 +287,13 @@
 	 */
 	bus_speed = (bus_type == vlb) ? 50 : 40; 
 
-#if 0	/* don't know if this is reliable yet */
+#if 1	/* don't know if this is reliable yet */
 	/*
 	 * Enable readahead for versions above 'A'
 	 */
-	read_ahead = (cmd640_chip_version > 1);
+	cmd_read_ahead = (cmd640_chip_version > 1);
 #else
-	read_ahead = 0;
+	cmd_read_ahead = 0;
 #endif
 	/*
 	 * Setup Control Register
@@ -303,7 +303,7 @@
 		b |= CNTRL_ENA_2ND;
 	else
 		b &= ~CNTRL_ENA_2ND;
-	if (read_ahead)
+	if (cmd_read_ahead)
 		b &= ~(CNTRL_DIS_RA0 | CNTRL_DIS_RA1);
 	else
 		b |= (CNTRL_DIS_RA0 | CNTRL_DIS_RA1);
@@ -314,7 +314,7 @@
 	 */
 	if (second_port) {
 		/* We reset timings, and setup read-ahead */
-		b = read_ahead ? 0 : (DIS_RA2 | DIS_RA3);
+		b = cmd_read_ahead ? 0 : (DIS_RA2 | DIS_RA3);
 		put_cmd640_reg(cmd640_key, ARTTIM23, b);
 		put_cmd640_reg(cmd640_key, DRWTIM23, 0);
 	}
@@ -343,7 +343,7 @@
 	put_cmd640_reg(cmd640_key, CMDTIM, 0);
 
 	printk("\n ... serialized, %s read-ahead, secondary interface %s\n",
-	       read_ahead ? "enabled" : "disabled",
+	       cmd_read_ahead ? "enabled" : "disabled",
 	       second_port ? "enabled" : "disabled");
 
 	return 1;