d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cosmetic changes to minimise diffs for MFC.

Browse Source
This commit is contained in:
sos 2002-03-07 16:34:19 +00:00
parent 23058273ee
commit fb90ee5e0b
5 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/dev/ata/ata-all.c
View File

@ -421,17 +421,9 @@ ata_getparam(struct ata_device *atadev, u_int8_t command)
struct ata_params *ata_parm;
int retry = 0;
/* select drive */
ATA_OUTB(atadev->channel->r_io, ATA_DRIVE, ATA_D_IBM | atadev->unit);
DELAY(1);
/* enable interrupt */
ATA_OUTB(atadev->channel->r_altio, ATA_ALTSTAT, ATA_A_4BIT);
DELAY(1);
/* apparently some devices needs this repeated */
do {
if (ata_command(atadev, command, 0, 0, 0, ATA_WAIT_INTR)) {
if (ata_command(atadev, command, 0, 0, 0, ATA_WAIT_READY)) {
ata_prtdev(atadev, "%s identify failed\n",
command == ATA_C_ATAPI_IDENTIFY ? "ATAPI" : "ATA");
return -1;

6
sys/dev/ata/ata-disk.c
View File

@ -28,7 +28,6 @@
* $FreeBSD$
*/
#include "opt_global.h"
#include "opt_ata.h"
#include <sys/param.h>
#include <sys/systm.h>
@ -617,6 +616,7 @@ ad_interrupt(struct ad_request *request)
ata_dmainit(adp->device->channel, adp->device->unit,
ata_pmode(adp->device->param), -1, -1);
request->flags |= ADR_F_FORCE_PIO;
printf(" trying PIO mode\n");
TAILQ_INSERT_HEAD(&adp->device->channel->ata_queue, request, chain);
return ATA_OP_FINISHED;
}
@ -627,7 +627,7 @@ ad_interrupt(struct ad_request *request)
}
/* if we arrived here with forced PIO mode, DMA doesn't work right */
if (request->flags & ADR_F_FORCE_PIO)
if (request->flags & ADR_F_FORCE_PIO && !(request->flags & ADR_F_ERROR))
ata_prtdev(adp->device, "DMA problem fallback to PIO mode\n");
/* if this was a PIO read operation, get the data */
@ -890,7 +890,7 @@ ad_reinit(struct ata_device *atadev)
/* reinit disk parameters */
ad_invalidatequeue(atadev->driver, NULL);
ata_command(atadev, ATA_C_SET_MULTI, 0,
adp->transfersize / DEV_BSIZE, 0, ATA_WAIT_INTR);
adp->transfersize / DEV_BSIZE, 0, ATA_WAIT_READY);
if (adp->device->mode >= ATA_DMA)
ata_dmainit(atadev->channel, atadev->unit,
ata_pmode(adp->device->param),

1
sys/dev/ata/atapi-all.c
View File

@ -28,7 +28,6 @@
* $FreeBSD$
*/
#include "opt_global.h"
#include "opt_ata.h"
#include <sys/param.h>
#include <sys/systm.h>

1
sys/dev/ata/atapi-cd.c
View File

@ -29,7 +29,6 @@
*/
#include "opt_ata.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/ata.h>

1
sys/dev/ata/atapi-tape.c
View File

@ -29,7 +29,6 @@
*/
#include "opt_ata.h"
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/ata.h>