summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Glocker <mglocker@cvs.openbsd.org>2019-11-06 20:25:15 +0000
committerMarcus Glocker <mglocker@cvs.openbsd.org>2019-11-06 20:25:15 +0000
commit6c4925089b7d54be2753071c874163ab5aa82753 (patch)
treef887f1c3446f1b34eeb1e021230939664b7df10e
parent51d8d5da728c744d4a69e8a724bb42617b6f768b (diff)
Make udl(4) and uts(4) compile again in debug mode by fixing IOCGROUP
and IOCPARM_LEN macros types.
-rw-r--r--sys/dev/usb/udl.c8
-rw-r--r--sys/dev/usb/uts.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/usb/udl.c b/sys/dev/usb/udl.c
index 0d179825f2b..cbf220d21ca 100644
--- a/sys/dev/usb/udl.c
+++ b/sys/dev/usb/udl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udl.c,v 1.88 2017/09/05 12:22:23 jsg Exp $ */
+/* $OpenBSD: udl.c,v 1.89 2019/11/06 20:25:14 mglocker Exp $ */
/*
* Copyright (c) 2009 Marcus Glocker <mglocker@openbsd.org>
@@ -499,8 +499,8 @@ udl_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
sc = v;
- DPRINTF(1, "%s: %s: ('%c', %d, %d)\n",
- DN(sc), FUNC, IOCGROUP(cmd), cmd & 0xff, IOCPARM_LEN(cmd));
+ DPRINTF(1, "%s: %s: ('%c', %zu, %zu)\n",
+ DN(sc), FUNC, (int) IOCGROUP(cmd), cmd & 0xff, IOCPARM_LEN(cmd));
switch (cmd) {
case WSDISPLAYIO_GTYPE:
@@ -1945,7 +1945,7 @@ udl_init_chip(struct udl_softc *sc)
error = udl_write_1(sc, 0xc40b, 0x00);
if (error != USBD_NORMAL_COMPLETION)
return (error);
- DPRINTF(1, "%s: %s: write 0x00 to 0xc40b\n", DN(sc), FUNC, ui8);
+ DPRINTF(1, "%s: %s: write 0x00 to 0xc40b\n", DN(sc), FUNC);
error = udl_set_decomp_table(sc, udl_decomp_table,
sizeof(udl_decomp_table));
diff --git a/sys/dev/usb/uts.c b/sys/dev/usb/uts.c
index beaf74104d0..d75c870e82b 100644
--- a/sys/dev/usb/uts.c
+++ b/sys/dev/usb/uts.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uts.c,v 1.41 2018/03/15 00:42:41 kevlo Exp $ */
+/* $OpenBSD: uts.c,v 1.42 2019/11/06 20:25:14 mglocker Exp $ */
/*
* Copyright (c) 2007 Robert Nagy <robert@openbsd.org>
@@ -308,8 +308,8 @@ uts_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *l)
struct uts_softc *sc = v;
struct wsmouse_calibcoords *wsmc = (struct wsmouse_calibcoords *)data;
- DPRINTF(("uts_ioctl(%d, '%c', %d)\n",
- IOCPARM_LEN(cmd), IOCGROUP(cmd), cmd & 0xff));
+ DPRINTF(("uts_ioctl(%zu, '%c', %zu)\n",
+ IOCPARM_LEN(cmd), (int) IOCGROUP(cmd), cmd & 0xff));
switch (cmd) {
case WSMOUSEIO_SCALIBCOORDS: