svn commit: r189712 - head/tools/tools/ath/common

[Sam Leffler]

Author: sam
Date: Thu Mar 12 00:03:55 2009
New Revision: 189712
URL: http://svn.freebsd.org/changeset/base/189712

Log:
  add more register bit defs

Modified:
  head/tools/tools/ath/common/dumpregs_5212.c
  head/tools/tools/ath/common/dumpregs_5416.c

Modified: head/tools/tools/ath/common/dumpregs_5212.c
==============================================================================
--- head/tools/tools/ath/common/dumpregs_5212.c	Wed Mar 11 22:43:31 2009	(r189711)
+++ head/tools/tools/ath/common/dumpregs_5212.c	Thu Mar 12 00:03:55 2009	(r189712)
@@ -400,7 +400,8 @@ static struct dumpreg ar5212regs[] = {
     DEFVOID(AR_PHY_IQCAL_RES_IQ_CORR_MEAS, "PHY_IQCAL_RES_IQ_CORR_MEAS"),
     DEFVOID(AR_PHY_CURRENT_RSSI,"PHY_CURRENT_RSSI"),
     DEFVOID(AR_PHY_RFBUS_GNT,	"PHY_RFBUS_GNT"),
-    DEFVOID(AR_PHY_MODE,	"PHY_MODE"),
+    DEFVOIDfmt(AR_PHY_MODE,	"PHY_MODE",
+	"\20\1CCK\2RF2GHZ\3DYNAMIC\4AR5112\5HALF\6QUARTER"),
     DEFVOID(AR_PHY_CCK_TX_CTRL,	"PHY_CCK_TX_CTRL"),
     DEFVOID(AR_PHY_CCK_DETECT,	"PHY_CCK_DETECT"),
     DEFVOID(AR_PHY_GAIN_2GHZ,	"PHY_GAIN_2GHZ"),

Modified: head/tools/tools/ath/common/dumpregs_5416.c
==============================================================================
--- head/tools/tools/ath/common/dumpregs_5416.c	Wed Mar 11 22:43:31 2009	(r189711)
+++ head/tools/tools/ath/common/dumpregs_5416.c	Thu Mar 12 00:03:55 2009	(r189712)
@@ -50,7 +50,8 @@ static struct dumpreg ar5416regs[] = {
     DEFBASIC(AR_CST,		"CST"),
     DEFBASIC(AR_IER,		"IER"),
     DEFBASIC(AR_TXCFG,		"TXCFG"),
-    DEFBASIC(AR_RXCFG,		"RXCFG"),
+    DEFBASICfmt(AR_RXCFG,	"RXCFG",
+	"\20\6JUMBO_ENA\7JUMBO_WRAP\10SLEEP_DEBUG"),
     DEFBASIC(AR_MIBC,		"MIBC"),
     DEFBASIC(AR_TOPS,		"TOPS"),
     DEFBASIC(AR_RXNPTO,		"RXNPTO"),
@@ -63,16 +64,28 @@ static struct dumpreg ar5416regs[] = {
     DEFBASIC(AR_GTXTO,		"GTXTO"),
     DEFBASIC(AR_GTTM,		"GTTM"),
 
-    DEFINT(AR_ISR,		"ISR"),
+    DEFINTfmt(AR_ISR,		"ISR",
+	  "\20\1RXOK\2RXDESC\3RXERR\4RXNOPKT\5RXEOL\6RXORN\7TXOK\10TXDESC"
+	  "\11TXERR\12TXNOPKT\13TXEOL\14TXURN\15MIB\16SWI\17RXPHY\20RXKCM"
+	  "\21SWBA\22BRSSI\23BMISS\24HIUERR\25BNR\26RXCHIRP\27RXDOPPL\30BCNMISS"
+	  "\31TIM\32GPIO\33QCBROVF\34QCBRURN\35QTRIG"),
     DEFINT(AR_ISR_S0,		"ISR_S0"),
     DEFINT(AR_ISR_S1,		"ISR_S1"),
-    DEFINT(AR_ISR_S2,		"ISR_S2"),
+    DEFINTfmt(AR_ISR_S2,	"ISR_S2",
+	  "\20\21MCABT\22SSERR\23DPERR\24TIM\25CABEND\26DTIMSYNC\27BCNTO"
+	  "\30CABTO\31DTIM"),
     DEFINT(AR_ISR_S3,		"ISR_S3"),
     DEFINT(AR_ISR_S4,		"ISR_S4"),
-    DEFINT(AR_IMR,		"IMR"),
+    DEFINTfmt(AR_IMR,		"IMR",
+	  "\20\1RXOK\2RXDESC\3RXERR\4RXNOPKT\5RXEOL\6RXORN\7TXOK\10TXDESC"
+	  "\11TXERR\12TXNOPKT\13TXEOL\14TXURN\15MIB\16SWI\17RXPHY\20RXKCM"
+	  "\21SWBA\22BRSSI\23BMISS\24HIUERR\25BNR\26RXCHIRP\27RXDOPPL\30BCNMISS"
+	  "\31TIM\32GPIO\33QCBROVF\34QCBRURN\35QTRIG"),
     DEFINT(AR_IMR_S0,		"IMR_S0"),
     DEFINT(AR_IMR_S1,		"IMR_S1"),
-    DEFINT(AR_IMR_S2,		"IMR_S2"),
+    DEFINTfmt(AR_IMR_S2,	"IMR_S2",
+	  "\20\21MCABT\22SSERR\23DPERR\24TIM\25CABEND\26DTIMSYNC\27BCNTO"
+	  "\30CABTO\31DTIM"),
     DEFINT(AR_IMR_S3,		"IMR_S3"),
     DEFINT(AR_IMR_S4,		"IMR_S4"),
     /* NB: don't read the RAC so we don't affect operation */
@@ -240,7 +253,8 @@ static struct dumpreg ar5416regs[] = {
     DEFVOID(AR_D_TXBLK_SET,	"D_SET"),
 
     DEFBASIC(AR_MAC_LED,	"MAC_LED"),
-    DEFBASIC(AR_RC,		"RC"),
+    DEFBASICfmt(AR_RC,		"RC",
+	"\20\1AHB\2APB\11HOSTIF"),
     DEFBASIC(AR_SCR,		"SCR"),
     DEFBASIC(AR_INTPEND,	"INTPEND"),
     DEFBASIC(AR_SFR,		"SFR"),
@@ -260,12 +274,15 @@ static struct dumpreg ar5416regs[] = {
     DEFVOID(AR_INTR_ASYNC_CAUSE,"INTR_ASYNC_CAUSE"),
     DEFVOID(AR_INTR_ASYNC_ENABLE,"INTR_ASYNC_ENABLE"),
 
-    DEFBASIC(AR_RTC_RC,		"RTC_RC"),
+    DEFBASICfmt(AR_RTC_RC,	"RTC_RC",
+	"\20\1MAC_WARM\2MAC_COLD"),
     DEFBASIC(AR_RTC_PLL_CONTROL,"RTC_PLL"),
     DEFVOID(AR_RTC_RESET,	"RTC_RESET"),
-    DEFVOID(AR_RTC_STATUS,	"RTC_STATUS"),
+    DEFVOIDfmt(AR_RTC_STATUS,	"RTC_STATUS",
+	"\20\1SHUTDOWN\2ON\3SLEEP\4WAKEUP\5COLDRESET\6PLLCHANGE"),
     DEFVOID(AR_RTC_SLEEP_CLK,	"RTC_SLEEP_CLK"),
-    DEFVOID(AR_RTC_FORCE_WAKE,	"RTC_FORCE_WAKE"),
+    DEFVOIDfmt(AR_RTC_FORCE_WAKE,"RTC_FORCE_WAKE",
+	"\20\1EN\2WAKE_ON_INT"),
     DEFVOID(AR_RTC_INTR_CAUSE,	"RTC_INTR_CAUSE"),
     DEFVOID(AR_RTC_INTR_MASK,	"RTC_INTR_MASK"),
 
@@ -285,7 +302,11 @@ static struct dumpreg ar5416regs[] = {
     DEFVOID(AR_EEPROM_STS,	"EESTS"),
     DEFVOID(AR_EEPROM_CFG,	"EECFG"),
     DEFBASIC(AR_STA_ID0,	"STA_ID0"),
-    DEFBASIC(AR_STA_ID1,	"STA_ID1"),
+    DEFBASICfmt(AR_STA_ID1,	"STA_ID1",
+	"\20\21AP\22ADHOC\23PWR_SAV\24KSRCHDIS\25PCF\26USE_DEFANT"
+	"\27UPD_DEFANT\30RTS_USE_DEF\31ACKCTS_6MB\32BASE_RATE_11B"
+	"\33USE_DA_SG\34CRPT_MIC_ENABLE\35KSRCH_MODE\36PRE_SEQNUM"
+	"\37CBCIV_ENDIAN\40MCAST_KSRC"),
     DEFBASIC(AR_BSS_ID0,	"BSS_ID0"),
     DEFBASIC(AR_BSS_ID1,	"BSS_ID1"),
     DEFBASIC(AR_SLOT_TIME,	"SLOTTIME"),
@@ -302,7 +323,10 @@ static struct dumpreg ar5416regs[] = {
     DEFBASIC(AR_RX_FILTER,	"RXFILTER"),
     DEFBASIC(AR_MCAST_FIL0,	"MCAST_0"),
     DEFBASIC(AR_MCAST_FIL1,	"MCAST_1"),
-    DEFBASIC(AR_DIAG_SW,	"DIAG_SW"),
+    DEFBASICfmt(AR_DIAG_SW,	"DIAG_SW",
+	  "\20\1CACHE_ACK\2ACK_DIS\3CTS_DIS\4ENCRYPT_DIS\5DECRYPT_DIS\6RX_DIS"
+	  "\7CORR_FCS\10CHAN_INFO\11EN_SCRAMSD\22FRAME_NV0\25RX_CLR_HI"
+	  "\26IGNORE_CS\27CHAN_IDLE\30PHEAR_ME"),
     DEFBASIC(AR_TSF_L32,	"TSF_L32"),
     DEFBASIC(AR_TSF_U32,	"TSF_U32"),
     DEFBASIC(AR_TST_ADDAC,	"TST_ADAC"),
@@ -371,6 +395,8 @@ static struct dumpreg ar5416regs[] = {
     DEFBASIC(AR_SLP_MIB_CTRL,	"SLPMIB"),
     DEFBASIC(AR_EXTRCCNT,	"EXTRCCNT"),
 
+    DEFVOID(AR_PHY_ADC_SERIAL_CTL,	"PHY_ADC_SERIAL_CTL"),
+
     /* XXX { AR_RATE_DURATION(0), AR_RATE_DURATION(0x20) }, */
 };