svn commit: r334197 - in head/sys: contrib/dev/ath/ath_hal/ar9300 dev/ath/ath_hal dev/ath/ath_hal/ar5416

[Adrian Chadd]

Author: adrian
Date: Fri May 25 01:27:39 2018
New Revision: 334197
URL: https://svnweb.freebsd.org/changeset/base/334197

Log:
  [ath_hal] migrate the shared HAL_RESET_* pieces out into ath_hal.
  
  I'm in the process of reworking how the reset path works with an eye
  to better recovery when the chips hang and/or go RF/PHY deaf.
  This is the first step in a lot of unification and API changes.

Modified:
  head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
  head/sys/dev/ath/ath_hal/ah.h
  head/sys/dev/ath/ath_hal/ar5416/ar5416.h

Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
==============================================================================
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h	Fri May 25 00:00:00 2018	(r334196)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h	Fri May 25 01:27:39 2018	(r334197)
@@ -100,12 +100,6 @@ enum GAIN_PARAMS_2133 {
     GP_PWD_130,
 };
 
-enum {
-    HAL_RESET_POWER_ON,
-    HAL_RESET_WARM,
-    HAL_RESET_COLD,
-};
-
 typedef struct _gain_opt_step {
     int16_t paramVal[NUM_CORNER_FIX_BITS_2133];
     int32_t stepGain;

Modified: head/sys/dev/ath/ath_hal/ah.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah.h	Fri May 25 00:00:00 2018	(r334196)
+++ head/sys/dev/ath/ath_hal/ah.h	Fri May 25 01:27:39 2018	(r334197)
@@ -763,6 +763,12 @@ typedef enum {
 	HAL_RESET_FORCE_COLD	= 2,		/* Force full reset */
 } HAL_RESET_TYPE;
 
+enum {
+	HAL_RESET_POWER_ON,
+	HAL_RESET_WARM,
+	HAL_RESET_COLD
+};
+
 typedef struct {
 	uint8_t		kv_type;		/* one of HAL_CIPHER */
 	uint8_t		kv_apsd;		/* Mask for APSD enabled ACs */

Modified: head/sys/dev/ath/ath_hal/ar5416/ar5416.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ar5416/ar5416.h	Fri May 25 00:00:00 2018	(r334196)
+++ head/sys/dev/ath/ath_hal/ar5416/ar5416.h	Fri May 25 01:27:39 2018	(r334197)
@@ -27,12 +27,6 @@
 
 #define	AR5416_MAGIC	0x20065416
 
-enum {
-	HAL_RESET_POWER_ON,
-	HAL_RESET_WARM,
-	HAL_RESET_COLD,
-};
-
 typedef struct {
 	uint16_t	synth_center;
 	uint16_t	ctl_center;