patch-2.4.5 linux/drivers/usb/usb-uhci-debug.h

• Lines: 73
• Date: Wed May 16 10:31:27 2001
• Orig file: v2.4.4/linux/drivers/usb/usb-uhci-debug.h
• Orig date: Sat Jul 8 19:38:16 2000

diff -u --recursive --new-file v2.4.4/linux/drivers/usb/usb-uhci-debug.h linux/drivers/usb/usb-uhci-debug.h
@@ -5,7 +5,7 @@
 		dbg("qh has not QH_TYPE");
 		return;
 	}
-	dbg("QH @ %p/%08lX:", qh, virt_to_bus (qh));
+	dbg("QH @ %p/%08X:", qh, qh->dma_addr);
 
 	if (qh->hw.qh.head & UHCI_PTR_TERM)
 		dbg("    Head Terminate");
@@ -23,6 +23,7 @@
 }
 #endif
 
+#if 0
 static void uhci_show_td (puhci_desc_t td)
 {
 	char *spid;
@@ -42,8 +43,8 @@
 		break;
 	}
 
-	warn("  TD @ %p/%08lX, MaxLen=%02x DT%d EP=%x Dev=%x PID=(%s) buf=%08x",
-	     td, virt_to_bus (td),
+	warn("  TD @ %p/%08X, MaxLen=%02x DT%d EP=%x Dev=%x PID=(%s) buf=%08x",
+	     td, td->dma_addr,
 	     td->hw.td.info >> 21,
 	     ((td->hw.td.info >> 19) & 1),
 	     (td->hw.td.info >> 15) & 15,
@@ -74,10 +75,15 @@
 		     td->hw.td.link & ~UHCI_PTR_BITS,
 		     (td->hw.td.link & UHCI_PTR_DEPTH ? "Depth first" : "Breadth first"));
 }
+#endif
+
 #ifdef DEBUG
 static void __attribute__((__unused__)) uhci_show_td_queue (puhci_desc_t td)
 {
-	//dbg("uhci_show_td_queue %p (%08lX):", td, virt_to_bus (td));
+	//dbg("uhci_show_td_queue %p (%08lX):", td, td->dma_addr);
+#if 1
+	return;
+#else
 	while (1) {
 		uhci_show_td (td);
 		if (td->hw.td.link & UHCI_PTR_TERM)
@@ -89,13 +95,19 @@
 			break;
 		}
 	}
+#endif
 }
 
 static void __attribute__((__unused__)) uhci_show_queue (puhci_desc_t qh)
 {
+#if 0
 	uhci_desc_t *start_qh=qh;
+#endif
 
 	dbg("uhci_show_queue %p:", qh);
+#if 1
+	return;
+#else
 	while (1) {
 		uhci_show_qh (qh);
 
@@ -117,6 +129,7 @@
 			break;
 		}
 	}		
+#endif
 }
 
 static void __attribute__((__unused__)) uhci_show_sc (int port, unsigned short status)