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

Remove get status from probe, confuse LU002

Browse Source 
Add check stbytes[1] != stbytes[2] for presence real Mitsumi
controller
This commit is contained in:
Andrey A. Chernov 1994-12-21 15:17:59 +00:00
parent 0bda4f122a
commit f8c32a9711
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/mcd/mcd.c
View File

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: mcd.c,v 1.32 1994/11/14 19:32:11 ache Exp $ * $Id: mcd.c,v 1.33 1994/12/21 15:12:41 ache Exp $
*/ */
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -668,10 +668,6 @@ mcd_probe(struct isa_device *dev)
outb(port+MCD_DATA, MCD_CMDGETSTAT); outb(port+MCD_DATA, MCD_CMDGETSTAT);
if (!twiddle_thumbs(port, unit, 1000000, "getting status")) if (!twiddle_thumbs(port, unit, 1000000, "getting status"))
return 0; /* Timeout */ return 0; /* Timeout */
status = inb(port+MCD_DATA);
if (status != MCDCDABSENT && status != MCDCDPRESENT &&
status != MCDSOPEN && status != MCDSCLOSED)
return 0; /* Not actually a Mitsumi drive here */
/* Get version information */ /* Get version information */
outb(port+MCD_DATA, MCD_CMDCONTINFO); outb(port+MCD_DATA, MCD_CMDCONTINFO);
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
@ -679,6 +675,8 @@ mcd_probe(struct isa_device *dev)
return 0; return 0;
stbytes[j] = (inb(port+MCD_DATA) & 0xFF); stbytes[j] = (inb(port+MCD_DATA) & 0xFF);
} }
if (stbytes[1] == stbytes[2])
return 0;
printf("mcd%d: version information is %c %x\n", unit, printf("mcd%d: version information is %c %x\n", unit,
stbytes[1], stbytes[2]); stbytes[1], stbytes[2]);
if (stbytes[2] >= 4) { if (stbytes[2] >= 4) {

8
sys/i386/isa/mcd.c
View File

@ -40,7 +40,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: mcd.c,v 1.32 1994/11/14 19:32:11 ache Exp $ * $Id: mcd.c,v 1.33 1994/12/21 15:12:41 ache Exp $
*/ */
static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
@ -668,10 +668,6 @@ mcd_probe(struct isa_device *dev)
outb(port+MCD_DATA, MCD_CMDGETSTAT); outb(port+MCD_DATA, MCD_CMDGETSTAT);
if (!twiddle_thumbs(port, unit, 1000000, "getting status")) if (!twiddle_thumbs(port, unit, 1000000, "getting status"))
return 0; /* Timeout */ return 0; /* Timeout */
status = inb(port+MCD_DATA);
if (status != MCDCDABSENT && status != MCDCDPRESENT &&
status != MCDSOPEN && status != MCDSCLOSED)
return 0; /* Not actually a Mitsumi drive here */
/* Get version information */ /* Get version information */
outb(port+MCD_DATA, MCD_CMDCONTINFO); outb(port+MCD_DATA, MCD_CMDCONTINFO);
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
@ -679,6 +675,8 @@ mcd_probe(struct isa_device *dev)
return 0; return 0;
stbytes[j] = (inb(port+MCD_DATA) & 0xFF); stbytes[j] = (inb(port+MCD_DATA) & 0xFF);
} }
if (stbytes[1] == stbytes[2])
return 0;
printf("mcd%d: version information is %c %x\n", unit, printf("mcd%d: version information is %c %x\n", unit,
stbytes[1], stbytes[2]); stbytes[1], stbytes[2]);
if (stbytes[2] >= 4) { if (stbytes[2] >= 4) {