RomanRom2/ossc
1
0
Fork 0
mirror of https://github.com/marqs85/ossc synced 2026-02-20 13:31:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

clean last merging fragments

Browse Source
This commit is contained in:
borti4938 2016-04-16 21:27:32 +02:00
parent bbdfb1ea74
commit de0f98ea32
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
software/sys_controller/av_controller.c
View File

@ -40,7 +40,6 @@ alt_u8 fw_ver_major = 0;
alt_u8 fw_ver_minor = 69; alt_u8 fw_ver_minor = 69;
#define FW_UPDATE_RETRIES 3 #define FW_UPDATE_RETRIES 3
<<<<<<< HEAD
#define LINECNT_THOLD 1 #define LINECNT_THOLD 1
#define STABLE_THOLD 1 #define STABLE_THOLD 1
#define MIN_LINES_PROGRESSIVE 200 #define MIN_LINES_PROGRESSIVE 200
@ -69,8 +68,8 @@ alt_u8 fw_ver_minor = 69;
#define RC_MASK 0x0000ffff #define RC_MASK 0x0000ffff
#define PB_MASK 0x00030000 #define PB_MASK 0x00030000
#define PB0_MASK 0x00010000 #define PB0_BIT 0x00010000
#define PB1_MASK 0x00020000 #define PB1_BIT 0x00020000
#define HDMITX_MODE_MASK 0x00040000 #define HDMITX_MODE_MASK 0x00040000
static const char *rc_keydesc[] = { "1", "2", "3", "MENU", "BACK", "UP", "DOWN", "LEFT", "RIGHT", "INFO", "LCD_BACKLIGHT", "HOTKEY1", "HOTKEY2", "HOTKEY3"}; static const char *rc_keydesc[] = { "1", "2", "3", "MENU", "BACK", "UP", "DOWN", "LEFT", "RIGHT", "INFO", "LCD_BACKLIGHT", "HOTKEY1", "HOTKEY2", "HOTKEY3"};
@ -176,9 +175,9 @@ typedef struct {
alt_8 sync_thold; alt_8 sync_thold;
alt_u8 sync_lpf; alt_u8 sync_lpf;
alt_u8 video_lpf; alt_u8 video_lpf;
alt_u8 disable_alc;
alt_u8 pre_coast; alt_u8 pre_coast;
alt_u8 post_coast; alt_u8 post_coast;
alt_u8 disable_alc;
} avconfig_t; } avconfig_t;
// Target configuration // Target configuration
@ -1075,10 +1074,14 @@ status_t get_status(tvp_input_t input)
if ((tc.linemult_target != cm.cc.linemult_target) || if ((tc.linemult_target != cm.cc.linemult_target) ||
(tc.l3_mode != cm.cc.l3_mode) || (tc.l3_mode != cm.cc.l3_mode) ||
((tc.s480p_mode != cm.cc.s480p_mode) && (video_modes[cm.id].flags & (MODE_DTV480P|MODE_VGA480P))) || ((tc.s480p_mode != cm.cc.s480p_mode) && (video_modes[cm.id].flags & (MODE_DTV480P|MODE_VGA480P))))
(tc.disable_alc != cm.cc.disable_alc))
status = (status < MODE_CHANGE) ? MODE_CHANGE : status; status = (status < MODE_CHANGE) ? MODE_CHANGE : status;
if (tc.disable_alc != cm.cc.disable_alc)
tvp_set_alc(target_type, tc.disable_alc);
cm.totlines = totlines; cm.totlines = totlines;
cm.clkcnt = clkcnt; cm.clkcnt = clkcnt;
cm.progressive = progressive; cm.progressive = progressive;