[BACK]Return to atapi_wdc.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / sys / dev / scsipi

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/sys/dev/scsipi/atapi_wdc.c between version 1.80 and 1.81

version 1.80, 2004/08/12 21:10:18 version 1.81, 2004/08/12 21:34:52
Line 186  wdc_atapi_kill_xfer(struct wdc_channel *
Line 186  wdc_atapi_kill_xfer(struct wdc_channel *
                     reason);                      reason);
                 panic("wdc_ata_bio_kill_xfer");                  panic("wdc_ata_bio_kill_xfer");
         }          }
         wdc_free_xfer(chp, xfer);          ata_free_xfer(chp, xfer);
         scsipi_done(sc_xfer);          scsipi_done(sc_xfer);
 }  }
   
Line 344  wdc_atapi_scsipi_request(struct scsipi_c
Line 344  wdc_atapi_scsipi_request(struct scsipi_c
                         return;                          return;
                 }                  }
   
                 xfer = wdc_get_xfer(WDC_NOSLEEP);                  xfer = ata_get_xfer(ATAXF_NOSLEEP);
                 if (xfer == NULL) {                  if (xfer == NULL) {
                         sc_xfer->error = XS_RESOURCE_SHORTAGE;                          sc_xfer->error = XS_RESOURCE_SHORTAGE;
                         scsipi_done(sc_xfer);                          scsipi_done(sc_xfer);
Line 900  wdc_atapi_done(struct wdc_channel *chp, 
Line 900  wdc_atapi_done(struct wdc_channel *chp, 
         callout_stop(&chp->ch_callout);          callout_stop(&chp->ch_callout);
         /* mark controller inactive and free the command */          /* mark controller inactive and free the command */
         chp->ch_queue->active_xfer = NULL;          chp->ch_queue->active_xfer = NULL;
         wdc_free_xfer(chp, xfer);          ata_free_xfer(chp, xfer);
   
         if (chp->ch_drive[drive].drive_flags & DRIVE_WAITDRAIN) {          if (chp->ch_drive[drive].drive_flags & DRIVE_WAITDRAIN) {
                 sc_xfer->error = XS_DRIVER_STUFFUP;                  sc_xfer->error = XS_DRIVER_STUFFUP;

Legend:
Removed from v.1.80  
changed lines
  Added in v.1.81

CVSweb <webmaster@jp.NetBSD.org>