Module Name: src
Committed By: joerg
Date: Sat Sep 14 13:09:18 UTC 2013
Modified Files:
src/sys/dev/ic: hd64570.c rtwphyio.c
Log Message:
Put helper functions for debugging under the corresponding debug
options.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/rtwphyio.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/ic/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.44 src/sys/dev/ic/hd64570.c:1.45
--- src/sys/dev/ic/hd64570.c:1.44 Fri Mar 1 18:25:55 2013
+++ src/sys/dev/ic/hd64570.c Sat Sep 14 13:09:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hd64570.c,v 1.44 2013/03/01 18:25:55 joerg Exp $ */
+/* $NetBSD: hd64570.c,v 1.45 2013/09/14 13:09:18 joerg Exp $ */
/*
* Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.44 2013/03/01 18:25:55 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.45 2013/09/14 13:09:18 joerg Exp $");
#include "opt_inet.h"
@@ -215,6 +215,7 @@ dmac_read_2(sca_port_t *scp, u_int reg)
return sca_read_2(scp->sca, scp->dmac_off + reg);
}
+#if SCA_DEBUG_LEVEL > 0
/*
* read the chain pointer
*/
@@ -226,6 +227,7 @@ sca_desc_read_chainp(struct sca_softc *s
return (bus_space_read_2(sc->scu_memt, sc->scu_memh,
sca_page_addr(sc, dp) + offsetof(struct sca_desc, sd_chainp)));
}
+#endif
/*
* write the chain pointer
@@ -241,6 +243,7 @@ sca_desc_write_chainp(struct sca_softc *
+ offsetof(struct sca_desc, sd_chainp), cp);
}
+#if SCA_DEBUG_LEVEL > 0
/*
* read the buffer pointer
*/
@@ -260,6 +263,7 @@ sca_desc_read_bufp(struct sca_softc *sc,
}
return (address);
}
+#endif
/*
* write the buffer pointer
Index: src/sys/dev/ic/rtwphyio.c
diff -u src/sys/dev/ic/rtwphyio.c:1.17 src/sys/dev/ic/rtwphyio.c:1.18
--- src/sys/dev/ic/rtwphyio.c:1.17 Mon Oct 19 23:19:39 2009
+++ src/sys/dev/ic/rtwphyio.c Sat Sep 14 13:09:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rtwphyio.c,v 1.17 2009/10/19 23:19:39 rmind Exp $ */
+/* $NetBSD: rtwphyio.c,v 1.18 2013/09/14 13:09:18 joerg Exp $ */
/*-
* Copyright (c) 2004, 2005 David Young. All rights reserved.
*
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.17 2009/10/19 23:19:39 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtwphyio.c,v 1.18 2013/09/14 13:09:18 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -224,6 +224,7 @@ rtw_grf5101_mac_crypt(u_int addr, uint32
#undef EXTRACT_NIBBLE
}
+#ifdef RTW_DEBUG
static inline const char *
rtw_rfchipid_string(enum rtw_rfchipid rfchipid)
{
@@ -242,6 +243,7 @@ rtw_rfchipid_string(enum rtw_rfchipid rf
return "unknown";
}
}
+#endif
/* Bang bits over the 3-wire interface. */
int