diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/linux/istallion.h | |
parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
parent | a8b3485287731978899ced11f24628c927890e78 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/istallion.h')
-rw-r--r-- | include/linux/istallion.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/include/linux/istallion.h b/include/linux/istallion.h index b55e2a03560..106a5e85e5c 100644 --- a/include/linux/istallion.h +++ b/include/linux/istallion.h | |||
@@ -49,13 +49,13 @@ | |||
49 | * communication with the slave board will always be on a per port | 49 | * communication with the slave board will always be on a per port |
50 | * basis. | 50 | * basis. |
51 | */ | 51 | */ |
52 | typedef struct { | 52 | struct stliport { |
53 | unsigned long magic; | 53 | unsigned long magic; |
54 | int portnr; | 54 | unsigned int portnr; |
55 | int panelnr; | 55 | unsigned int panelnr; |
56 | int brdnr; | 56 | unsigned int brdnr; |
57 | unsigned long state; | 57 | unsigned long state; |
58 | int devnr; | 58 | unsigned int devnr; |
59 | int flags; | 59 | int flags; |
60 | int baud_base; | 60 | int baud_base; |
61 | int custom_divisor; | 61 | int custom_divisor; |
@@ -72,7 +72,7 @@ typedef struct { | |||
72 | wait_queue_head_t close_wait; | 72 | wait_queue_head_t close_wait; |
73 | wait_queue_head_t raw_wait; | 73 | wait_queue_head_t raw_wait; |
74 | struct work_struct tqhangup; | 74 | struct work_struct tqhangup; |
75 | asysigs_t asig; | 75 | struct asysigs asig; |
76 | unsigned long addr; | 76 | unsigned long addr; |
77 | unsigned long rxoffset; | 77 | unsigned long rxoffset; |
78 | unsigned long txoffset; | 78 | unsigned long txoffset; |
@@ -83,31 +83,31 @@ typedef struct { | |||
83 | unsigned char reqbit; | 83 | unsigned char reqbit; |
84 | unsigned char portidx; | 84 | unsigned char portidx; |
85 | unsigned char portbit; | 85 | unsigned char portbit; |
86 | } stliport_t; | 86 | }; |
87 | 87 | ||
88 | /* | 88 | /* |
89 | * Use a structure of function pointers to do board level operations. | 89 | * Use a structure of function pointers to do board level operations. |
90 | * These include, enable/disable, paging shared memory, interrupting, etc. | 90 | * These include, enable/disable, paging shared memory, interrupting, etc. |
91 | */ | 91 | */ |
92 | typedef struct stlibrd { | 92 | struct stlibrd { |
93 | unsigned long magic; | 93 | unsigned long magic; |
94 | int brdnr; | 94 | unsigned int brdnr; |
95 | int brdtype; | 95 | unsigned int brdtype; |
96 | int state; | 96 | unsigned int state; |
97 | int nrpanels; | 97 | unsigned int nrpanels; |
98 | int nrports; | 98 | unsigned int nrports; |
99 | int nrdevs; | 99 | unsigned int nrdevs; |
100 | unsigned int iobase; | 100 | unsigned int iobase; |
101 | int iosize; | 101 | int iosize; |
102 | unsigned long memaddr; | 102 | unsigned long memaddr; |
103 | void __iomem *membase; | 103 | void __iomem *membase; |
104 | int memsize; | 104 | unsigned long memsize; |
105 | int pagesize; | 105 | int pagesize; |
106 | int hostoffset; | 106 | int hostoffset; |
107 | int slaveoffset; | 107 | int slaveoffset; |
108 | int bitsize; | 108 | int bitsize; |
109 | int enabval; | 109 | int enabval; |
110 | int panels[STL_MAXPANELS]; | 110 | unsigned int panels[STL_MAXPANELS]; |
111 | int panelids[STL_MAXPANELS]; | 111 | int panelids[STL_MAXPANELS]; |
112 | void (*init)(struct stlibrd *brdp); | 112 | void (*init)(struct stlibrd *brdp); |
113 | void (*enable)(struct stlibrd *brdp); | 113 | void (*enable)(struct stlibrd *brdp); |
@@ -116,8 +116,8 @@ typedef struct stlibrd { | |||
116 | void __iomem *(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line); | 116 | void __iomem *(*getmemptr)(struct stlibrd *brdp, unsigned long offset, int line); |
117 | void (*intr)(struct stlibrd *brdp); | 117 | void (*intr)(struct stlibrd *brdp); |
118 | void (*reset)(struct stlibrd *brdp); | 118 | void (*reset)(struct stlibrd *brdp); |
119 | stliport_t *ports[STL_MAXPORTS]; | 119 | struct stliport *ports[STL_MAXPORTS]; |
120 | } stlibrd_t; | 120 | }; |
121 | 121 | ||
122 | 122 | ||
123 | /* | 123 | /* |