diff options
| author | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2012-11-24 12:02:32 +0200 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2012-11-24 12:02:32 +0200 |
| commit | cec433840fde8be3ee6b8ce916b416f44d15a794 (patch) | |
| tree | a00d8f4d3e0cda823e692ed9067e9adea009b2f2 /src/cim | |
| parent | 4e6f1e68344d52cd80f85843a2a9830add042a34 (diff) | |
pre-release whitespace cleanup using ../modular/x-indent-all.sh
Diffstat (limited to 'src/cim')
| -rw-r--r-- | src/cim/cim_df.c | 8 | ||||
| -rw-r--r-- | src/cim/cim_vg.c | 5 | ||||
| -rw-r--r-- | src/cim/cim_vip.c | 6 | ||||
| -rw-r--r-- | src/cim/cim_vop.c | 12 |
4 files changed, 12 insertions, 19 deletions
diff --git a/src/cim/cim_df.c b/src/cim/cim_df.c index abf1745..d3c1149 100644 --- a/src/cim/cim_df.c +++ b/src/cim/cim_df.c @@ -153,8 +153,8 @@ df_configure_video_source(DF_VIDEO_SOURCE_PARAMS * video_source_odd, /* PARAMETER - VIDEO PITCH */ pitch = - (video_source_odd-> - y_pitch >> 3) | ((video_source_odd->uv_pitch >> 3) << 16); + (video_source_odd->y_pitch >> 3) | ((video_source_odd->uv_pitch >> 3) << + 16); /* PARAMETER - VIDEO FORMAT */ @@ -1031,8 +1031,8 @@ df_configure_video_cursor_color_key(DF_VIDEO_CURSOR_PARAMS * cursor_color_key) key = READ_VID32(DF_CURSOR_COLOR_KEY) & DF_CURSOR_COLOR_KEY_ENABLE; key = - key | (cursor_color_key-> - key & 0xFFFFFF) | (cursor_color_key->select_color2 << 24); + key | (cursor_color_key->key & 0xFFFFFF) | (cursor_color_key-> + select_color2 << 24); WRITE_VID32(DF_CURSOR_COLOR_KEY, key); WRITE_VID32(DF_CURSOR_COLOR_MASK, (cursor_color_key->mask & 0xFFFFFF)); diff --git a/src/cim/cim_vg.c b/src/cim/cim_vg.c index bc429cb..784519d 100644 --- a/src/cim/cim_vg.c +++ b/src/cim/cim_vg.c @@ -897,9 +897,8 @@ vg_set_custom_mode(VG_DISPLAY_MODE * mode_params, int bpp) if ((mode_params->flags & VG_MODEFLAG_BANDWIDTHMASK) == VG_MODEFLAG_HIGH_BAND || ((mode_params->flags & VG_MODEFLAG_INTERLACED) - && (mode_params-> - flags & VG_MODEFLAG_INT_MASK) == - VG_MODEFLAG_INT_FLICKER) || + && (mode_params->flags & VG_MODEFLAG_INT_MASK) + == VG_MODEFLAG_INT_FLICKER) || (irq_ctl & DC3_IRQFILT_GFX_FILT_EN)) { /* HIGH BANDWIDTH */ /* Set agressive watermarks and disallow forced low priority */ diff --git a/src/cim/cim_vip.c b/src/cim/cim_vip.c index 9ecfad3..a88b65f 100644 --- a/src/cim/cim_vip.c +++ b/src/cim/cim_vip.c @@ -794,8 +794,7 @@ vip_set_priority_characteristics(VIPPRIORITYBUFFER * buffer) VIP_MSR_MCR_SECOND_PRIORITY_SHIFT) & VIP_MSR_MCR_SECOND_PRIORITY_MASK; q_word.low |= - (buffer-> - primary << VIP_MSR_MCR_PRIMARY_PRIORITY_SHIFT) & + (buffer->primary << VIP_MSR_MCR_PRIMARY_PRIORITY_SHIFT) & VIP_MSR_MCR_PRIMARY_PRIORITY_MASK; q_word.low |= (buffer->pid << VIP_MSR_MCR_PID_SHIFT) & VIP_MSR_MCR_PID_MASK; @@ -922,8 +921,7 @@ vip_set_subwindow_enable(VIPSUBWINDOWBUFFER * buffer) WRITE_VIP32(VIP_VERTICAL_START_STOP, ((buffer->stop << VIP_VSTART_VERTEND_SHIFT) & VIP_VSTART_VERTEND_MASK) | - ((buffer-> - start << VIP_VSTART_VERTSTART_SHIFT) & + ((buffer->start << VIP_VSTART_VERTSTART_SHIFT) & VIP_VSTART_VERTSTART_MASK)); /* ENABLE IN THE CONTROL REGISTER */ diff --git a/src/cim/cim_vop.c b/src/cim/cim_vop.c index fe73e98..5a85998 100644 --- a/src/cim/cim_vop.c +++ b/src/cim/cim_vop.c @@ -101,17 +101,13 @@ vop_set_vbi_window(VOPVBIWINDOWBUFFER * buffer) WRITE_REG32(DC3_VBI_LN_ODD, ((buffer->odd_line_offset << DC3_VBI_ODD_LINE_SHIFT) & - DC3_VBI_ODD_LINE_MASK) | (buffer-> - odd_line_capture_mask - & - DC3_VBI_ODD_ENABLE_MASK)); + DC3_VBI_ODD_LINE_MASK) | + (buffer->odd_line_capture_mask & DC3_VBI_ODD_ENABLE_MASK)); WRITE_REG32(DC3_VBI_LN_EVEN, ((buffer->even_line_offset << DC3_VBI_EVEN_LINE_SHIFT) & - DC3_VBI_EVEN_LINE_MASK) | (buffer-> - even_line_capture_mask - & - DC3_VBI_EVEN_ENABLE_MASK)); + DC3_VBI_EVEN_LINE_MASK) | + (buffer->even_line_capture_mask & DC3_VBI_EVEN_ENABLE_MASK)); /* PROGRAM SOURCE OFFSETS * Start with the even offsets. Note that we always enable 16-bit VBI, |