Module Name: src
Committed By: martin
Date: Sun Jan 5 15:11:29 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-8]: uthum.c
Log Message:
use min() instead of uimin() - the latter does not exist on this branch.
To generate a diff of this commit:
cvs rdiff -u -r1.13.8.1 -r1.13.8.2 src/sys/dev/usb/uthum.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/usb/uthum.c
diff -u src/sys/dev/usb/uthum.c:1.13.8.1 src/sys/dev/usb/uthum.c:1.13.8.2
--- src/sys/dev/usb/uthum.c:1.13.8.1 Thu Jan 2 09:43:56 2020
+++ src/sys/dev/usb/uthum.c Sun Jan 5 15:11:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uthum.c,v 1.13.8.1 2020/01/02 09:43:56 martin Exp $ */
+/* $NetBSD: uthum.c,v 1.13.8.2 2020/01/05 15:11:29 martin Exp $ */
/* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.13.8.1 2020/01/02 09:43:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uthum.c,v 1.13.8.2 2020/01/05 15:11:29 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -267,7 +267,7 @@ uthum_read_data(struct uthum_softc *sc,
if ((buf == NULL) || len == 0)
return 0;
- olen = uimin(sc->sc_olen, sizeof(cmdbuf));
+ olen = min(sc->sc_olen, sizeof(cmdbuf));
/* issue query */
memset(cmdbuf, 0, sizeof(cmdbuf));
@@ -298,7 +298,7 @@ uthum_read_data(struct uthum_softc *sc,
tsleep(&sc->sc_sme, 0, "uthum", (need_delay*hz+999)/1000 + 1);
/* get answer */
- flen = uimin(sc->sc_flen, sizeof(report));
+ flen = min(sc->sc_flen, sizeof(report));
if (uhidev_get_report(&sc->sc_hdev, UHID_FEATURE_REPORT,
report, flen))
return EIO;
