From owner-svn-src-user@FreeBSD.ORG Sat Jun 19 21:10:13 2010 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 DBBE71065673; Sat, 19 Jun 2010 21:10:13 +0000 (UTC) (envelope-from jmallett@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B1D618FC17; Sat, 19 Jun 2010 21:10:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o5JLADoH095955; Sat, 19 Jun 2010 21:10:13 GMT (envelope-from jmallett@svn.freebsd.org) Received: (from jmallett@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5JLADgR095952; Sat, 19 Jun 2010 21:10:13 GMT (envelope-from jmallett@svn.freebsd.org) Message-Id: <201006192110.o5JLADgR095952@svn.freebsd.org> From: Juli Mallett Date: Sat, 19 Jun 2010 21:10:13 +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: r209355 - user/jmallett/octeon/sys/contrib/octeon-sdk 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: Sat, 19 Jun 2010 21:10:13 -0000 Author: jmallett Date: Sat Jun 19 21:10:13 2010 New Revision: 209355 URL: http://svn.freebsd.org/changeset/base/209355 Log: o) Make compilable on FreeBSD. o) Add functions requested by hps@ to manage the toggle bit in the host driver. Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-usb.c user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-usb.h Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-usb.c ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-usb.c Sat Jun 19 20:34:37 2010 (r209354) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-usb.c Sat Jun 19 21:10:13 2010 (r209355) @@ -194,7 +194,7 @@ typedef struct /* This macro logs out when a function returns a value */ #define CVMX_USB_RETURN(v) \ do { \ - typeof(v) r = v; \ + __typeof(v) r = v; \ if (cvmx_unlikely(usb->init_flags & CVMX_USB_INITIALIZE_FLAGS_DEBUG_CALLS)) \ cvmx_dprintf("%*s%s: returned %s(%d)\n", 2*--usb->indent, "", __FUNCTION__, #v, r); \ return r; \ @@ -3648,3 +3648,20 @@ cvmx_usb_status_t cvmx_usb_device_disabl CVMX_USB_RETURN(CVMX_USB_SUCCESS); } +extern void cvmx_usb_set_toggle(cvmx_usb_state_t *state, int endpoint_num, int toggle) +{ + cvmx_usb_internal_state_t *usb = (cvmx_usb_internal_state_t*)state; + cvmx_usb_pipe_t *pipe = usb->pipe + endpoint_num; + + pipe->pid_toggle = !!toggle; +} + +extern int cvmx_usb_get_toggle(cvmx_usb_state_t *state, int endpoint_num) +{ + cvmx_usb_internal_state_t *usb = (cvmx_usb_internal_state_t*)state; + cvmx_usb_pipe_t *pipe = usb->pipe + endpoint_num; + + if (pipe->pid_toggle) + return (1); + return (0); +} Modified: user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-usb.h ============================================================================== --- user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-usb.h Sat Jun 19 20:34:37 2010 (r209354) +++ user/jmallett/octeon/sys/contrib/octeon-sdk/cvmx-usb.h Sat Jun 19 21:10:13 2010 (r209355) @@ -1122,6 +1122,13 @@ extern cvmx_usb_status_t cvmx_usb_device extern cvmx_usb_status_t cvmx_usb_device_disable_endpoint(cvmx_usb_state_t *state, int endpoint_num); +/* + * The FreeBSD host driver uses these functions to manipulate the toggle to deal + * more easily with endpoint management. + */ +extern void cvmx_usb_set_toggle(cvmx_usb_state_t *state, int endpoint_num, int toggle); +extern int cvmx_usb_get_toggle(cvmx_usb_state_t *state, int endpoint_num); + #ifdef __cplusplus } #endif