From owner-svn-src-user@FreeBSD.ORG Thu Oct 14 21:09:04 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 F2B0B106564A; Thu, 14 Oct 2010 21:09:04 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E191A8FC12; Thu, 14 Oct 2010 21:09:04 +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 o9EL946s037162; Thu, 14 Oct 2010 21:09:04 GMT (envelope-from weongyo@svn.freebsd.org) Received: (from weongyo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9EL94Xu037159; Thu, 14 Oct 2010 21:09:04 GMT (envelope-from weongyo@svn.freebsd.org) Message-Id: <201010142109.o9EL94Xu037159@svn.freebsd.org> From: Weongyo Jeong Date: Thu, 14 Oct 2010 21:09:04 +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: r213855 - user/weongyo/usb/sys/dev/usb 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: Thu, 14 Oct 2010 21:09:05 -0000 Author: weongyo Date: Thu Oct 14 21:09:04 2010 New Revision: 213855 URL: http://svn.freebsd.org/changeset/base/213855 Log: Moves two macros for userland parts. Modified: user/weongyo/usb/sys/dev/usb/usb_pf.c user/weongyo/usb/sys/dev/usb/usb_pf.h Modified: user/weongyo/usb/sys/dev/usb/usb_pf.c ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_pf.c Thu Oct 14 21:07:09 2010 (r213854) +++ user/weongyo/usb/sys/dev/usb/usb_pf.c Thu Oct 14 21:09:04 2010 (r213855) @@ -1449,13 +1449,6 @@ usbpf_buf_reclaimed(struct usbpf_d *ud) } } -/* - * Alignment macros. USBPF_WORDALIGN rounds up to the next - * even multiple of USBPF_ALIGNMENT. - */ -#define USBPF_ALIGNMENT sizeof(long) -#define USBPF_WORDALIGN(x) (((x)+(USBPF_ALIGNMENT-1))&~(USBPF_ALIGNMENT-1)) - #define SIZEOF_USBPF_HDR(type) \ (offsetof(type, uh_hdrlen) + sizeof(((type *)0)->uh_hdrlen)) Modified: user/weongyo/usb/sys/dev/usb/usb_pf.h ============================================================================== --- user/weongyo/usb/sys/dev/usb/usb_pf.h Thu Oct 14 21:07:09 2010 (r213854) +++ user/weongyo/usb/sys/dev/usb/usb_pf.h Thu Oct 14 21:09:04 2010 (r213855) @@ -52,6 +52,13 @@ typedef u_int64_t usbpf_u_int64; struct usbpf_if; /* + * Alignment macros. USBPF_WORDALIGN rounds up to the next + * even multiple of USBPF_ALIGNMENT. + */ +#define USBPF_ALIGNMENT sizeof(long) +#define USBPF_WORDALIGN(x) (((x)+(USBPF_ALIGNMENT-1))&~(USBPF_ALIGNMENT-1)) + +/* * The instruction encodings. */