system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-25 11:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch to the atapi driver, by Serge V.Vakulenko, minor changes

Browse source 
by me...

Original message:

This patch upgrades the ATAPI CD-ROM driver to version 1.3.

It has three bugs fixed:

1) The `controller not ready' message at startup and later.
   It was caused by staled media change bit.

2) Incorrect shuffling of model string for some drives (NEC, Mitsumi).

3) Handling of drives which report itself as been of direct-access type,
   instead of CD-ROM type.

There is one known bug which is not fixed yet -- probing
in absense of IDE disks. A work-around exists though (thanks Steve!).
If you have no IDE disks attached, then remove them from the kernel
config file to make the CD-ROM attach correctly.
Unfortunately, there is no way to disable them from the kernel
interactive config mode.

Reviewed by:	sos (Soren Schmidt)
Submitted by:	vak@gw.cronyx.msk.su (Serge V.Vakulenko)
This commit is contained in:
Søren Schmidt 1995-09-09 11:41:04 +00:00
parent f3c3ae3c38
commit 2bf07b2bd7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=10647
2 changed files with 41 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
sys/i386/isa/atapi.c
View file

@ -11,7 +11,7 @@
* or modify this software as long as this message is kept with the software,
* all derivative works or modified versions.
*
* Version 1.1, Mon Jul 10 21:55:11 MSD 1995
* Version 1.3, Mon Aug 28 21:44:01 MSD 1995
*/
/*
@ -101,7 +101,6 @@
#include "wdc.h"
#include "wcd.h"
/* #include "whd.h" -- add your driver here */
/* #include "wmt.h" -- add your driver here */
/* #include "wmd.h" -- add your driver here */
@ -243,14 +242,22 @@ void atapi_attach (int ctlr, int unit, int port, struct kern_devconf *parent)
return;
}
switch (ap->devtype) {
default:
/* unknown ATAPI device */
printf ("wdc%d: unit %d: unknown ATAPI type=%d\n",
default: /* unknown ATAPI device */
printf ("wdc%d: unit %d: unknown ATAPI device type=%d\n",
ctlr, unit, ap->devtype);
break;
case AT_TYPE_DIRECT: /* direct-access (magnetic disk) */
#if NWHD > 0
/* Add your driver here */
#else
printf ("wdc%d: ATAPI hard disks not supported\n", ctlr);
printf ("wdc%d: Could be old ATAPI CDROM, trying...\n", ctlr);
break;
#endif
case AT_TYPE_CDROM: /* CD-ROM device */
#if NWCD > 0
/* ATAPI CD-ROM */
{
int wcdattach (struct atapi*, int, struct atapi_params*,
int, struct kern_devconf*);
@ -263,25 +270,20 @@ void atapi_attach (int ctlr, int unit, int port, struct kern_devconf *parent)
printf ("wdc%d: ATAPI CD-ROMs not configured\n", ctlr);
break;
#endif
case AT_TYPE_DIRECT: /* direct-access (magnetic disk) */
#if NWHD > 0
/* Add your driver here */
#else
printf ("wdc%d: ATAPI hard disks not supported\n", ctlr);
break;
#endif
case AT_TYPE_TAPE: /* streaming tape (QIC-121 model) */
#if NWMT > 0
/* Add your driver here */
#else
printf ("wdc%d: ATAPI streaming tapes not supported yet\n", ctlr);
printf ("wdc%d: ATAPI streaming tapes not supported\n", ctlr);
break;
#endif
case AT_TYPE_OPTICAL: /* optical disk */
#if NWMD > 0
/* Add your driver here */
#else
printf ("wdc%d: ATAPI optical disks not supported yet\n", ctlr);
printf ("wdc%d: ATAPI optical disks not supported\n", ctlr);
break;
#endif
}
@ -336,10 +338,15 @@ static struct atapi_params *atapi_probe (int port, int unit)
return (0);
bcopy (tb, ap, sizeof *ap);
/* Shuffle string byte order. */
for (i=0; i<sizeof(ap->model); i+=2) {
u_short *p = (u_short*) (ap->model + i);
*p = ntohs (*p);
/*
* Shuffle string byte order.
* Mitsumi and NEC drives don't need this.
*/
if (! ((ap->model[0] == 'N' && ap->model[1] == 'E') ||
(ap->model[0] == 'F' && ap->model[1] == 'X'))) {
u_short *p = (u_short*) (ap->model + sizeof(ap->model));
while (--p >= (u_short*) ap->model)
*p = ntohs (*p);
}
/* Clean up the model by converting nulls to spaces, and
@ -580,12 +587,13 @@ int atapi_io (struct atapi *ata, struct atapicmd *ac)
u_char ireason;
u_short len;
if (atapi_wait (ata->port, ac->count ? ARS_DRQ : 0) < 0) {
printf ("atapi%d.%d: controller not ready\n",
ata->ctrlr, ac->unit);
if (atapi_wait (ata->port, 0) < 0) {
ac->result.status = inb (ata->port + AR_STATUS);
ac->result.error = inb (ata->port + AR_ERROR);
ac->result.code = RES_NOTRDY;
ac->result.status = 0;
ac->result.error = 0;
printf ("atapi%d.%d: controller not ready, status=%b, error=%b\n",
ata->ctrlr, ac->unit, ac->result.status, ARS_BITS,
ac->result.error, AER_BITS);
return (0);
}

14
sys/i386/isa/wcd.c
View file

@ -12,7 +12,7 @@
* or modify this software as long as this message is kept with the software,
* all derivative works or modified versions.
*
* Version 1.1, Mon Jul 10 21:55:11 MSD 1995
* Version 1.2, Mon Jul 24 17:21:25 MSD 1995
*/
/*
@ -262,10 +262,16 @@ void wcdattach (struct atapi *ata, int unit, struct atapi_params *ap, int debug,
}
/* Get drive capabilities. */
/* Do it twice to avoid the stale media changed state. */
result = atapi_request_immediate (ata, unit, ATAPI_MODE_SENSE,
0, CAP_PAGE, 0, 0, 0, 0, sizeof (t->cap) >> 8, sizeof (t->cap),
0, 0, 0, 0, 0, 0, 0, (char*) &t->cap, sizeof (t->cap));
if (result.code == RES_ERR && result.error == AER_SK_UNIT_ATTENTION)
result = atapi_request_immediate (ata, unit, ATAPI_MODE_SENSE,
0, CAP_PAGE, 0, 0, 0, 0, sizeof (t->cap) >> 8,
sizeof (t->cap), 0, 0, 0, 0, 0, 0, 0,
(char*) &t->cap, sizeof (t->cap));
if (result.code == 0) {
wcd_describe (t);
if (t->flags & F_DEBUG)
@ -367,14 +373,12 @@ int wcdopen (dev_t dev, int flags, int fmt, struct proc *p)
result = atapi_request_wait (t->ata, t->unit, ATAPI_TEST_UNIT_READY,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
if (result.code == RES_ERR && result.error == AER_SK_UNIT_ATTENTION)
if (result.code == RES_ERR && result.error == AER_SK_UNIT_ATTENTION) {
t->flags |= F_MEDIA_CHANGED;
if (result.code)
result = atapi_request_wait (t->ata, t->unit,
ATAPI_TEST_UNIT_READY, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0);
}
if (result.code) {
wcd_error (t, result);
return (ENXIO);