diff options
Diffstat (limited to 'drivers/scsi/arm/acornscsi-io.S')
| -rw-r--r-- | drivers/scsi/arm/acornscsi-io.S | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/scsi/arm/acornscsi-io.S b/drivers/scsi/arm/acornscsi-io.S index 93467e6ac92..5cebe310526 100644 --- a/drivers/scsi/arm/acornscsi-io.S +++ b/drivers/scsi/arm/acornscsi-io.S | |||
| @@ -10,17 +10,10 @@ | |||
| 10 | #include <asm/assembler.h> | 10 | #include <asm/assembler.h> |
| 11 | #include <asm/hardware.h> | 11 | #include <asm/hardware.h> |
| 12 | 12 | ||
| 13 | #if (IO_BASE == (PCIO_BASE & 0xff000000)) | 13 | #if defined(__APCS_32__) |
| 14 | #define ADDR(off,reg) \ | 14 | #define LOADREGS(t,r,l...) ldm##t r, l |
| 15 | tst off, $0x80000000 ;\ | 15 | #elif defined(__APCS_26__) |
| 16 | mov reg, $IO_BASE ;\ | 16 | #define LOADREGS(t,r,l...) ldm##t r, l##^ |
| 17 | orreq reg, reg, $(PCIO_BASE & 0x00ff0000) | ||
| 18 | #else | ||
| 19 | #define ADDR(off,reg) \ | ||
| 20 | tst off, $0x80000000 ;\ | ||
| 21 | movne reg, $IO_BASE ;\ | ||
| 22 | moveq reg, $(PCIO_BASE & 0xff000000) ;\ | ||
| 23 | orreq reg, reg, $(PCIO_BASE & 0x00ff0000) | ||
| 24 | #endif | 17 | #endif |
| 25 | 18 | ||
| 26 | @ Purpose: transfer a block of data from the acorn scsi card to memory | 19 | @ Purpose: transfer a block of data from the acorn scsi card to memory |