--+HP7ph2BbKc20aGI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Nov 17, 2003 at 11:26:08AM -0700, john@johnrshannon.com wrote:
> >Description:
> 	Sony VAIO PCG-GRZ610
> 
> 	As a result of changes made between 12 Nov and 14 Nov, my ATAPI CD drive is no longer detected. A

Hi,
can you try wdc rev 1.155, or the attached patch ?

-- 
Manuel Bouyer <bouyer@antioche.eu.org>
     NetBSD: 24 ans d'experience feront toujours la difference
--

--+HP7ph2BbKc20aGI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff

Index: wdc.c
===================================================================
RCS file: /cvsroot/src/sys/dev/ic/wdc.c,v
retrieving revision 1.154
diff -u -r1.154 wdc.c
--- wdc.c	2003/11/13 22:18:10	1.154
+++ wdc.c	2003/11/17 19:58:58
@@ -410,10 +410,8 @@
 			chp->ch_drive[0].drive_flags &= ~DRIVE_OLD;
 			chp->ch_drive[1].drive_flags &= ~DRIVE_OLD;
 		} else {
-			chp->ch_drive[0].drive_flags &=
+			chp->ch_drive[i].drive_flags &=
 			    ~(DRIVE_ATA | DRIVE_ATAPI);
-			chp->ch_drive[1].drive_flags &=
-			    ~(DRIVE_ATA | DRIVE_ATAPI);
 			WDCDEBUG_PRINT(("%s:%d:%d: IDENTIFY failed (%d)\n",
 			    chp->wdc->sc_dev.dv_xname,
 			    chp->channel, i, error), DEBUG_PROBE);
@@ -442,6 +440,7 @@
 				    chp->wdc->sc_dev.dv_xname,
 				    chp->channel, i), DEBUG_PROBE);
 				    chp->ch_drive[i].drive_flags &= ~DRIVE_OLD;
+				    continue;
 			}
 			if (wait_for_ready(chp, 10000, 0) == WDCWAIT_TOUT) {
 				WDCDEBUG_PRINT(("%s:%d:%d: not ready\n",
@@ -458,6 +457,11 @@
 				    chp->wdc->sc_dev.dv_xname,
 				    chp->channel, i), DEBUG_PROBE);
 				chp->ch_drive[i].drive_flags &= ~DRIVE_OLD;
+			} else {
+				chp->ch_drive[0].drive_flags &=
+				    ~(DRIVE_ATA | DRIVE_ATAPI);
+				chp->ch_drive[1].drive_flags &=
+				    ~(DRIVE_ATA | DRIVE_ATAPI);
 			}
 		}
 	}

--+HP7ph2BbKc20aGI--