From owner-svn-src-all@FreeBSD.ORG  Fri Oct 24 21:52:50 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E6FD81065671;
	Fri, 24 Oct 2008 21:52:50 +0000 (UTC)
	(envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5F1B8FC12;
	Fri, 24 Oct 2008 21:52:50 +0000 (UTC)
	(envelope-from n_hibma@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9OLqoJx099945;
	Fri, 24 Oct 2008 21:52:50 GMT (envelope-from n_hibma@svn.freebsd.org)
Received: (from n_hibma@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9OLqoct099944;
	Fri, 24 Oct 2008 21:52:50 GMT (envelope-from n_hibma@svn.freebsd.org)
Message-Id: <200810242152.m9OLqoct099944@svn.freebsd.org>
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Fri, 24 Oct 2008 21:52:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r184234 - head/sys/dev/usb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Oct 2008 21:52:51 -0000

Author: n_hibma
Date: Fri Oct 24 21:52:50 2008
New Revision: 184234
URL: http://svn.freebsd.org/changeset/base/184234

Log:
  Make the driver compile on FBSD6 as well.
  Up the speed on the E220 ID as it is a part which is used in other
  devices that are capable of HSPA speeds.

Modified:
  head/sys/dev/usb/u3g.c

Modified: head/sys/dev/usb/u3g.c
==============================================================================
--- head/sys/dev/usb/u3g.c	Fri Oct 24 21:21:43 2008	(r184233)
+++ head/sys/dev/usb/u3g.c	Fri Oct 24 21:52:50 2008	(r184234)
@@ -46,7 +46,9 @@
 
 #include <dev/usb/ucomvar.h>
 
+#if __FreeBSD_version >= 800000
 #include "opt_u3g.h"
+#endif
 #include "usbdevs.h"
 
 //#define U3G_DEBUG
@@ -134,7 +136,7 @@ static const struct u3g_dev_type_s u3g_d
 	{{ USB_VENDOR_QUALCOMMINC, USB_PRODUCT_QUALCOMMINC_CDMA_MSM },	U3GSP_CDMA,	U3GFL_STUB_WAIT },
 	/* OEM: Huawei */
 	{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE },		U3GSP_HSDPA,	U3GFL_HUAWEI_INIT },
-	{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220 },		U3GSP_HSDPA,	U3GFL_HUAWEI_INIT },
+	{{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220 },		U3GSP_HSPA,	U3GFL_HUAWEI_INIT },
 	/* OEM: Novatel */
 	{{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_CDMA_MODEM },	U3GSP_CDMA,	U3GFL_STUB_WAIT },
 	{{ USB_VENDOR_NOVATEL, USB_PRODUCT_NOVATEL_ES620 },		U3GSP_UMTS,	U3GFL_STUB_WAIT },	// XXX
@@ -298,7 +300,9 @@ u3g_attach(device_t self)
 					 portno, i,
 					 ucom->sc_bulkin_no,
 					 ucom->sc_bulkout_no);
-#if __FreeBSD_version < 800000
+#if __FreeBSD_version < 700000
+				ucom_attach_tty(ucom, MINOR_CALLOUT, devnamefmt, portno);
+#elif __FreeBSD_version < 800000
 				ucom_attach_tty(ucom, TS_CALLOUT, devnamefmt, portno);
 #else
 				ucom_attach_tty(ucom, devnamefmt, portno);