diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /drivers/scsi/dtc.c | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'drivers/scsi/dtc.c')
| -rw-r--r-- | drivers/scsi/dtc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/dtc.c b/drivers/scsi/dtc.c index 0a2e94300..8917f32f8 100644 --- a/drivers/scsi/dtc.c +++ b/drivers/scsi/dtc.c @@ -147,7 +147,7 @@ static struct override { #define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override)) static struct base { - unsigned int address; + unsigned long address; int noauto; } bases[] __initdata = {{0xcc000, 0}, {0xc8000, 0}, {0xdc000, 0}, {0xd8000, 0}}; @@ -222,7 +222,7 @@ int __init dtc_detect(Scsi_Host_Template * tpnt){ #endif for (sig = 0; sig < NO_SIGNATURES; ++sig) if (!bases[current_base].noauto && - check_signature(bases[current_base].address + + isa_check_signature(bases[current_base].address + signatures[sig].offset, signatures[sig].string, strlen(signatures[sig].string))) { base = bases[current_base].address; @@ -241,7 +241,7 @@ int __init dtc_detect(Scsi_Host_Template * tpnt){ break; instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata)); - instance->base = (void *)base; + instance->base = base; NCR5380_init(instance, 0); @@ -360,7 +360,7 @@ static inline int NCR5380_pread (struct Scsi_Host *instance, while (NCR5380_read(DTC_CONTROL_REG) & CSR_HOST_BUF_NOT_RDY) ++i; rtrc(3); - memcpy_fromio(d, base + DTC_DATA_BUF, 128); + isa_memcpy_fromio(d, base + DTC_DATA_BUF, 128); d += 128; len -= 128; rtrc(7); /*** with int's on, it sometimes hangs after here. @@ -410,7 +410,7 @@ static inline int NCR5380_pwrite (struct Scsi_Host *instance, while (NCR5380_read(DTC_CONTROL_REG) & CSR_HOST_BUF_NOT_RDY) ++i; rtrc(3); - memcpy_toio(base + DTC_DATA_BUF, src, 128); + isa_memcpy_toio(base + DTC_DATA_BUF, src, 128); src += 128; len -= 128; } |