Convert "Â" (Hex 00ad) to "-" (Hex 2d), the former leads to ugly outputs
in some situations.
Signed-off-by: Wu Fengguang <fengguang...@intel.com>
---
tools/intel_audio_dump.c | 70 ++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 35 deletions(-)
--- intel-gpu-tools.orig/tools/intel_audio_dump.c 2011-11-12
11:01:19.000000000 +0800
+++ intel-gpu-tools/tools/intel_audio_dump.c 2011-11-12 11:01:26.000000000
+0800
@@ -495,31 +495,31 @@ static void dump_ironlake(void)
dump_reg(HDMIB, "sDVO/HDMI Port B Control");
dump_reg(HDMIC, "HDMI Port C Control");
dump_reg(HDMID, "HDMI Port D Control");
- dump_reg(AUD_CONFIG_A, "Audio Configuration  Transcoder A");
- dump_reg(AUD_CONFIG_B, "Audio Configuration  Transcoder B");
- dump_reg(AUD_CTS_ENABLE_A, "Audio CTS Programming Enable Â
Transcoder A");
- dump_reg(AUD_CTS_ENABLE_B, "Audio CTS Programming Enable Â
Transcoder B");
+ dump_reg(AUD_CONFIG_A, "Audio Configuration - Transcoder A");
+ dump_reg(AUD_CONFIG_B, "Audio Configuration - Transcoder B");
+ dump_reg(AUD_CTS_ENABLE_A, "Audio CTS Programming Enable -
Transcoder A");
+ dump_reg(AUD_CTS_ENABLE_B, "Audio CTS Programming Enable -
Transcoder B");
dump_reg(AUD_MISC_CTRL_A, "Audio MISC Control for Transcoder A");
dump_reg(AUD_MISC_CTRL_B, "Audio MISC Control for Transcoder B");
dump_reg(AUD_VID_DID, "Audio Vendor ID / Device ID");
dump_reg(AUD_RID, "Audio Revision ID");
dump_reg(AUD_PWRST, "Audio Power State (Function
Group, Convertor, Pin Widget)");
dump_reg(AUD_PORT_EN_HD_CFG, "Audio Port Enable HDAudio Config");
- dump_reg(AUD_OUT_DIG_CNVT_A, "Audio Digital Converter  Conv A");
- dump_reg(AUD_OUT_DIG_CNVT_B, "Audio Digital Converter  Conv B");
+ dump_reg(AUD_OUT_DIG_CNVT_A, "Audio Digital Converter - Conv A");
+ dump_reg(AUD_OUT_DIG_CNVT_B, "Audio Digital Converter - Conv B");
dump_reg(AUD_OUT_CH_STR, "Audio Channel ID and Stream ID");
- dump_reg(AUD_OUT_STR_DESC_A, "Audio Stream Descriptor Format  Conv
A");
- dump_reg(AUD_OUT_STR_DESC_B, "Audio Stream Descriptor Format  Conv
B");
+ dump_reg(AUD_OUT_STR_DESC_A, "Audio Stream Descriptor Format - Conv
A");
+ dump_reg(AUD_OUT_STR_DESC_B, "Audio Stream Descriptor Format - Conv
B");
dump_reg(AUD_PINW_CONNLNG_LIST, "Audio Connection List");
dump_reg(AUD_PINW_CONNLNG_SEL, "Audio Connection Select");
- dump_reg(AUD_CNTL_ST_A, "Audio Control State Register Â
Transcoder A");
- dump_reg(AUD_CNTL_ST_B, "Audio Control State Register Â
Transcoder B");
+ dump_reg(AUD_CNTL_ST_A, "Audio Control State Register -
Transcoder A");
+ dump_reg(AUD_CNTL_ST_B, "Audio Control State Register -
Transcoder B");
dump_reg(AUD_CNTL_ST2, "Audio Control State 2");
dump_reg(AUD_HDMIW_STATUS, "Audio HDMI Status");
- dump_reg(AUD_HDMIW_HDMIEDID_A, "HDMI Data EDID Block  Transcoder A");
- dump_reg(AUD_HDMIW_HDMIEDID_B, "HDMI Data EDID Block  Transcoder B");
- dump_reg(AUD_HDMIW_INFOFR_A, "Audio Widget Data Island Packet Â
Transcoder A");
- dump_reg(AUD_HDMIW_INFOFR_B, "Audio Widget Data Island Packet Â
Transcoder B");
+ dump_reg(AUD_HDMIW_HDMIEDID_A, "HDMI Data EDID Block - Transcoder A");
+ dump_reg(AUD_HDMIW_HDMIEDID_B, "HDMI Data EDID Block - Transcoder B");
+ dump_reg(AUD_HDMIW_INFOFR_A, "Audio Widget Data Island Packet -
Transcoder A");
+ dump_reg(AUD_HDMIW_INFOFR_B, "Audio Widget Data Island Packet -
Transcoder B");
printf("\nDetails:\n\n");
@@ -825,12 +825,12 @@ static void dump_cpt(void)
dump_reg(HDMIB, "sDVO/HDMI Port B Control");
dump_reg(HDMIC, "HDMI Port C Control");
dump_reg(HDMID, "HDMI Port D Control");
- dump_reg(AUD_CONFIG_A, "Audio Configuration  Transcoder A");
- dump_reg(AUD_CONFIG_B, "Audio Configuration  Transcoder B");
- dump_reg(AUD_CONFIG_C, "Audio Configuration  Transcoder C");
- dump_reg(AUD_CTS_ENABLE_A, "Audio CTS Programming Enable Â
Transcoder A");
- dump_reg(AUD_CTS_ENABLE_B, "Audio CTS Programming Enable Â
Transcoder B");
- dump_reg(AUD_CTS_ENABLE_C, "Audio CTS Programming Enable Â
Transcoder C");
+ dump_reg(AUD_CONFIG_A, "Audio Configuration - Transcoder A");
+ dump_reg(AUD_CONFIG_B, "Audio Configuration - Transcoder B");
+ dump_reg(AUD_CONFIG_C, "Audio Configuration - Transcoder C");
+ dump_reg(AUD_CTS_ENABLE_A, "Audio CTS Programming Enable -
Transcoder A");
+ dump_reg(AUD_CTS_ENABLE_B, "Audio CTS Programming Enable -
Transcoder B");
+ dump_reg(AUD_CTS_ENABLE_C, "Audio CTS Programming Enable -
Transcoder C");
dump_reg(AUD_MISC_CTRL_A, "Audio MISC Control for Transcoder A");
dump_reg(AUD_MISC_CTRL_B, "Audio MISC Control for Transcoder B");
dump_reg(AUD_MISC_CTRL_C, "Audio MISC Control for Transcoder C");
@@ -838,27 +838,27 @@ static void dump_cpt(void)
dump_reg(AUD_RID, "Audio Revision ID");
dump_reg(AUD_PWRST, "Audio Power State (Function
Group, Convertor, Pin Widget)");
dump_reg(AUD_PORT_EN_HD_CFG, "Audio Port Enable HDAudio Config");
- dump_reg(AUD_OUT_DIG_CNVT_A, "Audio Digital Converter  Conv A");
- dump_reg(AUD_OUT_DIG_CNVT_B, "Audio Digital Converter  Conv B");
- dump_reg(AUD_OUT_DIG_CNVT_C, "Audio Digital Converter  Conv C");
+ dump_reg(AUD_OUT_DIG_CNVT_A, "Audio Digital Converter - Conv A");
+ dump_reg(AUD_OUT_DIG_CNVT_B, "Audio Digital Converter - Conv B");
+ dump_reg(AUD_OUT_DIG_CNVT_C, "Audio Digital Converter - Conv C");
dump_reg(AUD_OUT_CH_STR, "Audio Channel ID and Stream ID");
- dump_reg(AUD_OUT_STR_DESC_A, "Audio Stream Descriptor Format  Conv
A");
- dump_reg(AUD_OUT_STR_DESC_B, "Audio Stream Descriptor Format  Conv
B");
- dump_reg(AUD_OUT_STR_DESC_C, "Audio Stream Descriptor Format  Conv
C");
+ dump_reg(AUD_OUT_STR_DESC_A, "Audio Stream Descriptor Format - Conv
A");
+ dump_reg(AUD_OUT_STR_DESC_B, "Audio Stream Descriptor Format - Conv
B");
+ dump_reg(AUD_OUT_STR_DESC_C, "Audio Stream Descriptor Format - Conv
C");
dump_reg(AUD_PINW_CONNLNG_LIST, "Audio Connection List");
dump_reg(AUD_PINW_CONNLNG_SEL, "Audio Connection Select");
- dump_reg(AUD_CNTL_ST_A, "Audio Control State Register Â
Transcoder A");
- dump_reg(AUD_CNTL_ST_B, "Audio Control State Register Â
Transcoder B");
- dump_reg(AUD_CNTL_ST_C, "Audio Control State Register Â
Transcoder C");
+ dump_reg(AUD_CNTL_ST_A, "Audio Control State Register -
Transcoder A");
+ dump_reg(AUD_CNTL_ST_B, "Audio Control State Register -
Transcoder B");
+ dump_reg(AUD_CNTL_ST_C, "Audio Control State Register -
Transcoder C");
dump_reg(AUD_CNTRL_ST2, "Audio Control State 2");
dump_reg(AUD_CNTRL_ST3, "Audio Control State 3");
dump_reg(AUD_HDMIW_STATUS, "Audio HDMI Status");
- dump_reg(AUD_HDMIW_HDMIEDID_A, "HDMI Data EDID Block  Transcoder A");
- dump_reg(AUD_HDMIW_HDMIEDID_B, "HDMI Data EDID Block  Transcoder B");
- dump_reg(AUD_HDMIW_HDMIEDID_C, "HDMI Data EDID Block  Transcoder C");
- dump_reg(AUD_HDMIW_INFOFR_A, "Audio Widget Data Island Packet Â
Transcoder A");
- dump_reg(AUD_HDMIW_INFOFR_B, "Audio Widget Data Island Packet Â
Transcoder B");
- dump_reg(AUD_HDMIW_INFOFR_C, "Audio Widget Data Island Packet Â
Transcoder C");
+ dump_reg(AUD_HDMIW_HDMIEDID_A, "HDMI Data EDID Block - Transcoder A");
+ dump_reg(AUD_HDMIW_HDMIEDID_B, "HDMI Data EDID Block - Transcoder B");
+ dump_reg(AUD_HDMIW_HDMIEDID_C, "HDMI Data EDID Block - Transcoder C");
+ dump_reg(AUD_HDMIW_INFOFR_A, "Audio Widget Data Island Packet -
Transcoder A");
+ dump_reg(AUD_HDMIW_INFOFR_B, "Audio Widget Data Island Packet -
Transcoder B");
+ dump_reg(AUD_HDMIW_INFOFR_C, "Audio Widget Data Island Packet -
Transcoder C");
printf("\nDetails:\n\n");
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
