PERFORCE change 182632 for review

[Hans Petter Selasky]

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

Change 182632 by hselasky at 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