History

Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

Linus Torvalds committed 20 years ago

Commit 44779142 parents 8ee3f40 17514e811 files · +36 −78Browse files

Showing the changes to include (3 of 11 files). Show all

Unified · Split

3 files
  1. include/linux/hdreg.h +4 −2
  2. include/linux/ide.h +0 −26
  3. include/linux/pci_ids.h +2 −0
include/linux/hdreg.h+4−2
@@ -80,10 +80,12 @@ · 79 unmodified lines
8080 /*
8181 * Define standard taskfile in/out register
8282 */
83−#define IDE_TASKFILE_STD_OUT_FLAGS 0xFE
8483 #define IDE_TASKFILE_STD_IN_FLAGS 0xFE
85−#define IDE_HOB_STD_OUT_FLAGS 0x3C
8684 #define IDE_HOB_STD_IN_FLAGS 0x3C
85+#ifndef __KERNEL__
86+#define IDE_TASKFILE_STD_OUT_FLAGS 0xFE
87+#define IDE_HOB_STD_OUT_FLAGS 0x3C
88+#endif
8789
8890 typedef unsigned char task_ioreg_t;
8991 typedef unsigned long sata_ioreg_t;
include/linux/ide.h+0−26
@@ -1201,37 +1201,11 @@ extern u64 ide_get_error_location(ide_drive_t *, char *); · 1200 unmodified lines
12011201 */
12021202 typedef enum {
12031203 ide_wait, /* insert rq at end of list, and wait for it */
1204− ide_next, /* insert rq immediately after current request */
12051204 ide_preempt, /* insert rq in front of current request */
12061205 ide_head_wait, /* insert rq in front of current request and wait for it */
12071206 ide_end /* insert rq at end of list, but don't wait for it */
12081207 } ide_action_t;
12091208
1210−/*
1211− * This function issues a special IDE device request
1212− * onto the request queue.
1213− *
1214− * If action is ide_wait, then the rq is queued at the end of the
1215− * request queue, and the function sleeps until it has been processed.
1216− * This is for use when invoked from an ioctl handler.
1217− *
1218− * If action is ide_preempt, then the rq is queued at the head of
1219− * the request queue, displacing the currently-being-processed
1220− * request and this function returns immediately without waiting
1221− * for the new rq to be completed. This is VERY DANGEROUS, and is
1222− * intended for careful use by the ATAPI tape/cdrom driver code.
1223− *
1224− * If action is ide_next, then the rq is queued immediately after
1225− * the currently-being-processed-request (if any), and the function
1226− * returns without waiting for the new rq to be completed. As above,
1227− * This is VERY DANGEROUS, and is intended for careful use by the
1228− * ATAPI tape/cdrom driver code.
1229− *
1230− * If action is ide_end, then the rq is queued at the end of the
1231− * request queue, and the function returns immediately without waiting
1232− * for the new rq to be completed. This is again intended for careful
1233− * use by the ATAPI tape/cdrom driver code.
1234− */
12351209 extern int ide_do_drive_cmd(ide_drive_t *, struct request *, ide_action_t);
12361210
12371211 /*
include/linux/pci_ids.h+2−0
@@ -620,6 +620,7 @@ · 619 unmodified lines
620620 #define PCI_DEVICE_ID_SI_961 0x0961
621621 #define PCI_DEVICE_ID_SI_962 0x0962
622622 #define PCI_DEVICE_ID_SI_963 0x0963
623+#define PCI_DEVICE_ID_SI_965 0x0965
623624 #define PCI_DEVICE_ID_SI_5511 0x5511
624625 #define PCI_DEVICE_ID_SI_5513 0x5513
625626 #define PCI_DEVICE_ID_SI_5518 0x5518
@@ -1234,6 +1235,7 @@ · 608 unmodified lines
12341235 #define PCI_DEVICE_ID_VIA_8703_51_0 0x3148
12351236 #define PCI_DEVICE_ID_VIA_8237_SATA 0x3149
12361237 #define PCI_DEVICE_ID_VIA_XN266 0x3156
1238+#define PCI_DEVICE_ID_VIA_6410 0x3164
12371239 #define PCI_DEVICE_ID_VIA_8754C_0 0x3168
12381240 #define PCI_DEVICE_ID_VIA_8235 0x3177
12391241 #define PCI_DEVICE_ID_VIA_8385_0 0x3188