From owner-p4-projects@FreeBSD.ORG Fri Mar 20 15:29:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D332C1065676; Fri, 20 Mar 2009 15:29:47 +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 9319E1065672 for ; Fri, 20 Mar 2009 15:29:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 669678FC0C for ; Fri, 20 Mar 2009 15:29:47 +0000 (UTC) (envelope-from hselasky@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 n2KFTluG093678 for ; Fri, 20 Mar 2009 15:29:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2KFTlaq093676 for perforce@freebsd.org; Fri, 20 Mar 2009 15:29:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 20 Mar 2009 15:29:47 GMT Message-Id: <200903201529.n2KFTlaq093676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 159519 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, 20 Mar 2009 15:29:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=159519 Change 159519 by hselasky@hselasky_laptop001 on 2009/03/20 15:29:06 USB core: Fix compilation without strings and busdma. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_bus.h#4 (text+ko) ==== @@ -75,9 +75,10 @@ device_t parent; device_t bdev; /* filled by HC driver */ +#if USB_HAVE_BUSDMA struct usb2_dma_parent_tag dma_parent_tag[1]; struct usb2_dma_tag dma_tags[USB_BUS_DMA_TAG_MAX]; - +#endif struct usb2_bus_methods *methods; /* filled by HC driver */ struct usb2_device **devices; ==== //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#4 (text+ko) ==== @@ -48,6 +48,7 @@ struct usb2_xfer_root; struct usb2_dma_parent_tag; +struct usb2_dma_tag; /* * The following typedef defines the USB DMA load done callback. @@ -115,11 +116,11 @@ /* * The following structure describes the parent USB DMA tag. */ +#if USB_HAVE_BUSDMA struct usb2_dma_parent_tag { -#if USB_HAVE_BUSDMA && defined(__FreeBSD__) +#if defined(__FreeBSD__) struct cv cv[1]; /* internal condition variable */ #endif -#if USB_HAVE_BUSDMA bus_dma_tag_t tag; /* always set */ struct mtx *mtx; /* private mutex, always set */ @@ -128,27 +129,31 @@ uint8_t dma_error; /* set if DMA load operation failed */ uint8_t dma_bits; /* number of DMA address lines */ uint8_t utag_max; /* number of USB DMA tags */ +}; +#else +struct usb2_dma_parent_tag {}; /* empty struct */ #endif -}; /* * The following structure describes an USB DMA tag. */ +#if USB_HAVE_BUSDMA struct usb2_dma_tag { -#if USB_HAVE_BUSDMA && defined(__NetBSD__) +#if defined(__NetBSD__) bus_dma_segment_t *p_seg; #endif -#if USB_HAVE_BUSDMA struct usb2_dma_parent_tag *tag_parent; bus_dma_tag_t tag; usb2_size_t align; usb2_size_t size; -#endif -#if USB_HAVE_BUSDMA && defined(__NetBSD__) +#if defined(__NetBSD__) usb2_size_t n_seg; #endif }; +#else +struct usb2_dma_tag {}; /* empty struct */ +#endif /* function prototypes */ ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#11 (text+ko) ==== @@ -2238,6 +2238,7 @@ static void usb2_notify_addq(const char *type, struct usb2_device *udev) { +#if USB_HAVE_STRINGS char *data = NULL; struct malloc_type *mt; @@ -2297,6 +2298,7 @@ device_get_nameunit(device_get_parent(udev->bus->bdev))); } devctl_queue_data(data); +#endif } #if USB_HAVE_UGEN