From owner-p4-projects@FreeBSD.ORG  Thu Aug 19 22:32:14 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8F3BF10656A3; Thu, 19 Aug 2010 22:32:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 51F6D1065696
	for <perforce@FreeBSD.org>; Thu, 19 Aug 2010 22:32:14 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 3EFE28FC12
	for <perforce@FreeBSD.org>; Thu, 19 Aug 2010 22:32:14 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o7JMWE6N019012
	for <perforce@FreeBSD.org>; Thu, 19 Aug 2010 22:32:14 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o7JMWERv019009
	for perforce@freebsd.org; Thu, 19 Aug 2010 22:32:14 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 19 Aug 2010 22:32:14 GMT
Message-Id: <201008192232.o7JMWERv019009@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 182632 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Aug 2010 22:32:14 -0000

http://p4web.freebsd.org/@@182632?ac=10

Change 182632 by hselasky@hselasky_laptop001 on 2010/08/19 22:31:15

	USB network (iPhone Ethernet)
		- add missing init code
		- add 4G product ID

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#2 (text+ko) ====

@@ -164,6 +164,9 @@
 	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
+	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4G,
+	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
+	    IPHETH_USBINTF_PROTO)},
 };
 
 static int
@@ -340,7 +343,18 @@
 static void
 ipheth_init(struct usb_ether *ue)
 {
+	struct ipheth_softc *sc = uether_getsc(ue);
+	struct ifnet *ifp = uether_getifp(ue);
+
+	IPHETH_LOCK_ASSERT(sc, MA_OWNED);
 
+	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+
+	/* stall data write direction, which depends on USB mode */
+	usbd_xfer_set_stall(sc->sc_xfer[IPHETH_BULK_TX]);
+
+	/* start data transfers */
+	ipheth_start(ue);
 }
 
 static void

==== //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#2 (text+ko) ====

@@ -37,6 +37,7 @@
 #define	USB_PRODUCT_IPHONE      0x1290
 #define	USB_PRODUCT_IPHONE_3G   0x1292
 #define	USB_PRODUCT_IPHONE_3GS  0x1294
+#define	USB_PRODUCT_IPHONE_4G   0x1297
 
 #define	IPHETH_USBINTF_CLASS    255
 #define	IPHETH_USBINTF_SUBCLASS 253