Module Name: src Committed By: jdolecek Date: Fri Jun 23 23:45:56 UTC 2017
Modified Files: src/sys/dev/ic [jdolecek-ncq]: siisata.c Log Message: ata/TODO.ncq To generate a diff of this commit: cvs rdiff -u -r1.30.4.19 -r1.30.4.20 src/sys/dev/ic/siisata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/ic/siisata.c diff -u src/sys/dev/ic/siisata.c:1.30.4.19 src/sys/dev/ic/siisata.c:1.30.4.20 --- src/sys/dev/ic/siisata.c:1.30.4.19 Wed Jun 21 19:38:43 2017 +++ src/sys/dev/ic/siisata.c Fri Jun 23 23:45:56 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: siisata.c,v 1.30.4.19 2017/06/21 19:38:43 jdolecek Exp $ */ +/* $NetBSD: siisata.c,v 1.30.4.20 2017/06/23 23:45:56 jdolecek Exp $ */ /* from ahcisata_core.c */ @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.19 2017/06/21 19:38:43 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.20 2017/06/23 23:45:56 jdolecek Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -590,6 +590,7 @@ siisata_reset_drive(struct ata_drive_dat */ xfer = ata_get_xfer_ext(chp, false, 0); if (xfer == NULL) { + printf("%s: no xfer\n", __func__); siisata_reset_channel(chp, flags); return; } @@ -1151,7 +1152,7 @@ siisata_bio_start(struct ata_channel *ch if (ata_bio->flags & ATA_ITSDONE) break; siisata_intr_port(schp); - DELAY(1000); + DELAY(100); } siisata_enable_port_interrupt(chp); @@ -1245,8 +1246,6 @@ siisata_bio_complete(struct ata_channel ata_bio->bcount = 0; } SIISATA_DEBUG_PRINT((" now %ld\n", ata_bio->bcount), DEBUG_XFERS); - if (ata_bio->flags & ATA_POLL) - return 1; (*chp->ch_drive[drive].drv_done)(chp->ch_drive[drive].drv_softc, xfer); atastart(chp); return 0;