PERFORCE change 184745 for review

[Hans Petter Selasky]

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

Change 184745 by hselasky at hselasky_laptop001 on 2010/10/14 22:30:29

	
	IFC

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/net/if_ipheth.c#5 integrate
.. //depot/projects/usb/src/sys/dev/usb/net/if_iphethvar.h#4 integrate

Differences ...

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

@@ -1,4 +1,3 @@
-/* $FreeBSD: src/sys/dev/net/if_ipheth.c $ */
 /*-
  * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
  * Copyright (c) 2009 Diego Giagio. All rights reserved.
@@ -31,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_ipheth.c $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/net/if_ipheth.c,v 1.1 2010/10/13 21:36:42 hselasky Exp $");
 
 #include <sys/stdint.h>
 #include <sys/stddef.h>
@@ -68,8 +67,6 @@
 static device_probe_t ipheth_probe;
 static device_attach_t ipheth_attach;
 static device_detach_t ipheth_detach;
-static device_suspend_t ipheth_suspend;
-static device_resume_t ipheth_resume;
 
 static usb_callback_t ipheth_bulk_write_callback;
 static usb_callback_t ipheth_bulk_read_callback;
@@ -119,8 +116,6 @@
 	DEVMETHOD(device_probe, ipheth_probe),
 	DEVMETHOD(device_attach, ipheth_attach),
 	DEVMETHOD(device_detach, ipheth_detach),
-	DEVMETHOD(device_suspend, ipheth_suspend),
-	DEVMETHOD(device_resume, ipheth_resume),
 
 	{0, 0}
 };
@@ -155,16 +150,16 @@
     USB_IFACE_PROTOCOL(pt)
 
 static const struct usb_device_id ipheth_devs[] = {
-	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE,
+	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
-	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3G,
+	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3G,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
-	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_3GS,
+	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_3GS,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
-	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_IPHONE_4G,
+	{IPHETH_ID(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_IPHONE_4,
 	    IPHETH_USBINTF_CLASS, IPHETH_USBINTF_SUBCLASS,
 	    IPHETH_USBINTF_PROTO)},
 };
@@ -271,20 +266,6 @@
 	return (0);
 }
 
-static int
-ipheth_suspend(device_t dev)
-{
-	device_printf(dev, "Suspending\n");
-	return (0);
-}
-
-static int
-ipheth_resume(device_t dev)
-{
-	device_printf(dev, "Resuming\n");
-	return (0);
-}
-
 static void
 ipheth_start(struct usb_ether *ue)
 {

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

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/net/if_iphethvar.h $ */
+/* $FreeBSD: src/sys/dev/usb/net/if_iphethvar.h,v 1.1 2010/10/13 21:36:42 hselasky Exp $ */
 /*-
  * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
  * Copyright (c) 2009 Diego Giagio. All rights reserved.
@@ -33,12 +33,6 @@
 #ifndef _IF_IPHETHVAR_H_
 #define	_IF_IPHETHVAR_H_
 
-#define	USB_VENDOR_APPLE        0x05ac
-#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
 #define	IPHETH_USBINTF_PROTO    1