diff options
| author | Martin Dalecki <dalecki@evision-ventures.com> | 2002-03-17 18:57:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-03-17 18:57:21 -0800 |
| commit | 198231a8fb86b3603a7d12ac72c6a74801594db0 (patch) | |
| tree | c9fda6658f2af20b280fcf50e3b08beef41bfab2 /include/linux | |
| parent | ed0e83f501aef5f7e6553728b697d2fa12f2a748 (diff) | |
[PATCH] 2.5.7-pre2 IDE 22a
- Apply more patches from Vojtech Pavlik for the handling of host chip setup.
Hopefully they are settled now.
- Kill unused CONFIG_BLK_DEV_MODES
- Push register addressing down in to task_vlb_sync.
- Make the taskfile parsing stuff actually readable. This is compressing the
code by an incredible amount. We use just one function doing the whole
scanning right now. This should make sure that the IRQ handler used by a
particular command is always right. I didn't introduce typos hopefully
here.
- Don't call ide_handler_parser as argument for do_taskfile() any longer. We
have killed this function by coalescing it's functionality with
ide_cmd_type_parser() anyway.
- Kill unused SLC90E66 code, which Vojtech apparently missed in his patch.
- sync up with 2.5.7-pre2
Once again the actual patch is rather big mostly due to the removal of
some default configuration variables which are not used anylonger. So time for
the next patch stage.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ide.h | 11 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index aa3d9c39913f..6dafc47697ff 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -815,7 +815,6 @@ typedef struct ide_task_s { int command_type; ide_pre_handler_t *prehandler; ide_handler_t *handler; - ide_post_handler_t *posthandler; void *special; /* valid_t generally */ struct request *rq; /* copy of request */ unsigned long block; /* copy of block */ @@ -842,17 +841,17 @@ void do_taskfile (ide_drive_t *drive, struct hd_drive_task_hdr *taskfile, struct * Special Flagged Register Validation Caller */ -ide_startstop_t set_multmode_intr (ide_drive_t *drive); -ide_startstop_t task_no_data_intr (ide_drive_t *drive); +extern ide_startstop_t recal_intr(ide_drive_t *drive); +extern ide_startstop_t set_geometry_intr(ide_drive_t *drive); +extern ide_startstop_t set_multmode_intr(ide_drive_t *drive); +extern ide_startstop_t task_no_data_intr(ide_drive_t *drive); int ide_wait_taskfile (ide_drive_t *drive, struct hd_drive_task_hdr *taskfile, struct hd_drive_hob_hdr *hobfile, byte *buf); int ide_raw_taskfile (ide_drive_t *drive, ide_task_t *cmd, byte *buf); -ide_pre_handler_t * ide_pre_handler_parser (struct hd_drive_task_hdr *taskfile, struct hd_drive_hob_hdr *hobfile); -ide_handler_t * ide_handler_parser (struct hd_drive_task_hdr *taskfile, struct hd_drive_hob_hdr *hobfile); /* Expects args is a full set of TF registers and parses the command type */ -int ide_cmd_type_parser (ide_task_t *args); +extern void ide_cmd_type_parser(ide_task_t *args); int ide_cmd_ioctl (ide_drive_t *drive, struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); int ide_task_ioctl (ide_drive_t *drive, struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 30c965801c10..41eed9cd438e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -865,6 +865,7 @@ #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_GTS2 0x0151 #define PCI_DEVICE_ID_NVIDIA_GEFORCE2_ULTRA 0x0152 #define PCI_DEVICE_ID_NVIDIA_QUADRO2_PRO 0x0153 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE 0x01bc #define PCI_VENDOR_ID_IMS 0x10e0 #define PCI_DEVICE_ID_IMS_8849 0x8849 |