Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / include / asm-sh / machvec.h

diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 3f18aa18051693e78f810c85eb71f3d0a55ebfa6..550c50a7359e2018345d84735444e1c70586ca0b 100644 (file)
--- a/include/asm-sh/machvec.h
+++ b/include/asm-sh/machvec.h
@@ -18,44 +18,37 @@
 #include <asm/machvec_init.h>
 
 struct device;
-struct timeval;
 
-struct sh_machine_vector
-{
+struct sh_machine_vector {
        int mv_nr_irqs;
 
-       unsigned char (*mv_inb)(unsigned long);
-       unsigned short (*mv_inw)(unsigned long);
-       unsigned int (*mv_inl)(unsigned long);
-       void (*mv_outb)(unsigned char, unsigned long);
-       void (*mv_outw)(unsigned short, unsigned long);
-       void (*mv_outl)(unsigned int, unsigned long);
-
-       unsigned char (*mv_inb_p)(unsigned long);
-       unsigned short (*mv_inw_p)(unsigned long);
-       unsigned int (*mv_inl_p)(unsigned long);
-       void (*mv_outb_p)(unsigned char, unsigned long);
-       void (*mv_outw_p)(unsigned short, unsigned long);
-       void (*mv_outl_p)(unsigned int, unsigned long);
-
-       void (*mv_insb)(unsigned long port, void *addr, unsigned long count);
-       void (*mv_insw)(unsigned long port, void *addr, unsigned long count);
-       void (*mv_insl)(unsigned long port, void *addr, unsigned long count);
-       void (*mv_outsb)(unsigned long port, const void *addr, unsigned long count);
-       void (*mv_outsw)(unsigned long port, const void *addr, unsigned long count);
-       void (*mv_outsl)(unsigned long port, const void *addr, unsigned long count);
-
-       unsigned char (*mv_readb)(unsigned long);
-       unsigned short (*mv_readw)(unsigned long);
-       unsigned int (*mv_readl)(unsigned long);
-       void (*mv_writeb)(unsigned char, unsigned long);
-       void (*mv_writew)(unsigned short, unsigned long);
-       void (*mv_writel)(unsigned int, unsigned long);
-
-       void* (*mv_ioremap)(unsigned long offset, unsigned long size);
-       void (*mv_iounmap)(void *addr);
-
-       unsigned long (*mv_isa_port2addr)(unsigned long offset);
+       u8 (*mv_inb)(unsigned long);
+       u16 (*mv_inw)(unsigned long);
+       u32 (*mv_inl)(unsigned long);
+       void (*mv_outb)(u8, unsigned long);
+       void (*mv_outw)(u16, unsigned long);
+       void (*mv_outl)(u32, unsigned long);
+
+       u8 (*mv_inb_p)(unsigned long);
+       u16 (*mv_inw_p)(unsigned long);
+       u32 (*mv_inl_p)(unsigned long);
+       void (*mv_outb_p)(u8, unsigned long);
+       void (*mv_outw_p)(u16, unsigned long);
+       void (*mv_outl_p)(u32, unsigned long);
+
+       void (*mv_insb)(unsigned long, void *dst, unsigned long count);
+       void (*mv_insw)(unsigned long, void *dst, unsigned long count);
+       void (*mv_insl)(unsigned long, void *dst, unsigned long count);
+       void (*mv_outsb)(unsigned long, const void *src, unsigned long count);
+       void (*mv_outsw)(unsigned long, const void *src, unsigned long count);
+       void (*mv_outsl)(unsigned long, const void *src, unsigned long count);
+
+       u8 (*mv_readb)(void __iomem *);
+       u16 (*mv_readw)(void __iomem *);
+       u32 (*mv_readl)(void __iomem *);
+       void (*mv_writeb)(u8, void __iomem *);
+       void (*mv_writew)(u16, void __iomem *);
+       void (*mv_writel)(u32, void __iomem *);
 
        int (*mv_irq_demux)(int irq);
 
@@ -66,6 +59,9 @@ struct sh_machine_vector
 
        void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, gfp_t);
        int (*mv_consistent_free)(struct device *, size_t, void *, dma_addr_t);
+
+       void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
+       void (*mv_ioport_unmap)(void __iomem *);
 };
 
 extern struct sh_machine_vector sh_mv;