* PATCH: kill more ioregs, add OUTBSYNC
@ 2003-02-18 18:17 Alan Cox
2003-02-18 20:53 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 3+ messages in thread
From: Alan Cox @ 2003-02-18 18:17 UTC (permalink / raw)
To: torvalds, linux-kernel
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.61/include/linux/ide.h linux-2.5.61-ac2/include/linux/ide.h
--- linux-2.5.61/include/linux/ide.h 2003-02-10 18:38:20.000000000 +0000
+++ linux-2.5.61-ac2/include/linux/ide.h 2003-02-18 18:02:56.000000000 +0000
@@ -894,9 +885,9 @@
char name[6]; /* name of interface, eg. "ide0" */
/* task file registers for pata and sata */
- ide_ioreg_t io_ports[IDE_NR_PORTS];
- sata_ioreg_t sata_scr[SATA_NR_PORTS];
- sata_ioreg_t sata_misc[SATA_NR_PORTS];
+ unsigned long io_ports[IDE_NR_PORTS];
+ unsigned long sata_scr[SATA_NR_PORTS];
+ unsigned long sata_misc[SATA_NR_PORTS];
hw_regs_t hw; /* Hardware info */
ide_drive_t drives[MAX_DRIVES]; /* drive info */
@@ -960,9 +951,6 @@
void (*atapi_output_bytes)(ide_drive_t *, void *, u32);
#endif
-#if 0
- ide_dma_ops_t *dmaops;
-#else
int (*ide_dma_read)(ide_drive_t *drive);
int (*ide_dma_write)(ide_drive_t *drive);
int (*ide_dma_begin)(ide_drive_t *drive);
@@ -988,23 +976,19 @@
ide_startstop_t (*ide_dma_queued_read)(ide_drive_t *drive);
ide_startstop_t (*ide_dma_queued_write)(ide_drive_t *drive);
ide_startstop_t (*ide_dma_queued_start)(ide_drive_t *drive);
-#endif
-#if 0
- ide_io_ops_t *iops;
-#else
- 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
+ void (*OUTB)(u8 addr, unsigned long port);
+ void (*OUTBSYNC)(u8 addr, unsigned long port);
+ void (*OUTW)(u16 addr, unsigned long port);
+ void (*OUTL)(u32 addr, unsigned long port);
+ void (*OUTSW)(unsigned long port, void *addr, u32 count);
+ void (*OUTSL)(unsigned long port, void *addr, u32 count);
+
+ u8 (*INB)(unsigned long port);
+ u16 (*INW)(unsigned long port);
+ u32 (*INL)(unsigned long port);
+ void (*INSW)(unsigned long port, void *addr, u32 count);
+ void (*INSL)(unsigned long port, void *addr, u32 count);
/* dma physical region descriptor table (cpu view) */
unsigned int *dmatable_cpu;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: PATCH: kill more ioregs, add OUTBSYNC
2003-02-18 18:17 PATCH: kill more ioregs, add OUTBSYNC Alan Cox
@ 2003-02-18 20:53 ` Benjamin Herrenschmidt
2003-02-19 2:05 ` Alan Cox
0 siblings, 1 reply; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2003-02-18 20:53 UTC (permalink / raw)
To: Alan Cox; +Cc: Linus Torvalds, linux-kernel
On Tue, 2003-02-18 at 19:17, Alan Cox wrote:
> + void (*OUTBSYNC)(u8 addr, unsigned long port);
This is the version without the drive parameter... This is
on purpose ?
Regards,
Ben.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: PATCH: kill more ioregs, add OUTBSYNC
2003-02-18 20:53 ` Benjamin Herrenschmidt
@ 2003-02-19 2:05 ` Alan Cox
0 siblings, 0 replies; 3+ messages in thread
From: Alan Cox @ 2003-02-19 2:05 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: Linus Torvalds, Linux Kernel Mailing List
On Tue, 2003-02-18 at 20:53, Benjamin Herrenschmidt wrote:
> On Tue, 2003-02-18 at 19:17, Alan Cox wrote:
>
> > + void (*OUTBSYNC)(u8 addr, unsigned long port);
>
> This is the version without the drive parameter... This is
> on purpose ?
Im resynching where I am that works right on 2.4 before I feed Linus wildly
untested stuff. This may turn into enough fun as it is. Your PPC changes
are on the pile for the next round of fun, and the stuff that has been
tested like the spin up wait are in.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-02-19 0:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-02-18 18:17 PATCH: kill more ioregs, add OUTBSYNC Alan Cox
2003-02-18 20:53 ` Benjamin Herrenschmidt
2003-02-19 2:05 ` Alan Cox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®