libata-sff: ap->[last_]ctl are SFF specific

[safe/jmp/linux-2.6] / include / linux / uio_driver.h

diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index 44c28e9..5dcc9ff 100644 (file)
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -18,23 +18,47 @@
 #include <linux/fs.h>
 #include <linux/interrupt.h>
 
+struct uio_map;
+
 /**
  * struct uio_mem - description of a UIO memory region
- * @kobj:              kobject for this mapping
+ * @name:              name of the memory region for identification
  * @addr:              address of the device's memory
  * @size:              size of IO
  * @memtype:           type of memory addr points to
  * @internal_addr:     ioremap-ped version of addr, for driver internal use
+ * @map:               for use by the UIO core only.
  */
 struct uio_mem {
-       struct kobject          kobj;
+       const char              *name;
        unsigned long           addr;
        unsigned long           size;
        int                     memtype;
        void __iomem            *internal_addr;
+       struct uio_map          *map;
 };
 
-#define MAX_UIO_MAPS   5
+#define MAX_UIO_MAPS   5
+
+struct uio_portio;
+
+/**
+ * struct uio_port - description of a UIO port region
+ * @name:              name of the port region for identification
+ * @start:             start of port region
+ * @size:              size of port region
+ * @porttype:          type of port (see UIO_PORT_* below)
+ * @portio:            for use by the UIO core only.
+ */
+struct uio_port {
+       const char              *name;
+       unsigned long           start;
+       unsigned long           size;
+       int                     porttype;
+       struct uio_portio       *portio;
+};
+
+#define MAX_UIO_PORT_REGIONS   5
 
 struct uio_device;
 
@@ -44,6 +68,7 @@ struct uio_device;
  * @name:              device name
  * @version:           device driver version
  * @mem:               list of mappable memory regions, size==0 for end of list
+ * @port:              list of port regions, size==0 for end of list
  * @irq:               interrupt number or UIO_IRQ_CUSTOM
  * @irq_flags:         flags for request_irq()
  * @priv:              optional private data
@@ -51,12 +76,14 @@ struct uio_device;
  * @mmap:              mmap operation for this uio device
  * @open:              open operation for this uio device
  * @release:           release operation for this uio device
+ * @irqcontrol:                disable/enable irqs when 0/1 is written to /dev/uioX
  */
 struct uio_info {
        struct uio_device       *uio_dev;
-       char                    *name;
-       char                    *version;
+       const char              *name;
+       const char              *version;
        struct uio_mem          mem[MAX_UIO_MAPS];
+       struct uio_port         port[MAX_UIO_PORT_REGIONS];
        long                    irq;
        unsigned long           irq_flags;
        void                    *priv;
@@ -64,6 +91,7 @@ struct uio_info {
        int (*mmap)(struct uio_info *info, struct vm_area_struct *vma);
        int (*open)(struct uio_info *info, struct inode *inode);
        int (*release)(struct uio_info *info, struct inode *inode);
+       int (*irqcontrol)(struct uio_info *info, s32 irq_on);
 };
 
 extern int __must_check
@@ -78,14 +106,20 @@ static inline int __must_check
 extern void uio_unregister_device(struct uio_info *info);
 extern void uio_event_notify(struct uio_info *info);
 
-/* defines for uio_device->irq */
+/* defines for uio_info->irq */
 #define UIO_IRQ_CUSTOM -1
 #define UIO_IRQ_NONE   -2
 
-/* defines for uio_device->memtype */
+/* defines for uio_mem->memtype */
 #define UIO_MEM_NONE   0
 #define UIO_MEM_PHYS   1
 #define UIO_MEM_LOGICAL        2
 #define UIO_MEM_VIRTUAL 3
 
+/* defines for uio_port->porttype */
+#define UIO_PORT_NONE  0
+#define UIO_PORT_X86   1
+#define UIO_PORT_GPIO  2
+#define UIO_PORT_OTHER 3
+
 #endif /* _LINUX_UIO_DRIVER_H_ */