diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/blz1230.c | 4 | ||||
-rw-r--r-- | drivers/scsi/blz2060.c | 4 | ||||
-rw-r--r-- | drivers/scsi/cyberstorm.c | 4 | ||||
-rw-r--r-- | drivers/scsi/cyberstormII.c | 4 | ||||
-rw-r--r-- | drivers/scsi/fastlane.c | 4 | ||||
-rw-r--r-- | drivers/scsi/oktagon_esp.c | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/drivers/scsi/blz1230.c b/drivers/scsi/blz1230.c index 763e409a1ff3..3867ac2de4c2 100644 --- a/drivers/scsi/blz1230.c +++ b/drivers/scsi/blz1230.c | |||
@@ -224,7 +224,7 @@ static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp) | |||
224 | static void dma_dump_state(struct NCR_ESP *esp) | 224 | static void dma_dump_state(struct NCR_ESP *esp) |
225 | { | 225 | { |
226 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", | 226 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", |
227 | custom.intreqr, custom.intenar)); | 227 | amiga_custom.intreqr, amiga_custom.intenar)); |
228 | } | 228 | } |
229 | 229 | ||
230 | void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) | 230 | void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) |
@@ -298,7 +298,7 @@ static int dma_irq_p(struct NCR_ESP *esp) | |||
298 | 298 | ||
299 | static int dma_ports_p(struct NCR_ESP *esp) | 299 | static int dma_ports_p(struct NCR_ESP *esp) |
300 | { | 300 | { |
301 | return ((custom.intenar) & IF_PORTS); | 301 | return ((amiga_custom.intenar) & IF_PORTS); |
302 | } | 302 | } |
303 | 303 | ||
304 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) | 304 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) |
diff --git a/drivers/scsi/blz2060.c b/drivers/scsi/blz2060.c index d72d05fffdfa..4ebe69e32756 100644 --- a/drivers/scsi/blz2060.c +++ b/drivers/scsi/blz2060.c | |||
@@ -190,7 +190,7 @@ static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp) | |||
190 | static void dma_dump_state(struct NCR_ESP *esp) | 190 | static void dma_dump_state(struct NCR_ESP *esp) |
191 | { | 191 | { |
192 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", | 192 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", |
193 | custom.intreqr, custom.intenar)); | 193 | amiga_custom.intreqr, amiga_custom.intenar)); |
194 | } | 194 | } |
195 | 195 | ||
196 | static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) | 196 | static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) |
@@ -251,7 +251,7 @@ static void dma_led_on(struct NCR_ESP *esp) | |||
251 | 251 | ||
252 | static int dma_ports_p(struct NCR_ESP *esp) | 252 | static int dma_ports_p(struct NCR_ESP *esp) |
253 | { | 253 | { |
254 | return ((custom.intenar) & IF_PORTS); | 254 | return ((amiga_custom.intenar) & IF_PORTS); |
255 | } | 255 | } |
256 | 256 | ||
257 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) | 257 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) |
diff --git a/drivers/scsi/cyberstorm.c b/drivers/scsi/cyberstorm.c index f9b940e56430..a4a4fac5c0a1 100644 --- a/drivers/scsi/cyberstorm.c +++ b/drivers/scsi/cyberstorm.c | |||
@@ -223,7 +223,7 @@ static void dma_dump_state(struct NCR_ESP *esp) | |||
223 | esp->esp_id, ((struct cyber_dma_registers *) | 223 | esp->esp_id, ((struct cyber_dma_registers *) |
224 | (esp->dregs))->cond_reg)); | 224 | (esp->dregs))->cond_reg)); |
225 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", | 225 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", |
226 | custom.intreqr, custom.intenar)); | 226 | amiga_custom.intreqr, amiga_custom.intenar)); |
227 | } | 227 | } |
228 | 228 | ||
229 | static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) | 229 | static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) |
@@ -322,7 +322,7 @@ static void dma_led_on(struct NCR_ESP *esp) | |||
322 | 322 | ||
323 | static int dma_ports_p(struct NCR_ESP *esp) | 323 | static int dma_ports_p(struct NCR_ESP *esp) |
324 | { | 324 | { |
325 | return ((custom.intenar) & IF_PORTS); | 325 | return ((amiga_custom.intenar) & IF_PORTS); |
326 | } | 326 | } |
327 | 327 | ||
328 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) | 328 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) |
diff --git a/drivers/scsi/cyberstormII.c b/drivers/scsi/cyberstormII.c index a3caabfd7557..3a803d73bc5f 100644 --- a/drivers/scsi/cyberstormII.c +++ b/drivers/scsi/cyberstormII.c | |||
@@ -200,7 +200,7 @@ static void dma_dump_state(struct NCR_ESP *esp) | |||
200 | esp->esp_id, ((struct cyberII_dma_registers *) | 200 | esp->esp_id, ((struct cyberII_dma_registers *) |
201 | (esp->dregs))->cond_reg)); | 201 | (esp->dregs))->cond_reg)); |
202 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", | 202 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", |
203 | custom.intreqr, custom.intenar)); | 203 | amiga_custom.intreqr, amiga_custom.intenar)); |
204 | } | 204 | } |
205 | 205 | ||
206 | static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) | 206 | static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) |
@@ -259,7 +259,7 @@ static void dma_led_on(struct NCR_ESP *esp) | |||
259 | 259 | ||
260 | static int dma_ports_p(struct NCR_ESP *esp) | 260 | static int dma_ports_p(struct NCR_ESP *esp) |
261 | { | 261 | { |
262 | return ((custom.intenar) & IF_PORTS); | 262 | return ((amiga_custom.intenar) & IF_PORTS); |
263 | } | 263 | } |
264 | 264 | ||
265 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) | 265 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) |
diff --git a/drivers/scsi/fastlane.c b/drivers/scsi/fastlane.c index ccee68b52f7e..8ae9c406a83b 100644 --- a/drivers/scsi/fastlane.c +++ b/drivers/scsi/fastlane.c | |||
@@ -268,7 +268,7 @@ static void dma_dump_state(struct NCR_ESP *esp) | |||
268 | esp->esp_id, ((struct fastlane_dma_registers *) | 268 | esp->esp_id, ((struct fastlane_dma_registers *) |
269 | (esp->dregs))->cond_reg)); | 269 | (esp->dregs))->cond_reg)); |
270 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", | 270 | ESPLOG(("intreq:<%04x>, intena:<%04x>\n", |
271 | custom.intreqr, custom.intenar)); | 271 | amiga_custom.intreqr, amiga_custom.intenar)); |
272 | } | 272 | } |
273 | 273 | ||
274 | static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) | 274 | static void dma_init_read(struct NCR_ESP *esp, __u32 addr, int length) |
@@ -368,7 +368,7 @@ static void dma_led_on(struct NCR_ESP *esp) | |||
368 | 368 | ||
369 | static int dma_ports_p(struct NCR_ESP *esp) | 369 | static int dma_ports_p(struct NCR_ESP *esp) |
370 | { | 370 | { |
371 | return ((custom.intenar) & IF_PORTS); | 371 | return ((amiga_custom.intenar) & IF_PORTS); |
372 | } | 372 | } |
373 | 373 | ||
374 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) | 374 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) |
diff --git a/drivers/scsi/oktagon_esp.c b/drivers/scsi/oktagon_esp.c index 5d9c9ada814f..dee426f8c07b 100644 --- a/drivers/scsi/oktagon_esp.c +++ b/drivers/scsi/oktagon_esp.c | |||
@@ -490,7 +490,7 @@ static void dma_led_on(struct NCR_ESP *esp) | |||
490 | 490 | ||
491 | static int dma_ports_p(struct NCR_ESP *esp) | 491 | static int dma_ports_p(struct NCR_ESP *esp) |
492 | { | 492 | { |
493 | return ((custom.intenar) & IF_PORTS); | 493 | return ((amiga_custom.intenar) & IF_PORTS); |
494 | } | 494 | } |
495 | 495 | ||
496 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) | 496 | static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write) |