Whoops. I had missed one change to the manpage that's still needed:
the DESCRIPTION section also mentions the supported devices. This now
supports two models, but I don't think it makes sense to turn this
into a list of supported hardware just yet.
Index: umbg.4
===================================================================
RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v
retrieving revision 1.5
diff -u -p -r1.5 umbg.4
--- umbg.4 22 Mar 2019 12:04:25 -0000 1.5
+++ umbg.4 22 Mar 2019 14:47:14 -0000
@@ -25,8 +25,9 @@
.Sh DESCRIPTION
The
.Nm
-driver provides support for the Meinberg Funkuhren USB5131, a time signal
-station receiver for the German DCF77 station.
+driver provides support for the Meinberg Funkuhren USB5131 and the
+Meinberg Funkuhren DCF600USB, two time signal station receivers for
+the German DCF77 station.
.Nm
implements a timedelta sensor and the delta (in nanoseconds) between the
received time information and the local time can be accessed through the
On Fri, Mar 22, 2019 at 10:04:19AM +0100, Paul de Weerd wrote:
|
| Index: share/man/man4/umbg.4
| ===================================================================
| RCS file: /home/OpenBSD/cvs/src/share/man/man4/umbg.4,v
| retrieving revision 1.4
| diff -u -p -r1.4 umbg.4
| --- share/man/man4/umbg.4 16 Jul 2013 16:05:49 -0000 1.4
| +++ share/man/man4/umbg.4 20 Mar 2019 12:16:03 -0000
| @@ -19,7 +19,7 @@
| .Os
| .Sh NAME
| .Nm umbg
| -.Nd Meinberg Funkuhren USB5131 timedelta sensor
| +.Nd Meinberg Funkuhren USB5131 and DCF600USB timedelta sensors
| .Sh SYNOPSIS
| .Cd "umbg* at uhub?"
| .Sh DESCRIPTION
| Index: sys/dev/usb/umbg.c
| ===================================================================
| RCS file: /home/OpenBSD/cvs/src/sys/dev/usb/umbg.c,v
| retrieving revision 1.25
| diff -u -p -r1.25 umbg.c
| --- sys/dev/usb/umbg.c 30 Dec 2017 20:47:00 -0000 1.25
| +++ sys/dev/usb/umbg.c 22 Mar 2019 08:29:40 -0000
| @@ -156,8 +156,9 @@ umbg_match(struct device *parent, void *
| if (uaa->iface == NULL)
| return UMATCH_NONE;
|
| - return uaa->vendor == USB_VENDOR_MEINBERG &&
| - uaa->product == USB_PRODUCT_MEINBERG_USB5131 ?
| + return uaa->vendor == USB_VENDOR_MEINBERG && (
| + uaa->product == USB_PRODUCT_MEINBERG_USB5131 ||
| + uaa->product == USB_PRODUCT_MEINBERG_DCF600USB) ?
| UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
| }
|
| @@ -172,6 +173,7 @@ umbg_attach(struct device *parent, struc
| usb_endpoint_descriptor_t *ed;
| usbd_status err;
| int signal;
| + const char *desc;
| #ifdef UMBG_DEBUG
| char fw_id[MBG_ID_LEN];
| #endif
| @@ -182,7 +184,18 @@ umbg_attach(struct device *parent, struc
|
| sc->sc_timedelta.type = SENSOR_TIMEDELTA;
| sc->sc_timedelta.status = SENSOR_S_UNKNOWN;
| - strlcpy(sc->sc_timedelta.desc, "USB5131",
| +
| + switch (uaa->product) {
| + case USB_PRODUCT_MEINBERG_DCF600USB:
| + desc = "DCF600USB";
| + break;
| + case USB_PRODUCT_MEINBERG_USB5131:
| + desc = "USB5131";
| + break;
| + default:
| + desc = "Unspecified Radio clock";
| + }
| + strlcpy(sc->sc_timedelta.desc, desc,
| sizeof(sc->sc_timedelta.desc));
| sensor_attach(&sc->sc_sensordev, &sc->sc_timedelta);
|
|
| --
| >++++++++[<++++++++++>-]<+++++++.>+++[<------>-]<.>+++[<+
| +++++++++++>-]<.>++[<------------>-]<+.--------------.[-]
| http://www.weirdnet.nl/
|
--
>++++++++[<++++++++++>-]<+++++++.>+++[<------>-]<.>+++[<+
+++++++++++>-]<.>++[<------------>-]<+.--------------.[-]
http://www.weirdnet.nl/
