Module Name: src
Committed By: mrg
Date: Sat May 4 08:04:13 UTC 2019
Modified Files:
src/sys/dev/usb: moscom.c u3g.c uark.c ubsa.c ubsa_common.c uchcom.c
ucomvar.h uftdi.c ugensa.c uhmodem.c uipaq.c ukyopon.c umct.c
umodem.c umodem_common.c uplcom.c uslsa.c uvisor.c uvscom.c
Log Message:
clean up ucom / ucom-parent interface slightly:
- document what the ucom_methods{} callbacks argument are and that
they are all optional.
- remove almost all methods being assigned to NULL, as they are all
C99 initialisers and thus don't need NULL assignments.
- ucom_get_status() callback always has lsr/msr pointers as valid.
remove all tests for not NULL in these functions.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/moscom.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/usb/u3g.c src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/usb/ubsa_common.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/uchcom.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/ucomvar.h
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/usb/ugensa.c src/sys/dev/usb/umct.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/uhmodem.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/usb/umodem.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/umodem_common.c
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/usb/uplcom.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/usb/uvisor.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/uvscom.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/moscom.c
diff -u src/sys/dev/usb/moscom.c:1.11 src/sys/dev/usb/moscom.c:1.12
--- src/sys/dev/usb/moscom.c:1.11 Mon Jun 26 20:36:01 2017
+++ src/sys/dev/usb/moscom.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: moscom.c,v 1.11 2017/06/26 20:36:01 is Exp $ */
+/* $NetBSD: moscom.c,v 1.12 2019/05/04 08:04:13 mrg Exp $ */
/* $OpenBSD: moscom.c,v 1.11 2007/10/11 18:33:14 deraadt Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.11 2017/06/26 20:36:01 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: moscom.c,v 1.12 2019/05/04 08:04:13 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,14 +156,10 @@ int moscom_open(void *, int);
int moscom_cmd(struct moscom_softc *, int, int);
struct ucom_methods moscom_methods = {
- .ucom_get_status = NULL,
.ucom_set = moscom_set,
.ucom_param = moscom_param,
- .ucom_ioctl = NULL,
.ucom_open = moscom_open,
.ucom_close = NULL,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
static const struct usb_devno moscom_devs[] = {
Index: src/sys/dev/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.35 src/sys/dev/usb/u3g.c:1.36
--- src/sys/dev/usb/u3g.c:1.35 Tue Jul 24 08:15:57 2018
+++ src/sys/dev/usb/u3g.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.35 2018/07/24 08:15:57 msaitoh Exp $ */
+/* $NetBSD: u3g.c,v 1.36 2019/05/04 08:04:13 mrg Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.35 2018/07/24 08:15:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: u3g.c,v 1.36 2019/05/04 08:04:13 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -166,8 +166,6 @@ static void u3g_write(void *, int, u_cha
struct ucom_methods u3g_methods = {
.ucom_get_status = u3g_get_status,
.ucom_set = u3g_set,
- .ucom_param = NULL,
- .ucom_ioctl = NULL,
.ucom_open = u3g_open,
.ucom_close = u3g_close,
.ucom_read = u3g_read,
@@ -542,10 +540,8 @@ u3g_get_status(void *arg, int portno, u_
{
struct u3g_softc *sc = arg;
- if (lsr != NULL)
- *lsr = 0; /* LSR isn't supported */
- if (msr != NULL)
- *msr = sc->sc_com[portno].c_msr;
+ *lsr = 0; /* LSR isn't supported */
+ *msr = sc->sc_com[portno].c_msr;
}
/*ARGSUSED*/
Index: src/sys/dev/usb/ubsa.c
diff -u src/sys/dev/usb/ubsa.c:1.35 src/sys/dev/usb/ubsa.c:1.36
--- src/sys/dev/usb/ubsa.c:1.35 Tue Jan 22 06:47:20 2019
+++ src/sys/dev/usb/ubsa.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa.c,v 1.35 2019/01/22 06:47:20 skrll Exp $ */
+/* $NetBSD: ubsa.c,v 1.36 2019/05/04 08:04:13 mrg Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.35 2019/01/22 06:47:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.36 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -102,11 +102,8 @@ struct ucom_methods ubsa_methods = {
.ucom_get_status = ubsa_get_status,
.ucom_set = ubsa_set,
.ucom_param = ubsa_param,
- .ucom_ioctl = NULL,
.ucom_open = ubsa_open,
.ucom_close = ubsa_close,
- .ucom_read = NULL,
- .ucom_write = NULL
};
Static const struct usb_devno ubsa_devs[] = {
Index: src/sys/dev/usb/uark.c
diff -u src/sys/dev/usb/uark.c:1.12 src/sys/dev/usb/uark.c:1.13
--- src/sys/dev/usb/uark.c:1.12 Tue Jan 22 06:47:20 2019
+++ src/sys/dev/usb/uark.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uark.c,v 1.12 2019/01/22 06:47:20 skrll Exp $ */
+/* $NetBSD: uark.c,v 1.13 2019/05/04 08:04:13 mrg Exp $ */
/* $OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.12 2019/01/22 06:47:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.13 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -88,11 +88,6 @@ struct ucom_methods uark_methods = {
.ucom_get_status = uark_get_status,
.ucom_set = uark_set,
.ucom_param = uark_param,
- .ucom_ioctl = NULL,
- .ucom_open = NULL,
- .ucom_close = NULL,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
static const struct usb_devno uark_devs[] = {
@@ -325,10 +320,8 @@ uark_get_status(void *vsc, int portno, u
{
struct uark_softc *sc = vsc;
- if (msr != NULL)
- *msr = sc->sc_msr;
- if (lsr != NULL)
- *lsr = sc->sc_lsr;
+ *msr = sc->sc_msr;
+ *lsr = sc->sc_lsr;
}
void
Index: src/sys/dev/usb/ubsa_common.c
diff -u src/sys/dev/usb/ubsa_common.c:1.10 src/sys/dev/usb/ubsa_common.c:1.11
--- src/sys/dev/usb/ubsa_common.c:1.10 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/ubsa_common.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsa_common.c,v 1.10 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: ubsa_common.c,v 1.11 2019/05/04 08:04:13 mrg Exp $ */
/*-
* Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
* All rights reserved.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa_common.c,v 1.10 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa_common.c,v 1.11 2019/05/04 08:04:13 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -436,9 +436,7 @@ ubsa_get_status(void *addr, int portno,
DPRINTF(("ubsa_get_status\n"));
- if (lsr != NULL)
- *lsr = sc->sc_lsr;
- if (msr != NULL)
- *msr = sc->sc_msr;
+ *lsr = sc->sc_lsr;
+ *msr = sc->sc_msr;
}
Index: src/sys/dev/usb/uchcom.c
diff -u src/sys/dev/usb/uchcom.c:1.29 src/sys/dev/usb/uchcom.c:1.30
--- src/sys/dev/usb/uchcom.c:1.29 Sat Apr 27 01:23:26 2019
+++ src/sys/dev/usb/uchcom.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uchcom.c,v 1.29 2019/04/27 01:23:26 mrg Exp $ */
+/* $NetBSD: uchcom.c,v 1.30 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.29 2019/04/27 01:23:26 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uchcom.c,v 1.30 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -192,11 +192,8 @@ struct ucom_methods uchcom_methods = {
.ucom_get_status = uchcom_get_status,
.ucom_set = uchcom_set,
.ucom_param = uchcom_param,
- .ucom_ioctl = NULL,
.ucom_open = uchcom_open,
.ucom_close = uchcom_close,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
int uchcom_match(device_t, cfdata_t, void *);
Index: src/sys/dev/usb/ucomvar.h
diff -u src/sys/dev/usb/ucomvar.h:1.21 src/sys/dev/usb/ucomvar.h:1.22
--- src/sys/dev/usb/ucomvar.h:1.21 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/ucomvar.h Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ucomvar.h,v 1.21 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: ucomvar.h,v 1.22 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -36,18 +36,51 @@
struct ucom_softc;
+/*
+ * The first argument to the ucom callbacks is the passed in ucaa_arg
+ * member of the attach args, typically the parent softc pointer.
+ *
+ * All of these are optional.
+ */
struct ucom_methods {
+ /*
+ * arg2: port number
+ * arg3: pointer to lsr (always non NULL)
+ * arg4: pointer to msr (always non NULL)
+ */
void (*ucom_get_status)(void *, int, u_char *, u_char *);
+ /*
+ * arg2: port number
+ * arg3: value to turn on or off (DTR, RTS, BREAK)
+ * arg4: onoff
+ */
void (*ucom_set)(void *, int, int, int);
#define UCOM_SET_DTR 1
#define UCOM_SET_RTS 2
#define UCOM_SET_BREAK 3
+ /*
+ * arg2: port number
+ * arg3: termios structure to set parameters from
+ */
int (*ucom_param)(void *, int, struct termios *);
+ /*
+ * arg2: port number
+ * arg3: ioctl command
+ * arg4: ioctl data
+ * arg5: ioctl flags
+ * arg6: process calling ioctl
+ */
int (*ucom_ioctl)(void *, int, u_long, void *, int, proc_t *);
+ /* arg2: port number */
int (*ucom_open)(void *, int);
+ /* arg2: port number */
void (*ucom_close)(void *, int);
/*
- * Note: The 'ptr' (2nd arg) and 'count' (3rd arg) pointers can be
+ * arg2: port number
+ * arg3: pointer to buffer pointer
+ * arg4: pointer to buffer count
+ *
+ * Note: The 'ptr' (3nd arg) and 'count' (4rd arg) pointers can be
* adjusted as follows:
*
* ptr: If consuming characters from the start of the buffer,
@@ -60,6 +93,12 @@ struct ucom_methods {
* If consuming all characters, set '*count' to zero.
*/
void (*ucom_read)(void *, int, u_char **, uint32_t *);
+ /*
+ * arg2: port number
+ * arg3: pointer to source buffer
+ * arg4: pointer to destination buffer
+ * arg5: pointer to buffer count
+ */
void (*ucom_write)(void *, int, u_char *, u_char *, uint32_t *);
};
Index: src/sys/dev/usb/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.67 src/sys/dev/usb/uftdi.c:1.68
--- src/sys/dev/usb/uftdi.c:1.67 Tue Feb 20 15:48:37 2018
+++ src/sys/dev/usb/uftdi.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.67 2018/02/20 15:48:37 ws Exp $ */
+/* $NetBSD: uftdi.c,v 1.68 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.67 2018/02/20 15:48:37 ws Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uftdi.c,v 1.68 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -104,15 +104,13 @@ Static void uftdi_set(void *, int, int,
Static int uftdi_param(void *, int, struct termios *);
Static int uftdi_open(void *, int);
Static void uftdi_read(void *, int, u_char **, uint32_t *);
-Static void uftdi_write(void *, int, u_char *, u_char *,
- uint32_t *);
+Static void uftdi_write(void *, int, u_char *, u_char *, uint32_t *);
Static void uftdi_break(void *, int, int);
struct ucom_methods uftdi_methods = {
.ucom_get_status = uftdi_get_status,
.ucom_set = uftdi_set,
.ucom_param = uftdi_param,
- .ucom_ioctl = NULL,
.ucom_open = uftdi_open,
.ucom_close = NULL,
.ucom_read = uftdi_read,
@@ -621,10 +619,8 @@ uftdi_get_status(void *vsc, int portno,
DPRINTF(("uftdi_status: msr=0x%02x lsr=0x%02x\n",
sc->sc_msr, sc->sc_lsr));
- if (msr != NULL)
- *msr = sc->sc_msr;
- if (lsr != NULL)
- *lsr = sc->sc_lsr;
+ *msr = sc->sc_msr;
+ *lsr = sc->sc_lsr;
}
void
Index: src/sys/dev/usb/ugensa.c
diff -u src/sys/dev/usb/ugensa.c:1.36 src/sys/dev/usb/ugensa.c:1.37
--- src/sys/dev/usb/ugensa.c:1.36 Tue Jul 24 08:15:57 2018
+++ src/sys/dev/usb/ugensa.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ugensa.c,v 1.36 2018/07/24 08:15:57 msaitoh Exp $ */
+/* $NetBSD: ugensa.c,v 1.37 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 2004, 2005 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.36 2018/07/24 08:15:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugensa.c,v 1.37 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -73,13 +73,6 @@ struct ugensa_softc {
struct ucom_methods ugensa_methods = {
.ucom_get_status = NULL,
- .ucom_set = NULL,
- .ucom_param = NULL,
- .ucom_ioctl = NULL,
- .ucom_open = NULL,
- .ucom_close = NULL,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
#define UGENSA_CONFIG_INDEX 0
Index: src/sys/dev/usb/umct.c
diff -u src/sys/dev/usb/umct.c:1.36 src/sys/dev/usb/umct.c:1.37
--- src/sys/dev/usb/umct.c:1.36 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/umct.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umct.c,v 1.36 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: umct.c,v 1.37 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.36 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umct.c,v 1.37 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -131,11 +131,8 @@ struct ucom_methods umct_methods = {
.ucom_get_status = umct_get_status,
.ucom_set = umct_set,
.ucom_param = umct_param,
- .ucom_ioctl = NULL,
.ucom_open = umct_open,
.ucom_close = umct_close,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
static const struct usb_devno umct_devs[] = {
@@ -633,8 +630,6 @@ umct_get_status(void *addr, int portno,
DPRINTF(("umct_get_status:\n"));
- if (lsr != NULL)
- *lsr = sc->sc_lsr;
- if (msr != NULL)
- *msr = sc->sc_msr;
+ *lsr = sc->sc_lsr;
+ *msr = sc->sc_msr;
}
Index: src/sys/dev/usb/uhmodem.c
diff -u src/sys/dev/usb/uhmodem.c:1.15 src/sys/dev/usb/uhmodem.c:1.16
--- src/sys/dev/usb/uhmodem.c:1.15 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uhmodem.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uhmodem.c,v 1.15 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: uhmodem.c,v 1.16 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 2008 Yojiro UO <y...@nui.org>.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.15 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhmodem.c,v 1.16 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -142,11 +142,8 @@ struct ucom_methods uhmodem_methods = {
.ucom_get_status = ubsa_get_status,
.ucom_set = ubsa_set,
.ucom_param = ubsa_param,
- .ucom_ioctl = NULL,
.ucom_open = uhmodem_open,
.ucom_close = ubsa_close,
- .ucom_read = NULL,
- .ucom_write = NULL
};
struct uhmodem_type {
Index: src/sys/dev/usb/uipaq.c
diff -u src/sys/dev/usb/uipaq.c:1.22 src/sys/dev/usb/uipaq.c:1.23
--- src/sys/dev/usb/uipaq.c:1.22 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uipaq.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.22 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: uipaq.c,v 1.23 2019/05/04 08:04:13 mrg Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.22 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.23 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -105,14 +105,7 @@ Static void uipaq_break(struct uipaq_sof
struct ucom_methods uipaq_methods = {
- .ucom_get_status = NULL,
.ucom_set = uipaq_set,
- .ucom_param = NULL,
- .ucom_ioctl = NULL,
- .ucom_open = NULL,
- .ucom_close = NULL,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
struct uipaq_type {
Index: src/sys/dev/usb/ukyopon.c
diff -u src/sys/dev/usb/ukyopon.c:1.20 src/sys/dev/usb/ukyopon.c:1.21
--- src/sys/dev/usb/ukyopon.c:1.20 Tue Jan 22 06:47:20 2019
+++ src/sys/dev/usb/ukyopon.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ukyopon.c,v 1.20 2019/01/22 06:47:20 skrll Exp $ */
+/* $NetBSD: ukyopon.c,v 1.21 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 1998, 2005 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.20 2019/01/22 06:47:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukyopon.c,v 1.21 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -96,8 +96,6 @@ Static struct ucom_methods ukyopon_metho
.ucom_ioctl = ukyopon_ioctl,
.ucom_open = umodem_open,
.ucom_close = umodem_close,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
int ukyopon_match(device_t, cfdata_t, void *);
Index: src/sys/dev/usb/umodem.c
diff -u src/sys/dev/usb/umodem.c:1.69 src/sys/dev/usb/umodem.c:1.70
--- src/sys/dev/usb/umodem.c:1.69 Thu Jul 7 06:55:42 2016
+++ src/sys/dev/usb/umodem.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem.c,v 1.69 2016/07/07 06:55:42 msaitoh Exp $ */
+/* $NetBSD: umodem.c,v 1.70 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.69 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem.c,v 1.70 2019/05/04 08:04:13 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -77,8 +77,6 @@ Static struct ucom_methods umodem_method
.ucom_ioctl = umodem_ioctl,
.ucom_open = umodem_open,
.ucom_close = umodem_close,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
int umodem_match(device_t, cfdata_t, void *);
Index: src/sys/dev/usb/umodem_common.c
diff -u src/sys/dev/usb/umodem_common.c:1.27 src/sys/dev/usb/umodem_common.c:1.28
--- src/sys/dev/usb/umodem_common.c:1.27 Sat Apr 20 05:53:18 2019
+++ src/sys/dev/usb/umodem_common.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: umodem_common.c,v 1.27 2019/04/20 05:53:18 mrg Exp $ */
+/* $NetBSD: umodem_common.c,v 1.28 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.27 2019/04/20 05:53:18 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umodem_common.c,v 1.28 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -454,10 +454,8 @@ umodem_get_status(void *addr, int portno
DPRINTF(("umodem_get_status:\n"));
- if (lsr != NULL)
- *lsr = sc->sc_lsr;
- if (msr != NULL)
- *msr = sc->sc_msr;
+ *lsr = sc->sc_lsr;
+ *msr = sc->sc_msr;
}
int
Index: src/sys/dev/usb/uplcom.c
diff -u src/sys/dev/usb/uplcom.c:1.80 src/sys/dev/usb/uplcom.c:1.81
--- src/sys/dev/usb/uplcom.c:1.80 Sun Dec 4 10:12:35 2016
+++ src/sys/dev/usb/uplcom.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uplcom.c,v 1.80 2016/12/04 10:12:35 skrll Exp $ */
+/* $NetBSD: uplcom.c,v 1.81 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.80 2016/12/04 10:12:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uplcom.c,v 1.81 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -146,8 +146,6 @@ struct ucom_methods uplcom_methods = {
.ucom_ioctl = NULL, /* TODO */
.ucom_open = uplcom_open,
.ucom_close = uplcom_close,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
static const struct usb_devno uplcom_devs[] = {
@@ -883,10 +881,8 @@ uplcom_get_status(void *addr, int portno
DPRINTF(("uplcom_get_status:\n"));
- if (lsr != NULL)
- *lsr = sc->sc_lsr;
- if (msr != NULL)
- *msr = sc->sc_msr;
+ *lsr = sc->sc_lsr;
+ *msr = sc->sc_msr;
}
#if TODO
Index: src/sys/dev/usb/uslsa.c
diff -u src/sys/dev/usb/uslsa.c:1.26 src/sys/dev/usb/uslsa.c:1.27
--- src/sys/dev/usb/uslsa.c:1.26 Tue Jan 22 06:47:20 2019
+++ src/sys/dev/usb/uslsa.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uslsa.c,v 1.26 2019/01/22 06:47:20 skrll Exp $ */
+/* $NetBSD: uslsa.c,v 1.27 2019/05/04 08:04:13 mrg Exp $ */
/* from ugensa.c */
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.26 2019/01/22 06:47:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uslsa.c,v 1.27 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -118,8 +118,6 @@ static const struct ucom_methods uslsa_m
.ucom_ioctl = uslsa_ioctl,
.ucom_open = uslsa_open,
.ucom_close = uslsa_close,
- .ucom_read = NULL,
- .ucom_write = NULL,
};
#define USLSA_CONFIG_INDEX 0
@@ -334,17 +332,12 @@ uslsa_get_status(void *vsc, int portno,
DPRINTF((sc->sc_dev, "%s: GET_MDMSTS %#x\n", __func__, mdmsts));
- if (lsr != NULL) {
- *lsr = 0;
- }
+ *lsr = 0;
- if (msr != NULL) {
- *msr = 0;
- *msr |= ISSET(mdmsts, SLSA_MDMSTS_CTS) ? UMSR_CTS : 0;
- *msr |= ISSET(mdmsts, SLSA_MDMSTS_DSR) ? UMSR_DSR : 0;
- *msr |= ISSET(mdmsts, SLSA_MDMSTS_RI) ? UMSR_RI : 0;
- *msr |= ISSET(mdmsts, SLSA_MDMSTS_DCD) ? UMSR_DCD : 0;
- }
+ *msr = ISSET(mdmsts, SLSA_MDMSTS_CTS) ? UMSR_CTS : 0;
+ *msr |= ISSET(mdmsts, SLSA_MDMSTS_DSR) ? UMSR_DSR : 0;
+ *msr |= ISSET(mdmsts, SLSA_MDMSTS_RI) ? UMSR_RI : 0;
+ *msr |= ISSET(mdmsts, SLSA_MDMSTS_DCD) ? UMSR_DCD : 0;
}
static void
Index: src/sys/dev/usb/uvisor.c
diff -u src/sys/dev/usb/uvisor.c:1.48 src/sys/dev/usb/uvisor.c:1.49
--- src/sys/dev/usb/uvisor.c:1.48 Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uvisor.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvisor.c,v 1.48 2016/11/25 12:56:29 skrll Exp $ */
+/* $NetBSD: uvisor.c,v 1.49 2019/05/04 08:04:13 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.48 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvisor.c,v 1.49 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -153,14 +153,7 @@ Static void uvisor_close(void *, int);
struct ucom_methods uvisor_methods = {
- .ucom_param = NULL,
- .ucom_ioctl = NULL,
- .ucom_open = NULL,
.ucom_close = uvisor_close,
- .ucom_read = NULL,
- .ucom_write = NULL,
- .ucom_get_status = NULL,
- .ucom_set = NULL,
};
struct uvisor_type {
Index: src/sys/dev/usb/uvscom.c
diff -u src/sys/dev/usb/uvscom.c:1.32 src/sys/dev/usb/uvscom.c:1.33
--- src/sys/dev/usb/uvscom.c:1.32 Thu Feb 7 12:41:03 2019
+++ src/sys/dev/usb/uvscom.c Sat May 4 08:04:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvscom.c,v 1.32 2019/02/07 12:41:03 skrll Exp $ */
+/* $NetBSD: uvscom.c,v 1.33 2019/05/04 08:04:13 mrg Exp $ */
/*-
* Copyright (c) 2001-2002, Shunsuke Akiyama <akiy...@jp.freebsd.org>.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.32 2019/02/07 12:41:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvscom.c,v 1.33 2019/05/04 08:04:13 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -195,8 +195,6 @@ struct ucom_methods uvscom_methods = {
.ucom_ioctl = NULL, /* TODO */
.ucom_open = uvscom_open,
.ucom_close = uvscom_close,
- .ucom_read = NULL,
- .ucom_write = NULL
};
static const struct usb_devno uvscom_devs [] = {
@@ -859,9 +857,7 @@ uvscom_get_status(void *addr, int portno
{
struct uvscom_softc *sc = addr;
- if (lsr != NULL)
- *lsr = sc->sc_lsr;
- if (msr != NULL)
- *msr = sc->sc_msr;
+ *lsr = sc->sc_lsr;
+ *msr = sc->sc_msr;
}
