Module Name: src
Committed By: riastradh
Date: Thu Apr 7 17:35:31 UTC 2022
Modified Files:
src/sys/dev/usb: ucom.c
Log Message:
ucom(4): Fix unit numbering for devsw/autoconf cross-wiring.
Should introduce a tty_unit function to use here but this'll do for
now to fix the bug I introduced in ucom(4).
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/usb/ucom.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/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.130 src/sys/dev/usb/ucom.c:1.131
--- src/sys/dev/usb/ucom.c:1.130 Mon Mar 28 12:42:37 2022
+++ src/sys/dev/usb/ucom.c Thu Apr 7 17:35:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.130 2022/03/28 12:42:37 riastradh Exp $ */
+/* $NetBSD: ucom.c,v 1.131 2022/04/07 17:35:31 riastradh Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.130 2022/03/28 12:42:37 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.131 2022/04/07 17:35:31 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -205,6 +205,12 @@ dev_type_stop(ucomstop);
dev_type_tty(ucomtty);
dev_type_poll(ucompoll);
+static int
+ucom_unit(dev_t dev)
+{
+ return UCOMUNIT(dev);
+}
+
const struct cdevsw ucom_cdevsw = {
.d_open = ucomopen,
.d_cancel = ucomcancel,
@@ -219,7 +225,7 @@ const struct cdevsw ucom_cdevsw = {
.d_kqfilter = ttykqfilter,
.d_discard = nodiscard,
.d_cfdriver = &ucom_cd,
- .d_devtounit = dev_minor_unit,
+ .d_devtounit = ucom_unit,
.d_flag = D_TTY | D_MPSAFE
};
