From owner-svn-src-all@FreeBSD.ORG  Wed Aug  6 18:59:39 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E4086C1B
 for <svn-src-all@freebsd.org>; Wed,  6 Aug 2014 18:59:39 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BB4632646
 for <svn-src-all@freebsd.org>; Wed,  6 Aug 2014 18:59:39 +0000 (UTC)
Received: from adrian (uid 753) (envelope-from adrian@FreeBSD.org) id 58ee
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Wed, 06 Aug 2014 18:59:39 +0000
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 6 Aug 2014 18:59:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269638 - head/tools/tools/ath/athdecode
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e27b1b.58ee.439e7b54@svn.freebsd.org>
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Aug 2014 18:59:40 -0000

Author: adrian
Date: Wed Aug  6 18:59:39 2014
New Revision: 269638
URL: http://svnweb.freebsd.org/changeset/base/269638

Log:
  Fix athdecode to actually work.
  
  * Add AR9287 and AR9331 chipset support - it just uses the AR5416 support
    for now so some of the register mappings are wrong, but it works well
    enough.
  
  * don't call exit() from opmark().

Modified:
  head/tools/tools/ath/athdecode/main.c

Modified: head/tools/tools/ath/athdecode/main.c
==============================================================================
--- head/tools/tools/ath/athdecode/main.c	Wed Aug  6 18:15:33 2014	(r269637)
+++ head/tools/tools/ath/athdecode/main.c	Wed Aug  6 18:59:39 2014	(r269638)
@@ -192,7 +192,7 @@ opmark(FILE *fd, int i, const struct ath
 		fprintf(fd, "mark #%u value %u/0x%x", r->reg, r->val, r->val);
 		break;
 	}
-	exit(0);
+	return (NULL);
 }
 
 #include "ah_devid.h"
@@ -260,6 +260,9 @@ opdevice(const struct athregrec *r)
 	case AR9280_DEVID_PCI:
 	case AR9280_DEVID_PCIE:
 	case AR9285_DEVID_PCIE:
+	case AR9287_DEVID_PCI:
+	case AR9287_DEVID_PCIE:
+	case AR9300_DEVID_AR9330:
 		state.chipnum = 5416;
 		state.revs.ah_macVersion = 13;
 		state.revs.ah_macRev = 8;