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

Fix ata_getparam to accept the fact that some crappy devices can pose as

Browse Source 
both master and slave at the same time confusing the probe code.
This commit is contained in:
sos 2004-01-13 21:35:39 +00:00
parent b6e75a26df
commit 04c923e6c5
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -563,13 +563,13 @@ ata_getparam(struct ata_device *atadev, u_int8_t command)
if (request) {
request->device = atadev;
request->u.ata.command = command;
request->flags = (ATA_R_READ | ATA_R_AT_HEAD);
request->flags = (ATA_R_READ | ATA_R_AT_HEAD | ATA_R_QUIET);
request->data = (caddr_t)atadev->param;
request->timeout = 2;
request->retries = 3;
request->bytecount = sizeof(struct ata_params);
request->transfersize = DEV_BSIZE;
while (request->retries) {
while (request->retries > 0 ) {
ata_queue_request(request);
if (!(error = request->result))
break;
@ -577,14 +577,8 @@ ata_getparam(struct ata_device *atadev, u_int8_t command)
}
ata_free_request(request);
}
if (!isprint(atadev->param->model[0]) ||
!isprint(atadev->param->model[1]))
error = ENXIO;
if (error) {
free(atadev->param, M_ATA);
atadev->param = NULL;
}
else {
if (!error && (isprint(atadev->param->model[0]) ||
isprint(atadev->param->model[1]))) {
struct ata_params *atacap = atadev->param;
#if BYTE_ORDER == BIG_ENDIAN
int16_t *ptr;
@ -613,6 +607,14 @@ ata_getparam(struct ata_device *atadev, u_int8_t command)
ata_umode(atacap),
(atacap->hwres & ATA_CABLE_ID) ? "80":"40");
}
else {
if (!error)
error = ENXIO;
if (atadev->param) {
free(atadev->param, M_ATA);
atadev->param = NULL;
}
}
}
return error;
}