Merge branch 'master' of /usr/src/ntfs-2.6/

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

diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h
index 4c65963870a44a2206b728f4445cf08358e68ffa..f7dfcedf7d45414dfb14c1ea08a6a8a5afcb196e 100644 (file)
--- a/drivers/char/rio/host.h
+++ b/drivers/char/rio/host.h
@@ -49,33 +49,32 @@ static char *_host_h_sccs_ = "@(#)host.h    1.2";
 **    Host data structure. This is used for the software equiv. of
 **    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 */
-    char                    Name[MAX_NAME_LEN];  /* The name of the host */
-    uint                   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 */
-    struct timer_list timer;
-    /*
-    **               I M P O R T A N T !
-    **
-    ** The rest of this data structure is cleared to zero after
-    ** a RIO_HOST_FOAD command.
-    */
-    
-    ulong                   Flags;     /* Whats going down */
+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 */
+       char Name[MAX_NAME_LEN];        /* The name of the host */
+       uint 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 */
+       struct timer_list timer;
+       /*
+        **               I M P O R T A N T !
+        **
+        ** The rest of this data structure is cleared to zero after
+        ** a RIO_HOST_FOAD command.
+        */
+
+       ulong Flags;            /* Whats going down */
 #define RC_WAITING            0
 #define RC_STARTUP            1
 #define RC_RUNNING            2
@@ -93,25 +92,25 @@ struct    Host
 #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 */
-    /*
-    ** 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 */
-    char                   ____end_marker____;
+       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 */
+       /*
+        ** 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 */
+       char ____end_marker____;
 };
 #define Control      CardP->DpControl
 #define SetInt       CardP->DpSetInt
@@ -129,6 +128,6 @@ struct    Host
 #define Year         CardP->DpYear
 #define Week         CardP->DpWeek
 
-#define RIO_DUMBPARM 0x0860    /* what not to expect */
+#define RIO_DUMBPARM 0x0860    /* what not to expect */
 
 #endif