diff options
| author | Jens Axboe <axboe@suse.de> | 2002-10-06 19:27:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-06 19:27:37 -0700 |
| commit | 2d0dbb4bb2abdda6fcfda2697e30c7ec0af89323 (patch) | |
| tree | df42701ca63a0bbc52a5770b97ac7f655df41a5e /include/linux/ide.h | |
| parent | da5dce5c02b5872e76f780f0866b5d82f6fd6f80 (diff) | |
[PATCH] ide io port types
IDE uses u32 as being an io port, which is wrong. We even have an arch
type for this, ide_ioreg_t. Use that.
Also fix a bad printk() in ide-disk, introduced with the swsusp stuff.
Diffstat (limited to 'include/linux/ide.h')
| -rw-r--r-- | include/linux/ide.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 7b8ebfe2c8dd..18dd00fc7c58 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -299,17 +299,17 @@ typedef enum { ide_unknown, ide_generic, ide_pci, typedef struct ide_io_ops_s { /* insert io operations here! */ - void (*OUTB)(u8 addr, u32 port); - void (*OUTW)(u16 addr, u32 port); - void (*OUTL)(u32 addr, u32 port); - void (*OUTSW)(u32 port, void *addr, u32 count); - void (*OUTSL)(u32 port, void *addr, u32 count); - - u8 (*INB)(u32 port); - u16 (*INW)(u32 port); - u32 (*INL)(u32 port); - void (*INSW)(u32 port, void *addr, u32 count); - void (*INSL)(u32 port, void *addr, u32 count); + void (*OUTB)(u8 addr, ide_ioreg_t port); + void (*OUTW)(u16 addr, ide_ioreg_t port); + void (*OUTL)(u32 addr, ide_ioreg_t port); + void (*OUTSW)(ide_ioreg_t port, void *addr, u32 count); + void (*OUTSL)(ide_ioreg_t port, void *addr, u32 count); + + u8 (*INB)(ide_ioreg_t port); + u16 (*INW)(ide_ioreg_t port); + u32 (*INL)(ide_ioreg_t port); + void (*INSW)(ide_ioreg_t port, void *addr, u32 count); + void (*INSL)(ide_ioreg_t port, void *addr, u32 count); } ide_io_ops_t; /* @@ -963,17 +963,17 @@ typedef struct hwif_s { #if 0 ide_io_ops_t *iops; #else - void (*OUTB)(u8 addr, u32 port); - void (*OUTW)(u16 addr, u32 port); - void (*OUTL)(u32 addr, u32 port); - void (*OUTSW)(u32 port, void *addr, u32 count); - void (*OUTSL)(u32 port, void *addr, u32 count); - - u8 (*INB)(u32 port); - u16 (*INW)(u32 port); - u32 (*INL)(u32 port); - void (*INSW)(u32 port, void *addr, u32 count); - void (*INSL)(u32 port, void *addr, u32 count); + void (*OUTB)(u8 addr, ide_ioreg_t port); + void (*OUTW)(u16 addr, ide_ioreg_t port); + void (*OUTL)(u32 addr, ide_ioreg_t port); + void (*OUTSW)(ide_ioreg_t port, void *addr, u32 count); + void (*OUTSL)(ide_ioreg_t port, void *addr, u32 count); + + u8 (*INB)(ide_ioreg_t port); + u16 (*INW)(ide_ioreg_t port); + u32 (*INL)(ide_ioreg_t port); + void (*INSW)(ide_ioreg_t port, void *addr, u32 count); + void (*INSL)(ide_ioreg_t port, void *addr, u32 count); #endif /* dma physical region descriptor table (cpu view) */ |