From owner-p4-projects@FreeBSD.ORG Fri May 29 16:56:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 814D71065676; Fri, 29 May 2009 16:56:43 +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 40ACA1065672 for ; Fri, 29 May 2009 16:56:43 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 06FA18FC1B for ; Fri, 29 May 2009 16:56:42 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4TGug4v076555 for ; Fri, 29 May 2009 16:56:42 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4TGugSt076553 for perforce@freebsd.org; Fri, 29 May 2009 16:56:42 GMT (envelope-from syl@FreeBSD.org) Date: Fri, 29 May 2009 16:56:42 GMT Message-Id: <200905291656.n4TGugSt076553@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163033 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 May 2009 16:56:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163033 Change 163033 by syl@syl_rincewind on 2009/05/29 16:55:50 Remove macros that are now in libusb10.h. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#2 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.h#2 (text+ko) ==== ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#2 (text+ko) ==== @@ -38,34 +38,6 @@ #include "libusb.h" #include "libusb10.h" -extern struct libusb_context *usbi_default_context; - -#define GET_CONTEXT(ctx) \ - if (ctx == NULL) ctx = usbi_default_context; - -#define USB_LIST_EMPTY(entry) \ - ((entry)->next = (entry)) -#define LIST_ENT(ptr, type, member) \ - ((type *)((char *)(ptr) - (unsigned long) (&((type*)0L)->member))) - -#define LIST_FOREACH_ENTRY(pos, head, member) \ - for (pos = LIST_ENT((head)->next, typeof(*pos), member) ; \ - &pos->member != head ; \ - pos = LIST_ENT(pos->member.next, typeof(*pos), member)) - -struct usb_pollfd { - struct libusb_pollfd pollfd; - struct list_head list; -}; - -struct usb_transfer { - int num_iso_packets; - struct list_head list; - struct timeval timeout; - int transferred; - uint8_t flags; -}; - static int get_next_timeout(libusb_context *ctx, struct timeval *tv, struct timeval *out) {