This commit was manufactured by cvs2svn to create tag
[linux-2.6.git] / drivers / scsi / atp870u.c
index 9cf23b9..7be2b72 100644 (file)
@@ -1,4 +1,6 @@
-/*
+/* $Id: atp870u.c,v 1.0 1997/05/07 15:22:00 root Exp root $
+ *  linux/kernel/atp870u.c
+ *
  *  Copyright (C) 1997 Wu Ching Chen
  *  2.1.x update (C) 1998  Krzysztof G. Baranowski
  *  2.5.x update (C) 2002  Red Hat <alan@redhat.com>
 #include <linux/spinlock.h>
 #include <linux/pci.h>
 #include <linux/blkdev.h>
+#include <linux/stat.h>
+
 #include <asm/system.h>
 #include <asm/io.h>
 
-#include <scsi/scsi.h>
-#include <scsi/scsi_cmnd.h>
-#include <scsi/scsi_device.h>
+#include "scsi.h"
 #include <scsi/scsi_host.h>
-
 #include "atp870u.h"
 
-static struct scsi_host_template atp870u_template;
-static void send_s870(struct Scsi_Host *host);
+/*
+ *   static const char RCSid[] = "$Header: /usr/src/linux/kernel/blk_drv/scsi/RCS/atp870u.c,v 1.0 1997/05/07 15:22:00 root Exp root $";
+ */
 
+static unsigned short int sync_idu;
 
 static irqreturn_t atp870u_intr_handle(int irq, void *dev_id,
                                        struct pt_regs *regs)
