From owner-svn-src-head@FreeBSD.ORG Sat Nov 17 02:39:09 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 88B8B12D; Sat, 17 Nov 2012 02:39:09 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 6E1548FC12; Sat, 17 Nov 2012 02:39:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAH2d9DW007470; Sat, 17 Nov 2012 02:39:09 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAH2d94t007469; Sat, 17 Nov 2012 02:39:09 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201211170239.qAH2d94t007469@svn.freebsd.org> From: Adrian Chadd Date: Sat, 17 Nov 2012 02:39:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243173 - head/sys/dev/ath/ath_hal/ar5210 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Nov 2012 02:39:09 -0000 Author: adrian Date: Sat Nov 17 02:39:09 2012 New Revision: 243173 URL: http://svnweb.freebsd.org/changeset/base/243173 Log: * Remove ah_desc.h, it's not needed * Add some shifts that I'm using in userspace (athalq.) However, this exposes a fun little bug.. Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210desc.h Modified: head/sys/dev/ath/ath_hal/ar5210/ar5210desc.h ============================================================================== --- head/sys/dev/ath/ath_hal/ar5210/ar5210desc.h Sat Nov 17 02:38:36 2012 (r243172) +++ head/sys/dev/ath/ath_hal/ar5210/ar5210desc.h Sat Nov 17 02:39:09 2012 (r243173) @@ -19,8 +19,6 @@ #ifndef _DEV_ATH_AR5210DESC_H #define _DEV_ATH_AR5210DESC_H -#include "ah_desc.h" - /* * Defintions for the DMA descriptors used by the Atheros * AR5210/AR5211 and AR5110 Wireless Lan controller parts. @@ -57,6 +55,7 @@ struct ar5210_desc { #define AR_ClearDestMask 0x01000000 /* Clear destination mask bit */ #define AR_AntModeXmit 0x02000000 /* TX antenna seslection */ #define AR_FrmType 0x1c000000 /* frame type indication */ +#define AR_FrmType_S 26 #define AR_Frm_Normal 0x00000000 /* normal frame */ #define AR_Frm_ATIM 0x04000000 /* ATIM frame */ #define AR_Frm_PSPOLL 0x08000000 /* PS poll frame */ @@ -71,6 +70,7 @@ struct ar5210_desc { #define AR_EncryptKeyIdx 0x0007e000 /* ecnrypt key table index */ #define AR_EncryptKeyIdx_S 13 #define AR_RTSDuration 0xfff80000 /* lower 13bit of duration */ +#define AR_RTSDuration_S 19 /* RX ds_ctl1 */ /* AR_BufLen 0x00000fff data buffer length */