patch-2.3.99-pre9 linux/include/linux/hdreg.h

• Lines: 50
• Date: Tue May 23 14:18:47 2000
• Orig file: v2.3.99-pre8/linux/include/linux/hdreg.h
• Orig date: Wed Apr 26 16:34:09 2000

diff -u --recursive --new-file v2.3.99-pre8/linux/include/linux/hdreg.h linux/include/linux/hdreg.h
@@ -181,6 +181,8 @@
 #define HDIO_GET_DMA		0x030b	/* get use-dma flag */
 #define HDIO_GET_NICE		0x030c	/* get nice flags */
 #define HDIO_GET_IDENTITY	0x030d	/* get IDE identification info */
+#define HDIO_DRIVE_CMD_AEB	0x031e
+#define HDIO_DRIVE_TASK		0x031e
 #define HDIO_DRIVE_CMD		0x031f	/* execute a special drive command */
 
 /* hd/ide ctl's that pass (arg) non-ptr values are numbered 0x032n/0x033n */
@@ -207,7 +209,6 @@
 #define HDIO_GETGEO_BIG		0x0330	/* */
 #define HDIO_GETGEO_BIG_RAW	0x0331	/* */
 
-
 #define __NEW_HD_DRIVE_ID
 /* structure returned by HDIO_GET_IDENTITY, as per ANSI ATA2 rev.2f spec */
 struct hd_driveid {
@@ -272,7 +273,7 @@
 	unsigned short	CurAPMvalues;	/* current APM values */
 	unsigned short	word92;		/* reserved (word 92) */
 	unsigned short	hw_config;	/* hardware config */
-	unsigned short  words94_125[31];/* reserved words 94-125 */
+	unsigned short  words94_125[32];/* reserved words 94-125 */
 	unsigned short	last_lun;	/* reserved (word 126) */
 	unsigned short	word127;	/* reserved (word 127) */
 	unsigned short	dlf;		/* device lock function
@@ -293,8 +294,10 @@
 					 * 1	read-look-ahead
 					 * 0	write cache
 					 */
-	unsigned short	words130_159[30];/* reserved vendor words 130-159 */
-	unsigned short	words160_255[96];/* reserved words 160-255 */
+	unsigned short	words130_155[26];/* reserved vendor words 130-155 */
+	unsigned short	word156;
+	unsigned short	words157_159[3];/* reserved vendor words 157-159 */
+	unsigned short	words160_255[95];/* reserved words 160-255 */
 };
 
 /*
@@ -313,10 +316,6 @@
  * These routines are used for kernel command line parameters from main.c:
  */
 #include <linux/config.h>
-
-#ifdef CONFIG_BLK_DEV_HD
-void hd_setup(char *, int *);
-#endif	/* CONFIG_BLK_DEV_HD */
 
 #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE)
 int ide_register(int io_port, int ctl_port, int irq);