Date: Mon, 27 Aug 2012 12:40:41 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r239725 - in stable/9: share/man/man4 sys/dev/usb sys/dev/usb/serial Message-ID: <201208271240.q7RCefJT097356@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Mon Aug 27 12:40:40 2012 New Revision: 239725 URL: http://svn.freebsd.org/changeset/base/239725 Log: Merge r238766, r238774 from head: Update the list of devices supported by uplcom. Although this only adds one device (support for Motorola cables), this syncronises us with: OpenBSD src/sys/dev/usb/uplcom.c 1.56 NetBSD src/sys/dev/usb/uplcom.c 1.73 Linux kernel.org HEAD Modified: stable/9/share/man/man4/uplcom.4 stable/9/sys/dev/usb/serial/uplcom.c stable/9/sys/dev/usb/usbdevs Directory Properties: stable/9/share/man/man4/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/share/man/man4/uplcom.4 ============================================================================== --- stable/9/share/man/man4/uplcom.4 Mon Aug 27 11:59:04 2012 (r239724) +++ stable/9/share/man/man4/uplcom.4 Mon Aug 27 12:40:40 2012 (r239725) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 11, 2011 +.Dd July 25, 2012 .Dt UPLCOM 4 .Os .Sh NAME @@ -116,6 +116,8 @@ Microsoft Palm 700WX .It Mobile Action MA-620 Infrared Adapter .It +Motorola Cables +.It Nokia CA-42 Cable .It OTI DKU-5 cable Modified: stable/9/sys/dev/usb/serial/uplcom.c ============================================================================== --- stable/9/sys/dev/usb/serial/uplcom.c Mon Aug 27 11:59:04 2012 (r239724) +++ stable/9/sys/dev/usb/serial/uplcom.c Mon Aug 27 12:40:40 2012 (r239725) @@ -279,6 +279,7 @@ static const STRUCT_USB_HOST_ID uplcom_d UPLCOM_DEV(PROLIFIC, DCU11), /* DCU-11 Phone Cable */ UPLCOM_DEV(PROLIFIC, HCR331), /* HCR331 Card Reader */ UPLCOM_DEV(PROLIFIC, MICROMAX_610U), /* Micromax 610U modem */ + UPLCOM_DEV(PROLIFIC, MOTOROLA), /* Motorola cable */ UPLCOM_DEV(PROLIFIC, PHAROS), /* Prolific Pharos */ UPLCOM_DEV(PROLIFIC, PL2303), /* Generic adapter */ UPLCOM_DEV(PROLIFIC, RSAQ2), /* I/O DATA USB-RSAQ2 */ Modified: stable/9/sys/dev/usb/usbdevs ============================================================================== --- stable/9/sys/dev/usb/usbdevs Mon Aug 27 11:59:04 2012 (r239724) +++ stable/9/sys/dev/usb/usbdevs Mon Aug 27 12:40:40 2012 (r239725) @@ -2646,6 +2646,7 @@ product PRIMAX HP_RH304AA 0x4d17 HP RH30 /* Prolific products */ product PROLIFIC PL2301 0x0000 PL2301 Host-Host interface product PROLIFIC PL2302 0x0001 PL2302 Host-Host interface +product PROLIFIC MOTOROLA 0x0307 Motorola Cable product PROLIFIC RSAQ2 0x04bb PL2303 Serial (IODATA USB-RSAQ2) product PROLIFIC ALLTRONIX_GPRS 0x0609 Alltronix ACM003U00 modem product PROLIFIC ALDIGA_AL11U 0x0611 AlDiga AL-11U modem
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208271240.q7RCefJT097356>