diff options
| author | Martin Dalecki <dalecki@evision-ventures.com> | 2002-05-09 00:13:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-05-09 00:13:04 -0700 |
| commit | cbb487832c3715fb1701c8da17de6f8560b9d5a5 (patch) | |
| tree | f3bd6e3e7a4e095a7cb783ac54b81a99ac872603 /include/linux | |
| parent | 62a62049a7b0a8a357729e622d637aa0c3e12599 (diff) | |
[PATCH] 2.5.14 IDE 59
Basically PCI driver handling reorganization. This is one step further
ahead toward the goal of fully modularized host chip drivers.
- Adjust ide-scsi to the new error handling. Just don't try any device
resets there.
- Add unmasking of IRQ per default to the PMac PCI code.
- Split up the crap table from ide-pci. Let the corresponding drivers do
registration of the functions they provide. This small change makes
this patch rather big.
- Hard-code the number of ports requested for DMA engines. They are always
precisely 8 on PCs. If you hove something different to deal with,
well then please just provide your own init_dma method.
- Remove the HDIO_GETGEO_BIG ioctl. Patch by Andries Brouwer. Applies
unmodified.
- Make ON_BOARD be equal 0, so we can spare ourself some typing in structure
initialization.
- Normalize the terminology in the host chip drivers. It will make spotting
the tons of common code found there later easier.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/hdreg.h | 4 | ||||
| -rw-r--r-- | include/linux/ide.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h index e54151f54697..dd54c5a269f1 100644 --- a/include/linux/hdreg.h +++ b/include/linux/hdreg.h @@ -280,7 +280,7 @@ struct hd_geometry { unsigned long start; }; -/* BIG GEOMETRY */ +/* BIG GEOMETRY - dying, used only by HDIO_GETGEO_BIG_RAW */ struct hd_big_geometry { unsigned char heads; unsigned char sectors; @@ -327,7 +327,7 @@ enum { }; /* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x033n/0x033n */ -#define HDIO_GETGEO_BIG 0x0330 /* */ +/* 0x330 is reserved - used to be HDIO_GETGEO_BIG */ #define HDIO_GETGEO_BIG_RAW 0x0331 /* */ #define __NEW_HD_DRIVE_ID diff --git a/include/linux/ide.h b/include/linux/ide.h index 8c2d7e2c076d..8e2950781b00 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -853,8 +853,8 @@ extern int ide_register_subdriver(struct ata_device *, struct ata_operations *); extern int ide_unregister_subdriver(struct ata_device *drive); #ifdef CONFIG_PCI -# define ON_BOARD 1 -# define NEVER_BOARD 0 +# define ON_BOARD 0 +# define NEVER_BOARD 1 # ifdef CONFIG_BLK_DEV_OFFBOARD # define OFF_BOARD ON_BOARD # else @@ -889,8 +889,9 @@ extern ide_startstop_t ide_dma_intr(struct ata_device *, struct request *); extern int check_drive_lists(struct ata_device *, int good_bad); extern int XXX_ide_dmaproc(struct ata_device *); extern void ide_release_dma(struct ata_channel *); -extern void ide_setup_dma(struct ata_channel *, unsigned long, unsigned int) __init; extern int ata_start_dma(struct ata_device *, struct request *rq); + +extern void ata_init_dma(struct ata_channel *, unsigned long) __init; #endif extern spinlock_t ide_lock; |