Author: adrian
Date: Thu May 19 04:11:49 2016
New Revision: 300185
URL: https://svnweb.freebsd.org/changeset/base/300185
Log:
[siba] use consistent naming.
Modified:
head/sys/dev/siba/siba_core.c
head/sys/dev/siba/sibareg.h
Modified: head/sys/dev/siba/siba_core.c
==============================================================================
--- head/sys/dev/siba/siba_core.c Thu May 19 04:11:00 2016
(r300184)
+++ head/sys/dev/siba/siba_core.c Thu May 19 04:11:49 2016
(r300185)
@@ -1827,26 +1827,26 @@ siba_sprom_r8(struct siba_sprom *out, co
/* FEM */
SIBA_SHIFTOUT(fem.ghz2.tssipos, SIBA_SPROM8_FEM2G,
- SSB_SROM8_FEM_TSSIPOS);
+ SIBA_SROM8_FEM_TSSIPOS);
SIBA_SHIFTOUT(fem.ghz2.extpa_gain, SIBA_SPROM8_FEM2G,
- SSB_SROM8_FEM_EXTPA_GAIN);
+ SIBA_SROM8_FEM_EXTPA_GAIN);
SIBA_SHIFTOUT(fem.ghz2.pdet_range, SIBA_SPROM8_FEM2G,
- SSB_SROM8_FEM_PDET_RANGE);
+ SIBA_SROM8_FEM_PDET_RANGE);
SIBA_SHIFTOUT(fem.ghz2.tr_iso, SIBA_SPROM8_FEM2G,
- SSB_SROM8_FEM_TR_ISO);
+ SIBA_SROM8_FEM_TR_ISO);
SIBA_SHIFTOUT(fem.ghz2.antswlut, SIBA_SPROM8_FEM2G,
- SSB_SROM8_FEM_ANTSWLUT);
+ SIBA_SROM8_FEM_ANTSWLUT);
SIBA_SHIFTOUT(fem.ghz5.tssipos, SIBA_SPROM8_FEM5G,
- SSB_SROM8_FEM_TSSIPOS);
+ SIBA_SROM8_FEM_TSSIPOS);
SIBA_SHIFTOUT(fem.ghz5.extpa_gain, SIBA_SPROM8_FEM5G,
- SSB_SROM8_FEM_EXTPA_GAIN);
+ SIBA_SROM8_FEM_EXTPA_GAIN);
SIBA_SHIFTOUT(fem.ghz5.pdet_range, SIBA_SPROM8_FEM5G,
- SSB_SROM8_FEM_PDET_RANGE);
+ SIBA_SROM8_FEM_PDET_RANGE);
SIBA_SHIFTOUT(fem.ghz5.tr_iso, SIBA_SPROM8_FEM5G,
- SSB_SROM8_FEM_TR_ISO);
+ SIBA_SROM8_FEM_TR_ISO);
SIBA_SHIFTOUT(fem.ghz5.antswlut, SIBA_SPROM8_FEM5G,
- SSB_SROM8_FEM_ANTSWLUT);
+ SIBA_SROM8_FEM_ANTSWLUT);
/* Extract cores power info info */
for (i = 0; i < nitems(pwr_info_offset); i++) {
Modified: head/sys/dev/siba/sibareg.h
==============================================================================
--- head/sys/dev/siba/sibareg.h Thu May 19 04:11:00 2016 (r300184)
+++ head/sys/dev/siba/sibareg.h Thu May 19 04:11:49 2016 (r300185)
@@ -488,11 +488,11 @@
/* The FEM blocks share the same structure */
#define SIBA_SPROM8_FEM2G 0x10ae
#define SIBA_SPROM8_FEM5G 0x10b0
-#define SSB_SROM8_FEM_TSSIPOS 0x0001
-#define SSB_SROM8_FEM_EXTPA_GAIN 0x0006
-#define SSB_SROM8_FEM_PDET_RANGE 0x00F8
-#define SSB_SROM8_FEM_TR_ISO 0x0700
-#define SSB_SROM8_FEM_ANTSWLUT 0xF800
+#define SIBA_SROM8_FEM_TSSIPOS 0x0001
+#define SIBA_SROM8_FEM_EXTPA_GAIN 0x0006
+#define SIBA_SROM8_FEM_PDET_RANGE 0x00F8
+#define SIBA_SROM8_FEM_TR_ISO 0x0700
+#define SIBA_SROM8_FEM_ANTSWLUT 0xF800
#define SIBA_SPROM8_MAXP_BG 0x10c0
#define SIBA_SPROM8_MAXP_BG_MASK 0x00ff
@@ -520,10 +520,10 @@
#define SIBA_SPROM8_OFDM5GPO 0x1146
#define SIBA_SPROM8_OFDM5GLPO 0x114a
#define SIBA_SPROM8_OFDM5GHPO 0x114e
-#define SIBA_SPROM8_CDDPO 0x1192
-#define SIBA_SPROM8_STBCPO 0x1194
-#define SIBA_SPROM8_BW40PO 0x1196
-#define SIBA_SPROM8_BWDUPPO 0x1198
+#define SIBA_SPROM8_CDDPO 0x0192
+#define SIBA_SPROM8_STBCPO 0x0194
+#define SIBA_SPROM8_BW40PO 0x0196
+#define SIBA_SPROM8_BWDUPPO 0x0198
/* There are 4 blocks with power info sharing the same layout */
#define SIBA_SROM8_PWR_INFO_CORE0 0x10C0
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
