.. | .. |
---|
9 | 9 | |
---|
10 | 10 | #include <linux/of.h> |
---|
11 | 11 | #include <linux/of_device.h> |
---|
| 12 | +#include <linux/pgtable.h> |
---|
12 | 13 | |
---|
13 | | -#include <asm/pgtable.h> |
---|
14 | 14 | #include <asm/idprom.h> |
---|
15 | 15 | #include <asm/oplib.h> |
---|
16 | 16 | #include <asm/auxio.h> |
---|
.. | .. |
---|
59 | 59 | |
---|
60 | 60 | static struct sun_floppy_ops sun_fdops; |
---|
61 | 61 | |
---|
62 | | -#define fd_inb(port) sun_fdops.fd_inb(port) |
---|
63 | | -#define fd_outb(value,port) sun_fdops.fd_outb(value,port) |
---|
| 62 | +#define fd_inb(base, reg) sun_fdops.fd_inb(reg) |
---|
| 63 | +#define fd_outb(value, base, reg) sun_fdops.fd_outb(value, reg) |
---|
64 | 64 | #define fd_enable_dma() sun_fd_enable_dma() |
---|
65 | 65 | #define fd_disable_dma() sun_fd_disable_dma() |
---|
66 | 66 | #define fd_request_dma() (0) /* nothing... */ |
---|
.. | .. |
---|
114 | 114 | static unsigned char sun_82072_fd_inb(int port) |
---|
115 | 115 | { |
---|
116 | 116 | udelay(5); |
---|
117 | | - switch(port & 7) { |
---|
| 117 | + switch (port) { |
---|
118 | 118 | default: |
---|
119 | 119 | printk("floppy: Asked to read unknown port %d\n", port); |
---|
120 | 120 | panic("floppy: Port bolixed."); |
---|
121 | | - case 4: /* FD_STATUS */ |
---|
| 121 | + case FD_STATUS: |
---|
122 | 122 | return sun_fdc->status_82072 & ~STATUS_DMA; |
---|
123 | | - case 5: /* FD_DATA */ |
---|
| 123 | + case FD_DATA: |
---|
124 | 124 | return sun_fdc->data_82072; |
---|
125 | | - case 7: /* FD_DIR */ |
---|
| 125 | + case FD_DIR: |
---|
126 | 126 | return sun_read_dir(); |
---|
127 | 127 | } |
---|
128 | 128 | panic("sun_82072_fd_inb: How did I get here?"); |
---|
.. | .. |
---|
131 | 131 | static void sun_82072_fd_outb(unsigned char value, int port) |
---|
132 | 132 | { |
---|
133 | 133 | udelay(5); |
---|
134 | | - switch(port & 7) { |
---|
| 134 | + switch (port) { |
---|
135 | 135 | default: |
---|
136 | 136 | printk("floppy: Asked to write to unknown port %d\n", port); |
---|
137 | 137 | panic("floppy: Port bolixed."); |
---|
138 | | - case 2: /* FD_DOR */ |
---|
| 138 | + case FD_DOR: |
---|
139 | 139 | sun_set_dor(value, 0); |
---|
140 | 140 | break; |
---|
141 | | - case 5: /* FD_DATA */ |
---|
| 141 | + case FD_DATA: |
---|
142 | 142 | sun_fdc->data_82072 = value; |
---|
143 | 143 | break; |
---|
144 | | - case 7: /* FD_DCR */ |
---|
| 144 | + case FD_DCR: |
---|
145 | 145 | sun_fdc->dcr_82072 = value; |
---|
146 | 146 | break; |
---|
147 | | - case 4: /* FD_STATUS */ |
---|
| 147 | + case FD_DSR: |
---|
148 | 148 | sun_fdc->status_82072 = value; |
---|
149 | 149 | break; |
---|
150 | 150 | } |
---|
.. | .. |
---|
154 | 154 | static unsigned char sun_82077_fd_inb(int port) |
---|
155 | 155 | { |
---|
156 | 156 | udelay(5); |
---|
157 | | - switch(port & 7) { |
---|
| 157 | + switch (port) { |
---|
158 | 158 | default: |
---|
159 | 159 | printk("floppy: Asked to read unknown port %d\n", port); |
---|
160 | 160 | panic("floppy: Port bolixed."); |
---|
161 | | - case 0: /* FD_STATUS_0 */ |
---|
| 161 | + case FD_SRA: |
---|
162 | 162 | return sun_fdc->status1_82077; |
---|
163 | | - case 1: /* FD_STATUS_1 */ |
---|
| 163 | + case FD_SRB: |
---|
164 | 164 | return sun_fdc->status2_82077; |
---|
165 | | - case 2: /* FD_DOR */ |
---|
| 165 | + case FD_DOR: |
---|
166 | 166 | return sun_fdc->dor_82077; |
---|
167 | | - case 3: /* FD_TDR */ |
---|
| 167 | + case FD_TDR: |
---|
168 | 168 | return sun_fdc->tapectl_82077; |
---|
169 | | - case 4: /* FD_STATUS */ |
---|
| 169 | + case FD_STATUS: |
---|
170 | 170 | return sun_fdc->status_82077 & ~STATUS_DMA; |
---|
171 | | - case 5: /* FD_DATA */ |
---|
| 171 | + case FD_DATA: |
---|
172 | 172 | return sun_fdc->data_82077; |
---|
173 | | - case 7: /* FD_DIR */ |
---|
| 173 | + case FD_DIR: |
---|
174 | 174 | return sun_read_dir(); |
---|
175 | 175 | } |
---|
176 | 176 | panic("sun_82077_fd_inb: How did I get here?"); |
---|
.. | .. |
---|
179 | 179 | static void sun_82077_fd_outb(unsigned char value, int port) |
---|
180 | 180 | { |
---|
181 | 181 | udelay(5); |
---|
182 | | - switch(port & 7) { |
---|
| 182 | + switch (port) { |
---|
183 | 183 | default: |
---|
184 | 184 | printk("floppy: Asked to write to unknown port %d\n", port); |
---|
185 | 185 | panic("floppy: Port bolixed."); |
---|
186 | | - case 2: /* FD_DOR */ |
---|
| 186 | + case FD_DOR: |
---|
187 | 187 | sun_set_dor(value, 1); |
---|
188 | 188 | break; |
---|
189 | | - case 5: /* FD_DATA */ |
---|
| 189 | + case FD_DATA: |
---|
190 | 190 | sun_fdc->data_82077 = value; |
---|
191 | 191 | break; |
---|
192 | | - case 7: /* FD_DCR */ |
---|
| 192 | + case FD_DCR: |
---|
193 | 193 | sun_fdc->dcr_82077 = value; |
---|
194 | 194 | break; |
---|
195 | | - case 4: /* FD_STATUS */ |
---|
| 195 | + case FD_DSR: |
---|
196 | 196 | sun_fdc->status_82077 = value; |
---|
197 | 197 | break; |
---|
198 | | - case 3: /* FD_TDR */ |
---|
| 198 | + case FD_TDR: |
---|
199 | 199 | sun_fdc->tapectl_82077 = value; |
---|
200 | 200 | break; |
---|
201 | 201 | } |
---|