Module Name: src
Committed By: kiyohara
Date: Mon Mar 29 03:42:15 UTC 2010
Modified Files:
src/sys/dev/ieee1394: firewire.c fwohci.c
Log Message:
Remove debugging process.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/ieee1394/firewire.c
cvs rdiff -u -r1.121 -r1.122 src/sys/dev/ieee1394/fwohci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ieee1394/firewire.c
diff -u src/sys/dev/ieee1394/firewire.c:1.27 src/sys/dev/ieee1394/firewire.c:1.28
--- src/sys/dev/ieee1394/firewire.c:1.27 Mon Mar 29 03:05:27 2010
+++ src/sys/dev/ieee1394/firewire.c Mon Mar 29 03:42:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.27 2010/03/29 03:05:27 kiyohara Exp $ */
+/* $NetBSD: firewire.c,v 1.28 2010/03/29 03:42:15 kiyohara Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
* Copyright (c) 1998-2002 Katsushi Kobayashi and Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.27 2010/03/29 03:05:27 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.28 2010/03/29 03:42:15 kiyohara Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1727,21 +1727,10 @@
node = dfwdev->dst;
/* First quad */
-#if 0
-printf("%s: speed=0x%x(0x%x)\n", __func__, dfwdev->speed, fc->speed_map->speed[fc->nodeid][node]);
-if (dfwdev->speed == 0)
- dfwdev->speed = fc->speed_map->speed[fc->nodeid][node];
-else if (dfwdev->speed == 2)
- dfwdev->speed = 1;
-else
- dfwdev->speed = 0;
-printf("%s: Re: speed=0x%x\n", __func__, dfwdev->speed);
-#endif
err = fw_explore_read_quads(dfwdev, CSRROMOFF, csr, 1);
if (err) {
aprint_error_dev(fc->bdev,
"node%d: explore_read_quads failure\n", node);
-printf("err=%d\n", err);
dfwdev->status = FWDEVINVAL;
return -1;
}
Index: src/sys/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.121 src/sys/dev/ieee1394/fwohci.c:1.122
--- src/sys/dev/ieee1394/fwohci.c:1.121 Mon Mar 29 03:05:27 2010
+++ src/sys/dev/ieee1394/fwohci.c Mon Mar 29 03:42:15 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.121 2010/03/29 03:05:27 kiyohara Exp $ */
+/* $NetBSD: fwohci.c,v 1.122 2010/03/29 03:42:15 kiyohara Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.121 2010/03/29 03:05:27 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.122 2010/03/29 03:42:15 kiyohara Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -2998,25 +2998,7 @@
}
fwdma_sync_multiseg(dbch->am, db_tr->idx, db_tr->idx,
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-#if 0
-{
-uint32_t _status;
-
-fwdma_sync_multiseg(dbch->am, db_tr->idx, db_tr->idx, BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
-_status = FWOHCI_DMA_READ(db_tr->db[0].db.desc.res) >> OHCI_STATUS_SHIFT;
-if (status != _status)
-printf("Ooops status ? 0x%x : 0x%x, %p\n", status, _status, db_tr->db);
-fwdma_sync_multiseg(dbch->am, db_tr->idx, db_tr->idx, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
-_status = FWOHCI_DMA_READ(((struct fwohcidb *)MIPS_PHYS_TO_KSEG1(MIPS_KSEG0_TO_PHYS(db_tr->db)))[0].db.desc.res) >> OHCI_STATUS_SHIFT;
-if (status != _status)
-printf("Ooooops status ? 0x%x : 0x%x\n", status, _status);
-}
-#endif
mutex_exit(&dbch->xferq.q_mtx);
-#if 0
-prev_resCounts[i] = resCount;
-i = (i + 1) & 0xf;
-#endif
return;
err:
