From owner-svn-src-user@FreeBSD.ORG Sun Feb 1 07:11:33 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28756106576C; Sun, 1 Feb 2009 07:11:32 +0000 (UTC) (envelope-from thompsa@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 43A468FC12; Sun, 1 Feb 2009 07:11:32 +0000 (UTC) (envelope-from thompsa@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 n117BWRu046347; Sun, 1 Feb 2009 07:11:32 GMT (envelope-from thompsa@svn.freebsd.org) Received: (from thompsa@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n117BV1i046339; Sun, 1 Feb 2009 07:11:31 GMT (envelope-from thompsa@svn.freebsd.org) Message-Id: <200902010711.n117BV1i046339@svn.freebsd.org> From: Andrew Thompson Date: Sun, 1 Feb 2009 07:11:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187980 - user/thompsa/usb/sys/dev/usb2/ethernet X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Feb 2009 07:11:33 -0000 Author: thompsa Date: Sun Feb 1 07:11:31 2009 New Revision: 187980 URL: http://svn.freebsd.org/changeset/base/187980 Log: Change the names of the interrupt xfers to the same as the rest. Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_auereg.h user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_axereg.h user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_ruereg.h user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c user/thompsa/usb/sys/dev/usb2/ethernet/if_udavreg.h Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c Sun Feb 1 07:00:21 2009 (r187979) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_aue2.c Sun Feb 1 07:11:31 2009 (r187980) @@ -218,7 +218,7 @@ static const struct usb2_config aue_conf .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .mh.callback = aue_bulk_read_callback, }, - [AUE_INTR_DT_RD] = { + [AUE_INTR_RD] = { .type = UE_INTERRUPT, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, @@ -876,7 +876,7 @@ aue_start(struct usb2_ether *ue) /* * start the USB transfers, if not already started: */ - usb2_transfer_start(sc->sc_xfer[AUE_INTR_DT_RD]); + usb2_transfer_start(sc->sc_xfer[AUE_INTR_RD]); usb2_transfer_start(sc->sc_xfer[AUE_BULK_RD]); usb2_transfer_start(sc->sc_xfer[AUE_BULK_WR]); } @@ -989,7 +989,7 @@ aue_stop(struct usb2_ether *ue) */ usb2_transfer_stop(sc->sc_xfer[AUE_BULK_WR]); usb2_transfer_stop(sc->sc_xfer[AUE_BULK_RD]); - usb2_transfer_stop(sc->sc_xfer[AUE_INTR_DT_RD]); + usb2_transfer_stop(sc->sc_xfer[AUE_INTR_RD]); aue_csr_write_1(sc, AUE_CTL0, 0); aue_csr_write_1(sc, AUE_CTL1, 0); Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_auereg.h ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_auereg.h Sun Feb 1 07:00:21 2009 (r187979) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_auereg.h Sun Feb 1 07:11:31 2009 (r187980) @@ -63,7 +63,7 @@ enum { AUE_BULK_WR, AUE_BULK_RD, - AUE_INTR_DT_RD, + AUE_INTR_RD, AUE_N_TRANSFER = 3, }; Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c Sun Feb 1 07:00:21 2009 (r187979) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_axe2.c Sun Feb 1 07:11:31 2009 (r187980) @@ -193,7 +193,7 @@ static const struct usb2_config axe_conf .mh.callback = axe_bulk_read_callback, .mh.timeout = 0, /* no timeout */ }, - [AXE_INTR_DT_RD] = { + [AXE_INTR_RD] = { .type = UE_INTERRUPT, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, @@ -900,7 +900,7 @@ axe_start(struct usb2_ether *ue) /* * start the USB transfers, if not already started: */ - usb2_transfer_start(sc->sc_xfer[AXE_INTR_DT_RD]); + usb2_transfer_start(sc->sc_xfer[AXE_INTR_RD]); usb2_transfer_start(sc->sc_xfer[AXE_BULK_RD]); usb2_transfer_start(sc->sc_xfer[AXE_BULK_WR]); } @@ -997,7 +997,7 @@ axe_stop(struct usb2_ether *ue) */ usb2_transfer_stop(sc->sc_xfer[AXE_BULK_WR]); usb2_transfer_stop(sc->sc_xfer[AXE_BULK_RD]); - usb2_transfer_stop(sc->sc_xfer[AXE_INTR_DT_RD]); + usb2_transfer_stop(sc->sc_xfer[AXE_INTR_RD]); axe_reset(sc); } Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_axereg.h ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_axereg.h Sun Feb 1 07:00:21 2009 (r187979) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_axereg.h Sun Feb 1 07:11:31 2009 (r187980) @@ -172,7 +172,7 @@ struct axe_sframe_hdr { enum { AXE_BULK_WR, AXE_BULK_RD, - AXE_INTR_DT_RD, + AXE_INTR_RD, AXE_N_TRANSFER = 3, }; Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c Sun Feb 1 07:00:21 2009 (r187979) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_rue2.c Sun Feb 1 07:11:31 2009 (r187980) @@ -152,7 +152,7 @@ static const struct usb2_config rue_conf .mh.callback = rue_bulk_read_callback, .mh.timeout = 0, /* no timeout */ }, - [RUE_INTR_DT_RD] = { + [RUE_INTR_RD] = { .type = UE_INTERRUPT, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, @@ -784,7 +784,7 @@ rue_start(struct usb2_ether *ue) /* * start the USB transfers, if not already started: */ - usb2_transfer_start(sc->sc_xfer[RUE_INTR_DT_RD]); + usb2_transfer_start(sc->sc_xfer[RUE_INTR_RD]); usb2_transfer_start(sc->sc_xfer[RUE_BULK_RD]); usb2_transfer_start(sc->sc_xfer[RUE_BULK_WR]); } @@ -882,7 +882,7 @@ rue_stop(struct usb2_ether *ue) */ usb2_transfer_stop(sc->sc_xfer[RUE_BULK_WR]); usb2_transfer_stop(sc->sc_xfer[RUE_BULK_RD]); - usb2_transfer_stop(sc->sc_xfer[RUE_INTR_DT_RD]); + usb2_transfer_stop(sc->sc_xfer[RUE_INTR_RD]); rue_csr_write_1(sc, RUE_CR, 0x00); rue_reset(sc); Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_ruereg.h ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_ruereg.h Sun Feb 1 07:00:21 2009 (r187979) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_ruereg.h Sun Feb 1 07:11:31 2009 (r187980) @@ -165,7 +165,7 @@ struct rue_type { enum { RUE_BULK_WR, RUE_BULK_RD, - RUE_INTR_DT_RD, + RUE_INTR_RD, RUE_N_TRANSFER = 3, }; Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c Sun Feb 1 07:00:21 2009 (r187979) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_udav2.c Sun Feb 1 07:11:31 2009 (r187980) @@ -114,7 +114,7 @@ static const struct usb2_config udav_con .mh.callback = udav_bulk_read_callback, .mh.timeout = 0, /* no timeout */ }, - [UDAV_INTR_DT_RD] = { + [UDAV_INTR_RD] = { .type = UE_INTERRUPT, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, @@ -534,7 +534,7 @@ udav_start(struct usb2_ether *ue) /* * start the USB transfers, if not already started: */ - usb2_transfer_start(sc->sc_xfer[UDAV_INTR_DT_RD]); + usb2_transfer_start(sc->sc_xfer[UDAV_INTR_RD]); usb2_transfer_start(sc->sc_xfer[UDAV_BULK_RD]); usb2_transfer_start(sc->sc_xfer[UDAV_BULK_WR]); } @@ -703,7 +703,7 @@ udav_stop(struct usb2_ether *ue) */ usb2_transfer_stop(sc->sc_xfer[UDAV_BULK_WR]); usb2_transfer_stop(sc->sc_xfer[UDAV_BULK_RD]); - usb2_transfer_stop(sc->sc_xfer[UDAV_INTR_DT_RD]); + usb2_transfer_stop(sc->sc_xfer[UDAV_INTR_RD]); udav_reset(sc); } Modified: user/thompsa/usb/sys/dev/usb2/ethernet/if_udavreg.h ============================================================================== --- user/thompsa/usb/sys/dev/usb2/ethernet/if_udavreg.h Sun Feb 1 07:00:21 2009 (r187979) +++ user/thompsa/usb/sys/dev/usb2/ethernet/if_udavreg.h Sun Feb 1 07:11:31 2009 (r187980) @@ -144,7 +144,7 @@ struct udav_rxpkt { enum { UDAV_BULK_WR, UDAV_BULK_RD, - UDAV_INTR_DT_RD, + UDAV_INTR_RD, UDAV_N_TRANSFER = 3, };