fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / char / rio / host.h

diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h
index f7dfced..23d0681 100644 (file)
--- a/drivers/char/rio/host.h
+++ b/drivers/char/rio/host.h
@@ -33,12 +33,6 @@
 #ifndef __rio_host_h__
 #define __rio_host_h__
 
-#ifdef SCCS_LABELS
-#ifndef lint
-static char *_host_h_sccs_ = "@(#)host.h       1.2";
-#endif
-#endif
-
 /*
 ** the host structure - one per host card in the system.
 */
@@ -50,22 +44,21 @@ static char *_host_h_sccs_ = "@(#)host.h    1.2";
 **    the host.
 */
 struct Host {
-       uchar Type;             /* RIO_EISA, RIO_MCA, ... */
-       uchar Ivec;             /* POLLED or ivec number */
-       uchar Mode;             /* Control stuff */
-       uchar Slot;             /* Slot */
-       volatile caddr_t Caddr; /* KV address of DPRAM */
-       volatile struct DpRam *CardP;   /* KV address of DPRAM, with overlay */
-       paddr_t PaddrP;         /* Phys. address of DPRAM */
+       struct pci_dev *pdev;
+       unsigned char Type;             /* RIO_EISA, RIO_MCA, ... */
+       unsigned char Ivec;             /* POLLED or ivec number */
+       unsigned char Mode;             /* Control stuff */
+       unsigned char Slot;             /* Slot */
+       void  __iomem *Caddr;           /* KV address of DPRAM */
+       struct DpRam __iomem *CardP;    /* KV address of DPRAM, with overlay */
+       unsigned long PaddrP;           /* Phys. address of DPRAM */
        char Name[MAX_NAME_LEN];        /* The name of the host */
-       uint UniqueNum;         /* host unique number */
+       unsigned int UniqueNum;         /* host unique number */
        spinlock_t HostLock;    /* Lock structure for MPX */
-       /*struct pci_devinfo    PciDevInfo; *//* PCI Bus/Device/Function stuff */
-       /*struct lockb          HostLock;  *//* Lock structure for MPX */
-       uint WorkToBeDone;      /* set to true each interrupt */
-       uint InIntr;            /* Being serviced? */
-       uint IntSrvDone;        /* host's interrupt has been serviced */
-       int (*Copy) (caddr_t, caddr_t, int);    /* copy func */
+       unsigned int WorkToBeDone;      /* set to true each interrupt */
+       unsigned int InIntr;            /* Being serviced? */
+       unsigned int IntSrvDone;        /* host's interrupt has been serviced */
+       void (*Copy) (void *, void __iomem *, int);     /* copy func */
        struct timer_list timer;
        /*
         **               I M P O R T A N T !
@@ -74,42 +67,39 @@ struct Host {
         ** a RIO_HOST_FOAD command.
         */
 
-       ulong Flags;            /* Whats going down */
+       unsigned long Flags;                    /* Whats going down */
 #define RC_WAITING            0
 #define RC_STARTUP            1
 #define RC_RUNNING            2
 #define RC_STUFFED            3
-#define RC_SOMETHING          4
-#define RC_SOMETHING_NEW      5
-#define RC_SOMETHING_ELSE     6
 #define RC_READY              7
 #define RUN_STATE             7
 /*
 ** Boot mode applies to the way in which hosts in this system will
 ** boot RTAs
 */
-#define RC_BOOT_ALL           0x8      /* Boot all RTAs attached */
-#define RC_BOOT_OWN           0x10     /* Only boot RTAs bound to this system */
-#define RC_BOOT_NONE          0x20     /* Don't boot any RTAs (slave mode) */
+#define RC_BOOT_ALL           0x8              /* Boot all RTAs attached */
+#define RC_BOOT_OWN           0x10             /* Only boot RTAs bound to this system */
+#define RC_BOOT_NONE          0x20             /* Don't boot any RTAs (slave mode) */
 
        struct Top Topology[LINKS_PER_UNIT];    /* one per link */
-       struct Map Mapping[MAX_RUP];    /* Mappings for host */
-       struct PHB *PhbP;       /* Pointer to the PHB array */
-       ushort *PhbNumP;        /* Ptr to Number of PHB's */
-       struct LPB *LinkStrP;   /* Link Structure Array */
-       struct RUP *RupP;       /* Sixteen real rups here */
-       struct PARM_MAP *ParmMapP;      /* points to the parmmap */
-       uint ExtraUnits[MAX_EXTRA_UNITS];       /* unknown things */
-       uint NumExtraBooted;    /* how many of the above */
+       struct Map Mapping[MAX_RUP];            /* Mappings for host */
+       struct PHB __iomem *PhbP;               /* Pointer to the PHB array */
+       unsigned short __iomem *PhbNumP;        /* Ptr to Number of PHB's */
+       struct LPB __iomem *LinkStrP;           /* Link Structure Array */
+       struct RUP __iomem *RupP;               /* Sixteen real rups here */
+       struct PARM_MAP __iomem *ParmMapP;      /* points to the parmmap */
+       unsigned int ExtraUnits[MAX_EXTRA_UNITS];       /* unknown things */
+       unsigned int NumExtraBooted;            /* how many of the above */
        /*
         ** Twenty logical rups.
         ** The first sixteen are the real Rup entries (above), the last four
         ** are the link RUPs.
         */
        struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT];
-       int timeout_id;         /* For calling 100 ms delays */
-       int timeout_sem;        /* For calling 100 ms delays */
-       long locks;             /* long req'd for set_bit --RR */
+       int timeout_id;                         /* For calling 100 ms delays */
+       int timeout_sem;                        /* For calling 100 ms delays */
+       long locks;                             /* long req'd for set_bit --RR */
        char ____end_marker____;
 };
 #define Control      CardP->DpControl