diff options
author | Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> | 2007-10-16 04:29:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:20 -0400 |
commit | eea820ab0b189d74620dca376817a2e599eb1ab1 (patch) | |
tree | ded7c5bcb90266f801b23f85e9fbeca5fb5ecfe1 /drivers/ps3/ps3av_cmd.c | |
parent | 828b23fc8794d1ac679e1695a9d9e0341e43752e (diff) |
ps3av: eliminate PS3AV_DEBUG
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>
Diffstat (limited to 'drivers/ps3/ps3av_cmd.c')
-rw-r--r-- | drivers/ps3/ps3av_cmd.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/drivers/ps3/ps3av_cmd.c b/drivers/ps3/ps3av_cmd.c index 83d7e8fdbfea..7f880c26122f 100644 --- a/drivers/ps3/ps3av_cmd.c +++ b/drivers/ps3/ps3av_cmd.c | |||
@@ -922,72 +922,6 @@ int ps3av_cmd_video_get_monitor_info(struct ps3av_pkt_av_get_monitor_info *info, | |||
922 | return res; | 922 | return res; |
923 | } | 923 | } |
924 | 924 | ||
925 | #ifdef PS3AV_DEBUG | ||
926 | void ps3av_cmd_av_hw_conf_dump(const struct ps3av_pkt_av_get_hw_conf *hw_conf) | ||
927 | { | ||
928 | printk("av_h_conf:num of hdmi:%d\n", hw_conf->num_of_hdmi); | ||
929 | printk("av_h_conf:num of avmulti:%d\n", hw_conf->num_of_avmulti); | ||
930 | printk("av_h_conf:num of spdif:%d\n", hw_conf->num_of_spdif); | ||
931 | } | ||
932 | |||
933 | void ps3av_cmd_av_monitor_info_dump(const struct ps3av_pkt_av_get_monitor_info *monitor_info) | ||
934 | { | ||
935 | const struct ps3av_info_monitor *info = &monitor_info->info; | ||
936 | const struct ps3av_info_audio *audio = info->audio; | ||
937 | int i; | ||
938 | |||
939 | printk("Monitor Info: size%d\n", monitor_info->send_hdr.size); | ||
940 | |||
941 | printk("avport:%02x\n", info->avport); | ||
942 | printk("monitor_id:"); | ||
943 | for (i = 0; i < 10; i++) | ||
944 | printk("%02x ", info->monitor_id[i]); | ||
945 | printk("\nmonitor_type:%02x\n", info->monitor_type); | ||
946 | printk("monitor_name:"); | ||
947 | for (i = 0; i < 16; i++) | ||
948 | printk("%c", info->monitor_name[i]); | ||
949 | |||
950 | /* resolution */ | ||
951 | printk("\nresolution_60: bits:%08x native:%08x\n", | ||
952 | info->res_60.res_bits, info->res_60.native); | ||
953 | printk("resolution_50: bits:%08x native:%08x\n", | ||
954 | info->res_50.res_bits, info->res_50.native); | ||
955 | printk("resolution_other: bits:%08x native:%08x\n", | ||
956 | info->res_other.res_bits, info->res_other.native); | ||
957 | printk("resolution_vesa: bits:%08x native:%08x\n", | ||
958 | info->res_vesa.res_bits, info->res_vesa.native); | ||
959 | |||
960 | /* color space */ | ||
961 | printk("color space rgb:%02x\n", info->cs.rgb); | ||
962 | printk("color space yuv444:%02x\n", info->cs.yuv444); | ||
963 | printk("color space yuv422:%02x\n", info->cs.yuv422); | ||
964 | |||
965 | /* color info */ | ||
966 | printk("color info red:X %04x Y %04x\n", | ||
967 | info->color.red_x, info->color.red_y); | ||
968 | printk("color info green:X %04x Y %04x\n", | ||
969 | info->color.green_x, info->color.green_y); | ||
970 | printk("color info blue:X %04x Y %04x\n", | ||
971 | info->color.blue_x, info->color.blue_y); | ||
972 | printk("color info white:X %04x Y %04x\n", | ||
973 | info->color.white_x, info->color.white_y); | ||
974 | printk("color info gamma: %08x\n", info->color.gamma); | ||
975 | |||
976 | /* other info */ | ||
977 | printk("supported_AI:%02x\n", info->supported_ai); | ||
978 | printk("speaker_info:%02x\n", info->speaker_info); | ||
979 | printk("num of audio:%02x\n", info->num_of_audio_block); | ||
980 | |||
981 | /* audio block */ | ||
982 | for (i = 0; i < info->num_of_audio_block; i++) { | ||
983 | printk("audio[%d] type:%02x max_ch:%02x fs:%02x sbit:%02x\n", | ||
984 | i, audio->type, audio->max_num_of_ch, audio->fs, | ||
985 | audio->sbit); | ||
986 | audio++; | ||
987 | } | ||
988 | } | ||
989 | #endif /* PS3AV_DEBUG */ | ||
990 | |||
991 | #define PS3AV_AV_LAYOUT_0 (PS3AV_CMD_AV_LAYOUT_32 \ | 925 | #define PS3AV_AV_LAYOUT_0 (PS3AV_CMD_AV_LAYOUT_32 \ |
992 | | PS3AV_CMD_AV_LAYOUT_44 \ | 926 | | PS3AV_CMD_AV_LAYOUT_44 \ |
993 | | PS3AV_CMD_AV_LAYOUT_48) | 927 | | PS3AV_CMD_AV_LAYOUT_48) |