From owner-svn-src-head@FreeBSD.ORG  Fri Jan 21 06:42:25 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 950F9106566B;
	Fri, 21 Jan 2011 06:42:25 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8428E8FC15;
	Fri, 21 Jan 2011 06:42:25 +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 p0L6gPWQ041986;
	Fri, 21 Jan 2011 06:42:25 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0L6gPej041983;
	Fri, 21 Jan 2011 06:42:25 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201101210642.p0L6gPej041983@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 21 Jan 2011 06:42:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217685 - head/sys/dev/ath/ath_hal
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Jan 2011 06:42:25 -0000

Author: adrian
Date: Fri Jan 21 06:42:25 2011
New Revision: 217685
URL: http://svn.freebsd.org/changeset/base/217685

Log:
  Modify the v14/v4k eeprom diag interface to return the whole eeprom.
  
  The v1 and v3 interfaces returned the whole EEPROM but the v14/v4k
  interfaces just returned the base header. There's extra information
  outside of that which would also be nice to get access to.

Modified:
  head/sys/dev/ath/ath_hal/ah_eeprom_v14.c
  head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v14.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_v14.c	Fri Jan 21 05:21:00 2011	(r217684)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_v14.c	Fri Jan 21 06:42:25 2011	(r217685)
@@ -159,8 +159,8 @@ v14EepromDiag(struct ath_hal *ah, int re
 
 	switch (request) {
 	case HAL_DIAG_EEPROM:
-		*result = &ee->ee_base;
-		*resultsize = sizeof(ee->ee_base);
+		*result = ee;
+		*resultsize = sizeof(HAL_EEPROM_v14);
 		return AH_TRUE;
 	}
 	return AH_FALSE;

Modified: head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c	Fri Jan 21 05:21:00 2011	(r217684)
+++ head/sys/dev/ath/ath_hal/ah_eeprom_v4k.c	Fri Jan 21 06:42:25 2011	(r217685)
@@ -137,8 +137,8 @@ v4kEepromDiag(struct ath_hal *ah, int re
 
 	switch (request) {
 	case HAL_DIAG_EEPROM:
-		*result = &ee->ee_base;
-		*resultsize = sizeof(ee->ee_base);
+		*result = ee;
+		*resultsize = sizeof(HAL_EEPROM_v4k);
 		return AH_TRUE;
 	}
 	return AH_FALSE;