Author: adrian
Date: Mon Feb 6 02:01:22 2017
New Revision: 313308
URL: https://svnweb.freebsd.org/changeset/base/313308
Log:
[iwm] The HW Revision stepping constants should be in if_iwmreg.h.
Obtained from: dragonflybsd 84292f0c38594c462c719c0e59da5908b93aba5f
Modified:
head/sys/dev/iwm/if_iwmreg.h
head/sys/dev/iwm/if_iwmvar.h
Modified: head/sys/dev/iwm/if_iwmreg.h
==============================================================================
--- head/sys/dev/iwm/if_iwmreg.h Mon Feb 6 01:57:59 2017
(r313307)
+++ head/sys/dev/iwm/if_iwmreg.h Mon Feb 6 02:01:22 2017
(r313308)
@@ -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: head/sys/dev/iwm/if_iwmvar.h
==============================================================================
--- head/sys/dev/iwm/if_iwmvar.h Mon Feb 6 01:57:59 2017
(r313307)
+++ head/sys/dev/iwm/if_iwmvar.h Mon Feb 6 02:01:22 2017
(r313308)
@@ -432,10 +432,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
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
