diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /drivers/scsi/mac_esp.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'drivers/scsi/mac_esp.c')
| -rw-r--r-- | drivers/scsi/mac_esp.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index 9e6fa65f4..726bf4107 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c @@ -59,10 +59,15 @@ static int dma_ports_p(struct NCR_ESP *esp); static void dma_setup(struct NCR_ESP * esp, __u32 addr, int count, int write); static void dma_setup_quick(struct NCR_ESP * esp, __u32 addr, int count, int write); - static int esp_dafb_dma_irq_p(struct NCR_ESP * espdev); static int esp_iosb_dma_irq_p(struct NCR_ESP * espdev); +volatile unsigned char cmd_buffer[16]; + /* This is where all commands are put + * before they are transfered to the ESP chip + * via PIO. + */ + static int esp_initialized = 0; static int setup_num_esps = -1; @@ -287,6 +292,9 @@ int mac_esp_detect(Scsi_Host_Template * tpnt) unsigned long timeout; #endif + if (esp_initialized > 0) + return -ENODEV; + /* what do we have in this machine... */ if (MACHW_PRESENT(MAC_SCSI_96)) { chipspresent ++; @@ -358,10 +366,13 @@ int mac_esp_detect(Scsi_Host_Template * tpnt) } /* chipnum == 0 */ - /* use pio for command bytes; pio for message/data: TBI */ esp->do_pio_cmds = 1; + /* Set the command buffer */ + esp->esp_command = (volatile unsigned char*) cmd_buffer; + esp->esp_command_dvma = (volatile unsigned char*) cmd_buffer; + /* various functions */ esp->dma_bytes_sent = &dma_bytes_sent; esp->dma_can_transfer = &dma_can_transfer; @@ -469,7 +480,7 @@ int mac_esp_detect(Scsi_Host_Template * tpnt) static int esp_dafb_dma_irq_p(struct NCR_ESP * esp) { unsigned int ret; - int sreg = esp->eregs->esp_status; + int sreg = esp_read(esp->eregs->esp_status); #ifdef DEBUG_MAC_ESP printk("mac_esp: esp_dafb_dma_irq_p dafb %d irq %d\n", @@ -510,7 +521,7 @@ static int esp_dafb_dma_irq_p(struct NCR_ESP * esp) static int esp_iosb_dma_irq_p(struct NCR_ESP * esp) { int ret = mac_irq_pending(IRQ_MAC_SCSI) || mac_irq_pending(IRQ_MAC_SCSIDRQ); - int sreg = esp->eregs->esp_status; + int sreg = esp_read(esp->eregs->esp_status); #ifdef DEBUG_MAC_ESP printk("mac_esp: dma_irq_p drq %d irq %d sreg %x curr %p disc %p\n", @@ -614,7 +625,7 @@ static void dma_ints_on(struct NCR_ESP * esp) static int dma_irq_p(struct NCR_ESP * esp) { - int i = esp->eregs->esp_status; + int i = esp_read(esp->eregs->esp_status); #ifdef DEBUG_MAC_ESP printk("mac_esp: dma_irq_p status %d\n", i); @@ -629,7 +640,7 @@ static int dma_irq_p_quick(struct NCR_ESP * esp) * Copied from iosb_dma_irq_p() */ int ret = mac_irq_pending(IRQ_MAC_SCSI) || mac_irq_pending(IRQ_MAC_SCSIDRQ); - int sreg = esp->eregs->esp_status; + int sreg = esp_read(esp->eregs->esp_status); #ifdef DEBUG_MAC_ESP printk("mac_esp: dma_irq_p drq %d irq %d sreg %x curr %p disc %p\n", |