From owner-svn-src-all@freebsd.org Mon May 21 17:33:54 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08745EFA809; Mon, 21 May 2018 17:33:54 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ABE9168F3A; Mon, 21 May 2018 17:33:53 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8CD9827F9C; Mon, 21 May 2018 17:33:53 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4LHXriX099964; Mon, 21 May 2018 17:33:53 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4LHXrM1099962; Mon, 21 May 2018 17:33:53 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201805211733.w4LHXrM1099962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Mon, 21 May 2018 17:33:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r333989 - head/sys/dev/usb/template X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/dev/usb/template X-SVN-Commit-Revision: 333989 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 May 2018 17:33:54 -0000 Author: trasz Date: Mon May 21 17:33:52 2018 New Revision: 333989 URL: https://svnweb.freebsd.org/changeset/base/333989 Log: Add a somewhat ugly hack that makes OSX serial device node names human-readable. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/usb/template/usb_template_modem.c head/sys/dev/usb/template/usb_template_multi.c head/sys/dev/usb/template/usb_template_serialnet.c Modified: head/sys/dev/usb/template/usb_template_modem.c ============================================================================== --- head/sys/dev/usb/template/usb_template_modem.c Mon May 21 16:50:27 2018 (r333988) +++ head/sys/dev/usb/template/usb_template_modem.c Mon May 21 17:33:52 2018 (r333989) @@ -81,7 +81,13 @@ enum { #define MODEM_DEFAULT_INTERFACE "Virtual serial port" #define MODEM_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER #define MODEM_DEFAULT_PRODUCT "Virtual serial port" -#define MODEM_DEFAULT_SERIAL_NUMBER "March 2008" +/* + * The reason for this being called like this is that OSX + * derives the device node name from it, resulting in a somewhat + * user-friendly "/dev/cu.usbmodemFreeBSD1". And yes, the "1" + * needs to be there, otherwise OSX will mangle it. + */ +#define MODEM_DEFAULT_SERIAL_NUMBER "FreeBSD1" static struct usb_string_descriptor modem_interface; static struct usb_string_descriptor modem_manufacturer; Modified: head/sys/dev/usb/template/usb_template_multi.c ============================================================================== --- head/sys/dev/usb/template/usb_template_multi.c Mon May 21 16:50:27 2018 (r333988) +++ head/sys/dev/usb/template/usb_template_multi.c Mon May 21 17:33:52 2018 (r333989) @@ -99,7 +99,13 @@ enum { #define MULTI_DEFAULT_CONFIGURATION "Default configuration" #define MULTI_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER #define MULTI_DEFAULT_PRODUCT "Multifunction Device" -#define MULTI_DEFAULT_SERIAL_NUMBER "May 2018" +/* + * The reason for this being called like this is that OSX + * derives the device node name from it, resulting in a somewhat + * user-friendly "/dev/cu.usbmodemFreeBSD1". And yes, the "1" + * needs to be there, otherwise OSX will mangle it. + */ +#define MULTI_DEFAULT_SERIAL_NUMBER "FreeBSD1" static struct usb_string_descriptor multi_modem; static struct usb_string_descriptor multi_eth_mac; Modified: head/sys/dev/usb/template/usb_template_serialnet.c ============================================================================== --- head/sys/dev/usb/template/usb_template_serialnet.c Mon May 21 16:50:27 2018 (r333988) +++ head/sys/dev/usb/template/usb_template_serialnet.c Mon May 21 17:33:52 2018 (r333989) @@ -97,7 +97,13 @@ enum { #define SERIALNET_DEFAULT_CONFIGURATION "Default configuration" #define SERIALNET_DEFAULT_MANUFACTURER USB_TEMPLATE_MANUFACTURER #define SERIALNET_DEFAULT_PRODUCT "Serial/Ethernet device" -#define SERIALNET_DEFAULT_SERIAL_NUMBER "January 2015" +/* + * The reason for this being called like this is that OSX + * derives the device node name from it, resulting in a somewhat + * user-friendly "/dev/cu.usbmodemFreeBSD1". And yes, the "1" + * needs to be there, otherwise OSX will mangle it. + */ +#define SERIALNET_DEFAULT_SERIAL_NUMBER "FreeBSD1" static struct usb_string_descriptor serialnet_modem; static struct usb_string_descriptor serialnet_eth_mac;