From owner-p4-projects@FreeBSD.ORG Fri Jan 18 19:22:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1FA916A468; Fri, 18 Jan 2008 19:22:50 +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 9F45716A418 for ; Fri, 18 Jan 2008 19:22:50 +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 7E6C313C442 for ; Fri, 18 Jan 2008 19:22:50 +0000 (UTC) (envelope-from hselasky@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 m0IJMoeg049201 for ; Fri, 18 Jan 2008 19:22:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m0IJMnmC049167 for perforce@freebsd.org; Fri, 18 Jan 2008 19:22:49 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 Jan 2008 19:22:49 GMT Message-Id: <200801181922.m0IJMnmC049167@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 133572 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, 18 Jan 2008 19:22:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=133572 Change 133572 by hselasky@hselasky_laptop001 on 2008/01/18 19:20:19 Compile fix for uchcom. It appears I had forgotten this file when running my scripts some time back. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#21 (text+ko) ==== @@ -239,7 +239,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, - .bufsize = UCHCOM_BULK_BUF_SIZE, + .mh.bufsize = UCHCOM_BULK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .mh.callback = &uchcom_write_callback, }, @@ -248,7 +248,7 @@ .type = UE_BULK, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, - .bufsize = UCHCOM_BULK_BUF_SIZE, + .mh.bufsize = UCHCOM_BULK_BUF_SIZE, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = &uchcom_read_callback, }, @@ -257,20 +257,20 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &uchcom_write_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [3] = { .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &uchcom_read_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, [4] = { @@ -278,7 +278,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, - .bufsize = 0, /* use wMaxPacketSize */ + .mh.bufsize = 0, /* use wMaxPacketSize */ .mh.callback = &uchcom_intr_callback, }, @@ -286,10 +286,10 @@ .type = UE_CONTROL, .endpoint = 0x00, /* Control pipe */ .direction = UE_DIR_ANY, - .bufsize = sizeof(usb_device_request_t), + .mh.bufsize = sizeof(usb_device_request_t), .mh.callback = &uchcom_intr_clear_stall_callback, .mh.timeout = 1000, /* 1 second */ - .interval = 50, /* 50ms */ + .mh.interval = 50, /* 50ms */ }, }; @@ -434,7 +434,7 @@ goto done; } err = usbd_do_request_flags(sc->sc_udev, &Giant, req, - data, USBD_SHORT_XFER_OK, &actlen, 1000); + data, USBD_ERR_SHORT_XFER_OK, &actlen, 1000); if (err) { DPRINTFN(-1, "device request failed, err=%s " @@ -914,7 +914,7 @@ break; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { sc->sc_flag |= UCHCOM_FLAG_INTR_STALL; usbd_transfer_start(sc->sc_xfer[5]); } @@ -961,7 +961,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { sc->sc_flag |= UCHCOM_FLAG_WRITE_STALL; usbd_transfer_start(sc->sc_xfer[2]); } @@ -1003,7 +1003,7 @@ return; default: /* Error */ - if (xfer->error != USBD_CANCELLED) { + if (xfer->error != USBD_ERR_CANCELLED) { sc->sc_flag |= UCHCOM_FLAG_READ_STALL; usbd_transfer_start(sc->sc_xfer[3]); }