Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/usb s/delay/need_delay/ to get rid of shadowed varia...
details: https://anonhg.NetBSD.org/src/rev/89ad87a2260a
branches: trunk
changeset: 752803:89ad87a2260a
user: jdc <jdc%NetBSD.org@localhost>
date: Sun Mar 07 11:28:46 2010 +0000
description:
s/delay/need_delay/ to get rid of shadowed variable warning (some
ports define delay in machine/param.h).
diffstat:
sys/dev/usb/uthum.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (29 lines):
diff -r 3af9af223dd6 -r 89ad87a2260a sys/dev/usb/uthum.c
--- a/sys/dev/usb/uthum.c Sun Mar 07 11:07:01 2010 +0000
+++ b/sys/dev/usb/uthum.c Sun Mar 07 11:28:46 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.3 2010/03/06 04:39:16 cnst Exp $ */
+/* $NetBSD: uthum.c,v 1.4 2010/03/07 11:28:46 jdc Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -248,7 +248,7 @@
int
uthum_read_data(struct uthum_softc *sc, uint8_t target_cmd, uint8_t *buf,
- size_t len, int delay)
+ size_t len, int need_delay)
{
int i;
uint8_t cmdbuf[32], report[256];
@@ -282,8 +282,8 @@
return EIO;
/* wait if required */
- if (delay > 1)
- tsleep(&sc->sc_sme, 0, "uthum", (delay*hz+999)/1000 + 1);
+ if (need_delay > 1)
+ tsleep(&sc->sc_sme, 0, "uthum", (need_delay*hz+999)/1000 + 1);
/* get answer */
if (uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT,
Home |
Main Index |
Thread Index |
Old Index