Module Name: src
Committed By: kiyohara
Date: Mon Mar 29 07:34:02 UTC 2010
Modified Files:
src/sys/dev/ieee1394: firewire.c fwohci.c
Log Message:
Remove more my debugging code.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ieee1394/firewire.c
cvs rdiff -u -r1.122 -r1.123 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.28 src/sys/dev/ieee1394/firewire.c:1.29
--- src/sys/dev/ieee1394/firewire.c:1.28 Mon Mar 29 03:42:15 2010
+++ src/sys/dev/ieee1394/firewire.c Mon Mar 29 07:34:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: firewire.c,v 1.28 2010/03/29 03:42:15 kiyohara Exp $ */
+/* $NetBSD: firewire.c,v 1.29 2010/03/29 07:34:02 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.28 2010/03/29 03:42:15 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: firewire.c,v 1.29 2010/03/29 07:34:02 kiyohara Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -1047,9 +1047,6 @@
/*
* Generic packet receiving process.
*/
-#if 0
-int dbgflg = 0;
-#endif
void
fw_rcv(struct fw_rcv_buf *rb)
{
@@ -1088,9 +1085,6 @@
fp->mode.hdr.tlrt & 3,
fp->mode.rresq.data);
#if 0
-dbgflg=8;
-#endif
-#if 0
printf("try ad-hoc work around!!\n");
rb->xfer = fw_tl2xfer(rb->fc, fp->mode.hdr.src,
(fp->mode.hdr.tlrt >> 2) ^ 3);
Index: src/sys/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.122 src/sys/dev/ieee1394/fwohci.c:1.123
--- src/sys/dev/ieee1394/fwohci.c:1.122 Mon Mar 29 03:42:15 2010
+++ src/sys/dev/ieee1394/fwohci.c Mon Mar 29 07:34:02 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.122 2010/03/29 03:42:15 kiyohara Exp $ */
+/* $NetBSD: fwohci.c,v 1.123 2010/03/29 07:34:02 kiyohara Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.122 2010/03/29 03:42:15 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.123 2010/03/29 07:34:02 kiyohara Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -2723,9 +2723,6 @@
uint8_t *ld;
int nvec, resCount, len, plen, hlen, offset;
const int psize = dbch->xferq.psize;
-#if 0
-static int prev_resCounts[16], i;
-#endif
#if DIAGNOSTIC
if (dbch->off != OHCI_ARQOFF &&
@@ -2742,10 +2739,6 @@
resCount = FWOHCI_DMA_READ(db_tr->db[0].db.desc.res) & OHCI_COUNT_MASK;
while (status & OHCI_CNTL_DMA_ACTIVE) {
#if 0
-prev_resCounts[i] = resCount;
-i = (i + 1) & 0xf;
-#endif
-#if 0
if (dbch->off == OHCI_ARQOFF)
aprint_normal_dev(sc->fc.dev,
"buf 0x%08x, status 0x%04x, resCount 0x%04x\n",
@@ -2918,32 +2911,6 @@
#endif
break;
}
-#if 0
-{
-extern int dbgflg;
-if (dbgflg) {
- if (dbgflg == 8) {
- int j;
-
- printf("%s: i=%d, resCount=%d", __func__, i, prev_resCounts[0]);
- for (j = 1; j < 16; j++)
- printf(", %d", prev_resCounts[j]);
- printf("\n");
- }
- printf("%s:", __func__);
- if (dbch->off == OHCI_ARQOFF)
- printf(" ARQ:");
- else
- printf(" ARS:");
- printf(" plen=%d, offset=%d, buf_offset=%d,", plen, offset, dbch->buf_offset);
- printf(" idx=%d, resCount=%d,", db_tr->idx, resCount);
- if (dbch->pdb_tr != NULL)
- printf(" pdb=%p", &dbch->pdb_tr->db[0].db);
- printf(" db=%p\n", &db_tr->db[0].db);
- dbgflg--;
-}
-}
-#endif
if (dbch->pdb_tr != NULL) {
if (dbch->buf_offset < 0)
bus_dmamap_sync(sc->fc.dmat,
