From owner-p4-projects@FreeBSD.ORG  Wed Jun 11 07:35:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F2551065688; Wed, 11 Jun 2008 07:35:23 +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 00C65106567F
	for <perforce@FreeBSD.org>; Wed, 11 Jun 2008 07:35:23 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EE3468FC19
	for <perforce@FreeBSD.org>; Wed, 11 Jun 2008 07:35:22 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5B7ZMTi055897
	for <perforce@FreeBSD.org>; Wed, 11 Jun 2008 07:35:22 GMT
	(envelope-from weongyo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5B7ZM4p055895
	for perforce@freebsd.org; Wed, 11 Jun 2008 07:35:22 GMT
	(envelope-from weongyo@FreeBSD.org)
Date: Wed, 11 Jun 2008 07:35:22 GMT
Message-Id: <200806110735.m5B7ZM4p055895@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	weongyo@FreeBSD.org using -f
From: Weongyo Jeong <weongyo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 143279 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Wed, 11 Jun 2008 07:35:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=143279

Change 143279 by weongyo@weongyo_ws on 2008/06/11 07:35:08

	handle USBD_CANCELLED which is a value returned by USB framework.
	Without this we were always returned USBD_STATUS_NOT_SUPPORTED which
	is the incorrect return value.

Affected files ...

.. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#4 edit
.. //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#3 edit

Differences ...

==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#4 (text+ko) ====

@@ -245,6 +245,8 @@
 		return (STATUS_NO_MEMORY);
 	case USBD_STATUS_REQUEST_FAILED:
 		return (STATUS_NOT_SUPPORTED);
+	case USBD_STATUS_CANCELED:
+		return (STATUS_CANCELLED);
 	default:
 		break;
 	}
@@ -276,6 +278,8 @@
 	case USBD_TOO_DEEP:
 	case USBD_NO_POWER:
 		return (USBD_STATUS_DEVICE_GONE);
+	case USBD_CANCELLED:
+		return (USBD_STATUS_CANCELED);
 	default:
 		break;
 	}

==== //depot/projects/ndisusb/sys/compat/ndis/usbd_var.h#3 (text+ko) ====

@@ -50,6 +50,7 @@
 #define URB_FUNCTION_VENDOR_OTHER			0x0020
 
 #define USBD_STATUS_SUCCESS				0x00000000
+#define USBD_STATUS_CANCELED				0x00010000
 #define USBD_STATUS_PENDING				0x40000000
 #define USBD_STATUS_NO_MEMORY				0x80000100
 #define USBD_STATUS_REQUEST_FAILED			0x80000500