lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ps3av: eliminate PS3AV_DEBUG

Browse Source 
ps3av: eliminate PS3AV_DEBUG
  - Move ps3av_cmd_av_monitor_info_dump from ps3av_cmd.c to ps3av.c, as
it's
    used there only
  - Integrate ps3av_cmd_av_hw_conf_dump() into its sole user
  - Use pr_debug() for printing debug info

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Geert Uytterhoeven
2007-10-16 01:29:40 -07:00
committed by Linus Torvalds
parent 828b23fc87
commit eea820ab0b
3 changed files with 67 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/ps3/ps3av_cmd.c
View File

@@ -922,72 +922,6 @@ int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *info,
return res;
}
#ifdef PS3AV_DEBUG
void ps3av_cmd_av_hw_conf_dump(const struct ps3av_pkt_av_get_hw_conf *hw_conf)
{
printk("av_h_conf:num of hdmi:%d\n", hw_conf->num_of_hdmi);
printk("av_h_conf:num of avmulti:%d\n", hw_conf->num_of_avmulti);
printk("av_h_conf:num of spdif:%d\n", hw_conf->num_of_spdif);
}
void ps3av_cmd_av_monitor_info_dump(const struct ps3av_pkt_av_get_monitor_info *monitor_info)
{
const struct ps3av_info_monitor *info = &monitor_info->info;
const struct ps3av_info_audio *audio = info->audio;
int i;
printk("Monitor Info: size%d\n", monitor_info->send_hdr.size);
printk("avport:%02x\n", info->avport);
printk("monitor_id:");
for (i = 0; i < 10; i++)
printk("%02x ", info->monitor_id[i]);
printk("\nmonitor_type:%02x\n", info->monitor_type);
printk("monitor_name:");
for (i = 0; i < 16; i++)
printk("%c", info->monitor_name[i]);
/* resolution */
printk("\nresolution_60: bits:%08x native:%08x\n",
info->res_60.res_bits, info->res_60.native);
printk("resolution_50: bits:%08x native:%08x\n",
info->res_50.res_bits, info->res_50.native);
printk("resolution_other: bits:%08x native:%08x\n",
info->res_other.res_bits, info->res_other.native);
printk("resolution_vesa: bits:%08x native:%08x\n",
info->res_vesa.res_bits, info->res_vesa.native);
/* color space */
printk("color space rgb:%02x\n", info->cs.rgb);
printk("color space yuv444:%02x\n", info->cs.yuv444);
printk("color space yuv422:%02x\n", info->cs.yuv422);
/* color info */
printk("color info red:X %04x Y %04x\n",
info->color.red_x, info->color.red_y);
printk("color info green:X %04x Y %04x\n",
info->color.green_x, info->color.green_y);
printk("color info blue:X %04x Y %04x\n",
info->color.blue_x, info->color.blue_y);
printk("color info white:X %04x Y %04x\n",
info->color.white_x, info->color.white_y);
printk("color info gamma: %08x\n", info->color.gamma);
/* other info */
printk("supported_AI:%02x\n", info->supported_ai);
printk("speaker_info:%02x\n", info->speaker_info);
printk("num of audio:%02x\n", info->num_of_audio_block);
/* audio block */
for (i = 0; i < info->num_of_audio_block; i++) {
printk("audio[%d] type:%02x max_ch:%02x fs:%02x sbit:%02x\n",
i, audio->type, audio->max_num_of_ch, audio->fs,
audio->sbit);
audio++;
}
}
#endif /* PS3AV_DEBUG */
#define PS3AV_AV_LAYOUT_0 (PS3AV_CMD_AV_LAYOUT_32 \
| PS3AV_CMD_AV_LAYOUT_44 \
| PS3AV_CMD_AV_LAYOUT_48)