scsi: dc395x: Drop internal SCSI message definitions

[linux-2.6-microblaze.git] / drivers / scsi / dc395x.c

diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index 7b522ff..3ea345c 100644 (file)
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -64,6 +64,7 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_transport_spi.h>
 
 #include "dc395x.h"
 
@@ -1281,12 +1282,8 @@ static void build_sdtr(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
        } else if (dcb->sync_offset == 0)
                dcb->sync_offset = SYNC_NEGO_OFFSET;
 
-       *ptr++ = MSG_EXTENDED;  /* (01h) */
-       *ptr++ = 3;             /* length */
-       *ptr++ = EXTENDED_SDTR; /* (01h) */
-       *ptr++ = dcb->min_nego_period;  /* Transfer period (in 4ns) */
-       *ptr++ = dcb->sync_offset;      /* Transfer period (max. REQ/ACK dist) */
-       srb->msg_count += 5;
+       srb->msg_count += spi_populate_sync_msg(ptr, dcb->min_nego_period,
+                                               dcb->sync_offset);
        srb->state |= SRB_DO_SYNC_NEGO;
 }
 
@@ -1305,11 +1302,7 @@ static void build_wdtr(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
                        srb->msgout_buf[1]);
                return;
        }
-       *ptr++ = MSG_EXTENDED;  /* (01h) */
-       *ptr++ = 2;             /* length */
-       *ptr++ = EXTENDED_WDTR; /* (03h) */
-       *ptr++ = wide;
-       srb->msg_count += 4;
+       srb->msg_count += spi_populate_width_msg(ptr, wide);
        srb->state |= SRB_DO_WIDE_NEGO;
 }
 
@@ -1476,7 +1469,7 @@ static u8 start_scsi(struct AdapterCtlBlk* acb, struct DeviceCtlBlk* dcb,
                        return 1;
                }
                /* Send Tag id */
-               DC395x_write8(acb, TRM_S1040_SCSI_FIFO, MSG_SIMPLE_QTAG);
+               DC395x_write8(acb, TRM_S1040_SCSI_FIFO, SIMPLE_QUEUE_TAG);
                DC395x_write8(acb, TRM_S1040_SCSI_FIFO, tag_number);
                dcb->tag_mask |= tag_mask;
                srb->tag_number = tag_number;
@@ -1732,8 +1725,9 @@ static void msgout_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
        if (!srb->msg_count) {
                dprintkdbg(DBG_0, "msgout_phase1: (0x%p) NOP msg\n",
                        srb->cmd);
-               DC395x_write8(acb, TRM_S1040_SCSI_FIFO, MSG_NOP);
-               DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_DATALATCH);      /* it's important for atn stop */
+               DC395x_write8(acb, TRM_S1040_SCSI_FIFO, NOP);
+               DC395x_write16(acb, TRM_S1040_SCSI_CONTROL, DO_DATALATCH);
+               /* it's important for atn stop */
                DC395x_write8(acb, TRM_S1040_SCSI_COMMAND, SCMD_FIFO_OUT);
                return;
        }
@@ -1741,7 +1735,7 @@ static void msgout_phase1(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
        for (i = 0; i < srb->msg_count; i++)
                DC395x_write8(acb, TRM_S1040_SCSI_FIFO, *ptr++);
        srb->msg_count = 0;
-       if (srb->msgout_buf[0] == MSG_ABORT)
+       if (srb->msgout_buf[0] == ABORT_TASK_SET)
                srb->state = SRB_ABORT_SENT;
 
        DC395x_write8(acb, TRM_S1040_SCSI_COMMAND, SCMD_FIFO_OUT);
@@ -2538,7 +2532,7 @@ static struct ScsiReqBlk *msgin_qtag(struct AdapterCtlBlk *acb,
        srb = acb->tmp_srb;
        srb->state = SRB_UNEXPECT_RESEL;
        dcb->active_srb = srb;
-       srb->msgout_buf[0] = MSG_ABORT_TAG;
+       srb->msgout_buf[0] = ABORT_TASK;
        srb->msg_count = 1;
        DC395x_ENABLE_MSGOUT;
        dprintkl(KERN_DEBUG, "msgin_qtag: Unknown tag %i - abort\n", tag);
@@ -2780,7 +2774,7 @@ static void msgin_phase0(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb,
                        msgin_reject(acb, srb);
                        break;
 
-               case MSG_IGNOREWIDE:
+               case IGNORE_WIDE_RESIDUE:
                        /* Discard  wide residual */
                        dprintkdbg(DBG_0, "msgin_phase0: Ignore Wide Residual!\n");
                        break;