svn commit: r252238 - head/sys/contrib/dev/ath/ath_hal/ar9300

[Adrian Chadd]

Author: adrian
Date: Wed Jun 26 04:53:33 2013
New Revision: 252238
URL: http://svnweb.freebsd.org/changeset/base/252238

Log:
  If EEPROM data is provided by the AHB layer, copy it in.
  
  This is required for the flash layer code to correctly work.
  
  Tested:
  
  * AR9330 SoC (carambola 2)

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c	Wed Jun 26 04:46:43 2013	(r252237)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c	Wed Jun 26 04:53:33 2013	(r252238)
@@ -640,6 +640,12 @@ ar9300_attach(u_int16_t devid, HAL_SOFTC
     /* FreeBSD: to make OTP work for now, provide this.. */
     AH9300(ah)->ah_cal_mem = ath_hal_malloc(HOST_CALDATA_SIZE);
 
+    /*
+     * If eepromdata is not NULL, copy it it into ah_cal_mem.
+     */
+    if (eepromdata != NULL)
+        OS_MEMCPY(AH9300(ah)->ah_cal_mem, eepromdata, HOST_CALDATA_SIZE);
+
     /* XXX FreeBSD: enable RX mitigation */
     ah->ah_config.ath_hal_intr_mitigation_rx = 1;