PERFORCE change 62615 for review

[Julian Elischer]

http://perforce.freebsd.org/chv.cgi?CH=62615

Change 62615 by julian at julian_ref on 2004/10/03 23:52:36

	revert accidental inclusions

Affected files ...

.. //depot/projects/nsched/sys/dev/ata/ata-all.c#14 edit
.. //depot/projects/nsched/sys/dev/ata/ata-all.h#7 edit
.. //depot/projects/nsched/sys/dev/ata/ata-pci.c#6 edit
.. //depot/projects/nsched/sys/dev/ata/ata-queue.c#8 edit

Differences ...

==== //depot/projects/nsched/sys/dev/ata/ata-all.c#14 (text+ko) ====

@@ -240,7 +240,7 @@
     if (!ch->r_irq)
 	return ENXIO;
 
-    if (1 || bootverbose)
+    if (bootverbose)
 	ata_printf(ch, -1, "reiniting channel ..\n");
 
     /* grap the channel lock no matter what */
@@ -258,7 +258,7 @@
 
     ch->hw.reset(ch);
 
-    if (1 || bootverbose)
+    if (bootverbose)
 	ata_printf(ch, -1, "resetting done ..\n");
 
     /* detach what left the channel during reset */
@@ -314,7 +314,7 @@
     atapi_cam_reinit_bus(ch);
 #endif
 
-    if (1 || bootverbose)
+    if (bootverbose)
 	ata_printf(ch, -1, "device config done ..\n");
 
     ch->flags &= ~ATA_IMMEDIATE_MODE;

==== //depot/projects/nsched/sys/dev/ata/ata-all.h#7 (text+ko) ====

@@ -235,7 +235,7 @@
 };
 
 /* define this for debugging request processing */
-#if 1
+#if 0
 #define ATA_DEBUG_RQ(request, string) \
     { \
     if (request->flags & ATA_R_DEBUG) \

==== //depot/projects/nsched/sys/dev/ata/ata-pci.c#6 (text+ko) ====

@@ -447,11 +447,10 @@
 static int
 ata_pci_dmastop(struct ata_channel *ch)
 {
-    int error = 0;
+    int error;
 
     ATA_IDX_OUTB(ch, ATA_BMCMD_PORT, 
 		 ATA_IDX_INB(ch, ATA_BMCMD_PORT) & ~ATA_BMCMD_START_STOP);
-    error = ATA_IDX_INB(ch, ATA_BMSTAT_PORT) & ATA_BMSTAT_MASK;
     ch->dma->flags &= ~ATA_DMA_ACTIVE;
     error = ATA_IDX_INB(ch, ATA_BMSTAT_PORT) & ATA_BMSTAT_MASK;
     ATA_IDX_OUTB(ch, ATA_BMSTAT_PORT, ATA_BMSTAT_INTERRUPT | ATA_BMSTAT_ERROR);

==== //depot/projects/nsched/sys/dev/ata/ata-queue.c#8 (text+ko) ====

@@ -89,7 +89,7 @@
 	else
 	    TAILQ_INSERT_TAIL(&ch->ata_queue, request, chain);
 	mtx_unlock(&ch->queue_mtx);
-ATA_DEBUG_RQ(request, "queued");
+	ATA_DEBUG_RQ(request, "queued");
 	ata_start(ch);
     }
 
@@ -99,9 +99,7 @@
 
     /* if this is not a callback wait until request is completed */
     if (!request->callback) {
-
-ATA_DEBUG_RQ(request, "wait for completition");
-
+	ATA_DEBUG_RQ(request, "wait for completition");
 	sema_wait(&request->done);
 	sema_destroy(&request->done);
     }
@@ -191,7 +189,7 @@
 	}
 	TAILQ_REMOVE(&ch->ata_queue, request, chain);
 	mtx_unlock(&ch->queue_mtx);
-ATA_DEBUG_RQ(request, "starting");
+	ATA_DEBUG_RQ(request, "starting");
 
 	/* arm timeout */
 	if (!dumping)
@@ -394,7 +392,7 @@
 	    request->result = EIO;
     }
 
-ATA_DEBUG_RQ(request, "completed callback/wakeup");
+    ATA_DEBUG_RQ(request, "completed callback/wakeup");
 
     /* get results back to the initiator */
     if (request->callback)