diff options
author | James Bottomley <James.Bottomley@steeleye.com> | 2005-07-30 11:37:55 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-07-30 11:44:38 -0400 |
commit | f7ff898ad3971cd36967453d331c57d97d407007 (patch) | |
tree | 825bf8e4bd9f6eb3c3e5edf69f4dab84033e946e /drivers/scsi | |
parent | e572f7cc28a0b01b96ede3f78f448ad55c5e67ad (diff) |
[SCSI] aic7xxx: fix bug in DT handing
Basically DT isn't reported or handled at all. The problem is that
lines of code like this:
spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ;
don't do what you think they do when spi_dt is a single bit variable.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index 116d0f51ca2c..d0d0b84a31f4 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
@@ -1635,9 +1635,9 @@ ahc_send_async(struct ahc_softc *ahc, char channel, | |||
1635 | spi_period(starget) = tinfo->curr.period; | 1635 | spi_period(starget) = tinfo->curr.period; |
1636 | spi_width(starget) = tinfo->curr.width; | 1636 | spi_width(starget) = tinfo->curr.width; |
1637 | spi_offset(starget) = tinfo->curr.offset; | 1637 | spi_offset(starget) = tinfo->curr.offset; |
1638 | spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ; | 1638 | spi_dt(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_DT_REQ ? 1 : 0; |
1639 | spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ; | 1639 | spi_qas(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_QAS_REQ ? 1 : 0; |
1640 | spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ; | 1640 | spi_iu(starget) = tinfo->curr.ppr_options & MSG_EXT_PPR_IU_REQ ? 1 : 0; |
1641 | spi_display_xfer_agreement(starget); | 1641 | spi_display_xfer_agreement(starget); |
1642 | break; | 1642 | break; |
1643 | } | 1643 | } |
@@ -2435,8 +2435,10 @@ static void ahc_linux_set_dt(struct scsi_target *starget, int dt) | |||
2435 | if (dt) { | 2435 | if (dt) { |
2436 | period = 9; /* 12.5ns is the only period valid for DT */ | 2436 | period = 9; /* 12.5ns is the only period valid for DT */ |
2437 | ppr_options |= MSG_EXT_PPR_DT_REQ; | 2437 | ppr_options |= MSG_EXT_PPR_DT_REQ; |
2438 | } else if (period == 9) | 2438 | } else if (period == 9) { |
2439 | period = 10; /* if resetting DT, period must be >= 25ns */ | 2439 | period = 10; /* if resetting DT, period must be >= 25ns */ |
2440 | ppr_options &= ~MSG_EXT_PPR_DT_REQ; | ||
2441 | } | ||
2440 | 2442 | ||
2441 | ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, | 2443 | ahc_compile_devinfo(&devinfo, shost->this_id, starget->id, 0, |
2442 | starget->channel + 'A', ROLE_INITIATOR); | 2444 | starget->channel + 'A', ROLE_INITIATOR); |