@@ -48,7 +51,7 @@ static irqreturn_t atp870u_intr_handle(int irq, void *dev_id,
        unsigned short int tmpcip, id;
        unsigned char i, j, target_id, lun;
        unsigned char *prd;
-       struct scsi_cmnd *workrequ;
+       Scsi_Cmnd *workrequ;
        unsigned int workportu, tmport;
        unsigned long adrcntu, k;
        int errstus;
@@ -345,18 +348,10 @@ go_42:
                         *      Complete the command
                         */
                         
-                       if (workrequ->use_sg) {
-                               pci_unmap_sg(dev->pdev,
-                                       (struct scatterlist *)workrequ->buffer,
-                                       workrequ->use_sg,
-                                       workrequ->sc_data_direction);
-                       } else if (workrequ->request_bufflen &&
-                                       workrequ->sc_data_direction != DMA_NONE) {
-                               pci_unmap_single(dev->pdev,
-                                       workrequ->SCp.dma_handle,
-                                       workrequ->request_bufflen,
-                                       workrequ->sc_data_direction);
-                       }
+                       if(workrequ->use_sg)
+                               pci_unmap_sg(dev->pdev, (struct scatterlist *)workrequ->buffer, workrequ->use_sg, scsi_to_pci_dma_dir(workrequ->sc_data_direction));
+                       else if(workrequ->request_bufflen && workrequ->sc_data_direction != SCSI_DATA_NONE)
+                               pci_unmap_single(dev->pdev, workrequ->SCp.dma_handle, workrequ->request_bufflen, scsi_to_pci_dma_dir(workrequ->sc_data_direction));
                        spin_lock_irqsave(dev->host->host_lock, flags);
                        (*workrequ->scsi_done) (workrequ);
 
@@ -461,8 +456,7 @@ out:
  *     Queue a command to the ATP queue. Called with the host lock held.
  */
  
-static int atp870u_queuecommand(struct scsi_cmnd *req_p,
-               void (*done) (struct scsi_cmnd *))
+static int atp870u_queuecommand(Scsi_Cmnd * req_p, void (*done) (Scsi_Cmnd *))
 {
        unsigned short int m;
        unsigned int tmport;
@@ -539,7 +533,7 @@ static int atp870u_queuecommand(struct scsi_cmnd *req_p,
 static void send_s870(struct Scsi_Host *host)
 {
        unsigned int tmport;
-       struct scsi_cmnd *workrequ;
+       Scsi_Cmnd *workrequ;
        unsigned int i;
        unsigned char j, target_id;
        unsigned char *prd;
@@ -654,8 +648,7 @@ oktosend:
        if (workrequ->use_sg) {
                l = 0;
                sgpnt = (struct scatterlist *) workrequ->request_buffer;
-               sg_count = pci_map_sg(dev->pdev, sgpnt, workrequ->use_sg,
-                               workrequ->sc_data_direction);
+               sg_count = pci_map_sg(dev->pdev, sgpnt, workrequ->use_sg, scsi_to_pci_dma_dir(workrequ->sc_data_direction));
                for (i = 0; i < workrequ->use_sg; i++) {
                        if (sgpnt[i].length == 0 || workrequ->use_sg > ATP870U_SCATTER) {
                                panic("Foooooooood fight!");
@@ -663,10 +656,7 @@ oktosend:
                        l += sgpnt[i].length;
                }
        } else if(workrequ->request_bufflen && workrequ->sc_data_direction != PCI_DMA_NONE) {
-               workrequ->SCp.dma_handle = pci_map_single(dev->pdev,
-                               workrequ->request_buffer,
-                               workrequ->request_bufflen,
-                               workrequ->sc_data_direction);
+               workrequ->SCp.dma_handle = pci_map_single(dev->pdev, workrequ->request_buffer, workrequ->request_bufflen, scsi_to_pci_dma_dir(workrequ->sc_data_direction));
                l = workrequ->request_bufflen;
        }
        else l = 0;
@@ -688,7 +678,7 @@ oktosend:
        /*
         *      Check transfer direction
         */
-       if (workrequ->sc_data_direction == DMA_TO_DEVICE) {
+       if (workrequ->sc_data_direction == SCSI_DATA_WRITE) {
                outb((unsigned char) (j | 0x20), tmport++);
        } else {
                outb(j, tmport++);
@@ -780,7 +770,7 @@ oktosend:
        }
        tmport = workportu + 0x1c;
 
-       if (workrequ->sc_data_direction == DMA_TO_DEVICE) {
+       if (workrequ->sc_data_direction == SCSI_DATA_WRITE) {
                dev->id[target_id].dirctu = 0x20;
                if (inb(tmport) == 0) {
                        tmport = workportu + 0x18;
@@ -1099,6 +1089,7 @@ void is870(struct Scsi_Host *host, unsigned int wkport)
        static unsigned char wide[6] = { 0x80, 1, 2, 3, 1, 0 };
        struct atp_unit *dev = (struct atp_unit *)&host->hostdata;
 
+       sync_idu = 0;
        tmport = wkport + 0x3a;
        outb((unsigned char) (inb(tmport) | 0x10), tmport);
 
@@ -1592,6 +1583,7 @@ static void is880(struct Scsi_Host *host, unsigned int wkport)
        static unsigned char u3[9] = { 0x80, 1, 6, 4, 0x09, 00, 0x0e, 0x01, 0x02 };
        struct atp_unit *dev = (struct atp_unit *)&host->hostdata;
 
+       sync_idu = 0;
        lvdmode = inb(wkport + 0x3f) & 0x40;
 
        for (i = 0; i < 16; i++) {
@@ -2270,7 +2262,7 @@ static int atp870u_init_tables(struct Scsi_Host *host)
                dev->sp[k] = 0x04;
        }
        return 0;
-}
+}                      
 
 /* return non-zero on detection */
 static int atp870u_probe(struct pci_dev *dev, const struct pci_device_id *ent)
@@ -2563,10 +2555,10 @@ unregister:
    it is available to be used again.  Until this gets worked out, we will
    leave it commented out.  */
 
-static int atp870u_abort(struct scsi_cmnd * SCpnt)
+int atp870u_abort(Scsi_Cmnd * SCpnt)
 {
        unsigned char j, k;
-       struct scsi_cmnd *workrequ;
+       Scsi_Cmnd *workrequ;
        unsigned int tmport;
        struct atp_unit *dev = (struct atp_unit *)&SCpnt->device->host->hostdata;
 
@@ -2602,7 +2594,7 @@ static int atp870u_abort(struct scsi_cmnd * SCpnt)
        return SUCCESS;
 }
 
-static const char *atp870u_info(struct Scsi_Host *notused)
+const char *atp870u_info(struct Scsi_Host *notused)
 {
        static char buffer[128];
 
@@ -2611,9 +2603,13 @@ static const char *atp870u_info(struct Scsi_Host *notused)
        return buffer;
 }
 
+int atp870u_set_info(char *buffer, int length, struct Scsi_Host *HBAptr)
+{
+       return -ENOSYS;         /* Currently this is a no-op */
+}
+
 #define BLS buffer + len + size
-static int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer,
-               char **start, off_t offset, int length, int inout)
+int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer, char **start, off_t offset, int length, int inout)
 {
        static u8 buff[512];
        int size = 0;
@@ -2621,8 +2617,9 @@ static int atp870u_proc_info(struct Scsi_Host *HBAptr, char *buffer,
        off_t begin = 0;
        off_t pos = 0;
 
-       if (inout)
-               return -ENOSYS;
+       if (inout == TRUE) {    /* Has data been written to the file? */
+               return (atp870u_set_info(buffer, length, HBAptr));
+       }
        if (offset == 0) {
                memset(buff, 0, sizeof(buff));
        }
@@ -2682,7 +2679,7 @@ static void atp870u_remove(struct pci_dev *pdev)
 
 MODULE_LICENSE("GPL");
 
-static struct scsi_host_template atp870u_template = {
+static Scsi_Host_Template atp870u_template = {
        .module                 = THIS_MODULE,
        .name                   = "atp870u",
        .proc_name              = "atp870u",
@@ -2721,7 +2718,8 @@ static struct pci_driver atp870u_driver = {
 
 static int __init atp870u_init(void)
 {
-       return pci_module_init(&atp870u_driver);
+       pci_register_driver(&atp870u_driver);
+       return 0;
 }
 
 static void __exit atp870u_exit(void)