From 45d317e32ab3b6bba82790bbc2831b337ad6c057 Mon Sep 17 00:00:00 2001
From: adrian <adrian@FreeBSD.org>
Date: Fri, 25 May 2018 01:27:39 +0000
Subject: [PATCH] [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.
---
 sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h | 6 ------
 sys/dev/ath/ath_hal/ah.h                    | 6 ++++++
 sys/dev/ath/ath_hal/ar5416/ar5416.h         | 6 ------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
index 313bbe586d77..00807ac430ee 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h
@@ -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;
diff --git a/sys/dev/ath/ath_hal/ah.h b/sys/dev/ath/ath_hal/ah.h
index 4d9ca773917e..b887e9f5afb4 100644
--- a/sys/dev/ath/ath_hal/ah.h
+++ b/sys/dev/ath/ath_hal/ah.h
@@ -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 */
diff --git a/sys/dev/ath/ath_hal/ar5416/ar5416.h b/sys/dev/ath/ath_hal/ar5416/ar5416.h
index 1fa96afe312d..d71d2f922919 100644
--- a/sys/dev/ath/ath_hal/ar5416/ar5416.h
+++ b/sys/dev/ath/ath_hal/ar5416/ar5416.h
@@ -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;