svn commit: r330162 - stable/11/sys/dev/iwm

[Eitan Adler]

Author: eadler
Date: Thu Mar  1 05:09:08 2018
New Revision: 330162
URL: https://svnweb.freebsd.org/changeset/base/330162

Log:
  MFC r313308:
  
  [iwm] The HW Revision stepping constants should be in if_iwmreg.h.

Modified:
  stable/11/sys/dev/iwm/if_iwmreg.h
  stable/11/sys/dev/iwm/if_iwmvar.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/iwm/if_iwmreg.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwmreg.h	Thu Mar  1 05:08:27 2018	(r330161)
+++ stable/11/sys/dev/iwm/if_iwmreg.h	Thu Mar  1 05:09:08 2018	(r330162)
@@ -297,6 +297,16 @@
 #define IWM_CSR_HW_REV_DASH(_val)          (((_val) & 0x0000003) >> 0)
 #define IWM_CSR_HW_REV_STEP(_val)          (((_val) & 0x000000C) >> 2)
 
+/**
+ *  hw_rev values
+ */
+enum {
+	IWM_SILICON_A_STEP = 0,
+	IWM_SILICON_B_STEP,
+	IWM_SILICON_C_STEP,
+};
+
+
 #define IWM_CSR_HW_REV_TYPE_MSK		(0x000FFF0)
 #define IWM_CSR_HW_REV_TYPE_5300	(0x0000020)
 #define IWM_CSR_HW_REV_TYPE_5350	(0x0000030)

Modified: stable/11/sys/dev/iwm/if_iwmvar.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwmvar.h	Thu Mar  1 05:08:27 2018	(r330161)
+++ stable/11/sys/dev/iwm/if_iwmvar.h	Thu Mar  1 05:09:08 2018	(r330162)
@@ -431,10 +431,6 @@ struct iwm_softc {
 	int			ict_cur;
 
 	int			sc_hw_rev;
-#define IWM_SILICON_A_STEP	0
-#define IWM_SILICON_B_STEP	1
-#define IWM_SILICON_C_STEP	2
-#define IWM_SILICON_D_STEP	3
 	int			sc_hw_id;
 	int			sc_device_family;
 #define IWM_DEVICE_FAMILY_7000	1