add support for the MCS7832 which is apparently a low pin count

version of the MCS7830 with no software visible changes besides
a new product id.

from brad

4 files changed, 16 insertions, 13 deletions

diff --git a/share/man/man4/mos.4 b/share/man/man4/mos.4
index 5e0ee3ac05f..fd917540653 100644
--- a/share/man/man4/mos.4
+++ b/share/man/man4/mos.4
@@ -29,14 +29,14 @@
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: /repoman/r/ncvs/src/share/man/man4/axe.4,v 1.3 2003/05/29 21:28:35 ru Exp $
-.\" $OpenBSD: mos.4,v 1.4 2010/09/19 12:18:16 jmc Exp $
+.\" $OpenBSD: mos.4,v 1.5 2012/02/28 08:58:30 jsg Exp $
 .\"
-.Dd $Mdocdate: September 19 2010 $
+.Dd $Mdocdate: February 28 2012 $
 .Dt MOS 4
 .Os
 .Sh NAME
 .Nm mos
-.Nd MOSCHIP MCS7730/7830 10/100 USB 2.0 Ethernet device
+.Nd MOSCHIP MCS7730/7830/7832 10/100 USB 2.0 Ethernet device
 .Sh SYNOPSIS
 .Cd "mos*   at uhub?"
 .Cd "ukphy* at mii?"
@@ -44,7 +44,7 @@
 The
 .Nm
 driver provides support for USB Ethernet adapters based on the Moschip
-MCS7730 and MCS7830 USB 2.0 chipsets, including the
+MCS7730, MCS7830 and MCS7832 USB 2.0 chipsets, including the
 following:
 .Pp
 .Bl -tag -width Ds -offset indent -compact
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index e52d8850b3a..9753a45ec2c 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: usb.4,v 1.127 2011/09/16 16:57:07 deraadt Exp $
+.\"	$OpenBSD: usb.4,v 1.128 2012/02/28 08:58:30 jsg Exp $
 .\"	$NetBSD: usb.4,v 1.15 1999/07/29 14:20:32 augustss Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: September 16 2011 $
+.Dd $Mdocdate: February 28 2012 $
 .Dt USB 4
 .Os
 .Sh NAME
@@ -130,7 +130,7 @@ CATC USB-EL1201A USB Ethernet device
 .It Xr kue 4
 Kawasaki LSI KL5KUSB101B USB Ethernet device
 .It Xr mos 4
-MOSCHIP MCS7730/7830 10/100 USB 2.0 Ethernet device
+MOSCHIP MCS7730/7830/7832 10/100 USB 2.0 Ethernet device
 .It Xr udav 4
 Davicom DM9601 10/100 USB Ethernet device
 .It Xr ueagle 4
diff --git a/sys/dev/usb/if_mos.c b/sys/dev/usb/if_mos.c
index 4489b4ab5d9..c96146f60e6 100644
--- a/sys/dev/usb/if_mos.c
+++ b/sys/dev/usb/if_mos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mos.c,v 1.15 2011/07/03 15:47:17 matthew Exp $	*/
+/*	$OpenBSD: if_mos.c,v 1.16 2012/02/28 08:58:30 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@@ -67,7 +67,7 @@
 #include <sys/cdefs.h>
 
 /*
- * Moschip MCS7730/MCS7830 USB to Ethernet controller 
+ * Moschip MCS7730/MCS7830/MCS7832 USB to Ethernet controller 
  * The datasheet is available at the following URL: 
  * http://www.moschip.com/data/products/MCS7830/Data%20Sheet_7830.pdf
  */
@@ -129,6 +129,7 @@ int     mosdebug = 0;
 const struct mos_type mos_devs[] = {
 	{ { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7730 }, MCS7730 },
 	{ { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7830 }, MCS7830 },
+	{ { USB_VENDOR_MOSCHIP, USB_PRODUCT_MOSCHIP_MCS7832 }, MCS7832 },
 	{ { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN030 }, MCS7830 },
 };
 #define mos_lookup(v, p) ((struct mos_type *)usb_lookup(mos_devs, v, p))
@@ -696,11 +697,12 @@ mos_attach(struct device *parent, struct device *self, void *aux)
 
 	printf("%s:", sc->mos_dev.dv_xname);
 
-	if (sc->mos_flags & MCS7730) {
+	if (sc->mos_flags & MCS7730)
 		printf(" MCS7730");
-	} else if (sc->mos_flags & MCS7830) {
+	else if (sc->mos_flags & MCS7830)
 		printf(" MCS7830");
-	}
+	else if (sc->mos_flags & MCS7832)
+		printf(" MCS7832");
 
 	mos_chip_init(sc);
 
diff --git a/sys/dev/usb/if_mosreg.h b/sys/dev/usb/if_mosreg.h
index 34b51161ac6..c1732ece7bc 100644
--- a/sys/dev/usb/if_mosreg.h
+++ b/sys/dev/usb/if_mosreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mosreg.h,v 1.4 2010/12/06 04:41:39 jakemsr Exp $	*/
+/*	$OpenBSD: if_mosreg.h,v 1.5 2012/02/28 08:58:30 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
@@ -140,6 +140,7 @@ struct mos_type {
 	u_int16_t		mos_flags;
 #define MCS7730	0x0001		/* MCS7730 */
 #define MCS7830	0x0002		/* MCS7830 */
+#define MCS7832	0x0004		/* MCS7832 */
 };
 
 #define MOS_INC(x, y)           (x) = (x + 1) % y