RomanRom2/ossc
1
0
Fork 0
mirror of https://github.com/marqs85/ossc synced 2025-04-18 02:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

set HDMI AVI Infoframe VIC

Browse Source
This commit is contained in:
marqs 2019-07-01 20:06:04 +03:00
parent 3a4cbf1c11
commit c49b6da638
8 changed files with 1072 additions and 1070 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
software/sys_controller/it6613/it6613_sys.c
View File

@ -220,7 +220,7 @@ HDMITX_ChangeDisplayOption(HDMI_Video_Type OutputVideoTiming, HDMI_OutputColorMo
aspec = HDMI_16x9 ; aspec = HDMI_16x9 ;
Colorimetry = HDMI_ITU709 ; Colorimetry = HDMI_ITU709 ;
break ; break ;
case HDMI_1080p24: /*case HDMI_1080p24:
VIC = 32 ; VIC = 32 ;
VideoPixelClock = 74250000 ; VideoPixelClock = 74250000 ;
pixelrep = 0 ; pixelrep = 0 ;
@ -247,7 +247,7 @@ HDMITX_ChangeDisplayOption(HDMI_Video_Type OutputVideoTiming, HDMI_OutputColorMo
pixelrep = 0 ; pixelrep = 0 ;
aspec = HDMI_16x9 ; aspec = HDMI_16x9 ;
Colorimetry = HDMI_ITU601 ; Colorimetry = HDMI_ITU601 ;
break ; break ;*/
default: default:

6
software/sys_controller/it6613/it6613_sys.h
View File

@ -5,7 +5,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
typedef enum tagHDMI_Video_Type { typedef enum tagHDMI_Video_Type {
HDMI_Unkown = 0 , HDMI_Unknown = 0 ,
HDMI_640x480p60 = 1 , HDMI_640x480p60 = 1 ,
HDMI_480p60, HDMI_480p60,
HDMI_480p60_16x9, HDMI_480p60_16x9,
@ -21,10 +21,10 @@ typedef enum tagHDMI_Video_Type {
HDMI_576i50, HDMI_576i50,
HDMI_576i50_16x9, HDMI_576i50_16x9,
HDMI_1080p50 = 31, HDMI_1080p50 = 31,
HDMI_1080p24, /*HDMI_1080p24,
HDMI_1080p25, HDMI_1080p25,
HDMI_1080p30, HDMI_1080p30,
HDMI_1080i120 = 46, // richard add HDMI_1080i120 = 46,*/ // richard add
} HDMI_Video_Type ; } HDMI_Video_Type ;
typedef enum tagHDMI_Aspec { typedef enum tagHDMI_Aspec {

2020
software/sys_controller/mem_init/sys_onchip_memory2_0.hex
View File

File diff suppressed because it is too large Load Diff

21
software/sys_controller/ossc/av_controller.c
View File

@ -129,7 +129,7 @@ inline void TX_enable(tx_mode_t mode)
EnableVideoOutput(PCLK_MEDIUM, COLOR_RGB444, COLOR_RGB444, !mode); EnableVideoOutput(PCLK_MEDIUM, COLOR_RGB444, COLOR_RGB444, !mode);
if (mode == TX_HDMI) { if (mode == TX_HDMI) {
HDMITX_SetAVIInfoFrame(HDMI_Unkown, 0, 0, tc.hdmi_itc, cm.hdmitx_pixr_ifr); HDMITX_SetAVIInfoFrame(cm.hdmitx_vic, 0, 0, tc.hdmi_itc, cm.hdmitx_pixr_ifr);
cm.cc.hdmi_itc = tc.hdmi_itc; cm.cc.hdmi_itc = tc.hdmi_itc;
} }
@ -572,7 +572,7 @@ void program_mode()
if (cm.cc.full_tx_setup) { if (cm.cc.full_tx_setup) {
TX_enable(cm.cc.tx_mode); TX_enable(cm.cc.tx_mode);
} else if (cm.cc.tx_mode==TX_HDMI) { } else if (cm.cc.tx_mode==TX_HDMI) {
HDMITX_SetAVIInfoFrame(HDMI_Unkown, 0, 0, cm.cc.hdmi_itc, cm.hdmitx_pixr_ifr); HDMITX_SetAVIInfoFrame(cm.hdmitx_vic, 0, 0, cm.cc.hdmi_itc, cm.hdmitx_pixr_ifr);
#ifdef ENABLE_AUDIO #ifdef ENABLE_AUDIO
#ifdef MANUAL_CTS #ifdef MANUAL_CTS
SetupAudio(cm.cc.tx_mode); SetupAudio(cm.cc.tx_mode);
@ -725,6 +725,7 @@ int init_hw()
setup_rc(); setup_rc();
// init always in HDMI mode (fixes yellow screen bug) // init always in HDMI mode (fixes yellow screen bug)
cm.hdmitx_vic = HDMI_Unknown;
TX_enable(TX_HDMI); TX_enable(TX_HDMI);
return 0; return 0;
@ -842,7 +843,7 @@ int main()
while (1) {} while (1) {}
} }
set_videoinfo_vg(); cm.cc.vgen_mode = -1;
// Mainloop // Mainloop
while(1) { while(1) {
@ -940,7 +941,7 @@ int main()
// Check here to enable regardless of input // Check here to enable regardless of input
if (tc.tx_mode != cm.cc.tx_mode) { if (tc.tx_mode != cm.cc.tx_mode) {
HDMITX_SetAVIInfoFrame(HDMI_Unkown, 0, 0, 0, 0); HDMITX_SetAVIInfoFrame(cm.hdmitx_vic, 0, 0, 0, 0);
TX_enable(tc.tx_mode); TX_enable(tc.tx_mode);
cm.cc.tx_mode = tc.tx_mode; cm.cc.tx_mode = tc.tx_mode;
cm.clkcnt = 0; //TODO: proper invalidate cm.clkcnt = 0; //TODO: proper invalidate
@ -948,27 +949,25 @@ int main()
if ((tc.tx_mode == TX_HDMI) && (tc.hdmi_itc != cm.cc.hdmi_itc)) { if ((tc.tx_mode == TX_HDMI) && (tc.hdmi_itc != cm.cc.hdmi_itc)) {
//EnableAVIInfoFrame(FALSE, NULL); //EnableAVIInfoFrame(FALSE, NULL);
printf("setting ITC to %d\n", tc.hdmi_itc); printf("setting ITC to %d\n", tc.hdmi_itc);
HDMITX_SetAVIInfoFrame(HDMI_Unkown, 0, 0, tc.hdmi_itc, cm.hdmitx_pixr_ifr); HDMITX_SetAVIInfoFrame(cm.hdmitx_vic, 0, 0, tc.hdmi_itc, cm.hdmitx_pixr_ifr);
cm.cc.hdmi_itc = tc.hdmi_itc; cm.cc.hdmi_itc = tc.hdmi_itc;
} }
if ((tc.vgen_mode != cm.cc.vgen_mode) || (tc.vgen_spd != cm.cc.vgen_spd)) { if ((tc.vgen_mode != cm.cc.vgen_mode) || (tc.vgen_spd != cm.cc.vgen_spd)) {
cm.cc.vgen_mode = tc.vgen_mode; cm.cc.vgen_mode = tc.vgen_mode;
cm.cc.vgen_spd = tc.vgen_spd; cm.cc.vgen_spd = tc.vgen_spd;
cm.hdmitx_vic = video_modes_vgen[cm.cc.vgen_mode].vic;
set_videoinfo_vg(); set_videoinfo_vg();
/*if (cm.hdmitx_pixr_ifr != !!(video_modes_vgen[cm.cc.vgen_mode].flags & MODE_INTERLACED)) {
cm.hdmitx_pixr_ifr = !!(video_modes_vgen[cm.cc.vgen_mode].flags & MODE_INTERLACED);
TX_SetPixelRepetition(TX_PIXELREP_DISABLE, 0);
HDMITX_SetAVIInfoFrame(HDMI_Unkown, 0, 0, tc.hdmi_itc, cm.hdmitx_pixr_ifr);
}*/
tx_pixelrep = !!(video_modes_vgen[cm.cc.vgen_mode].flags & MODE_INTERLACED) | (video_modes_vgen[cm.cc.vgen_mode].type == VIDEO_HDTV); tx_pixelrep = !!(video_modes_vgen[cm.cc.vgen_mode].flags & MODE_INTERLACED) | (video_modes_vgen[cm.cc.vgen_mode].type == VIDEO_HDTV);
hdmitx_pixr_ifr = !!(video_modes_vgen[cm.cc.vgen_mode].flags & MODE_INTERLACED); hdmitx_pixr_ifr = !!(video_modes_vgen[cm.cc.vgen_mode].flags & MODE_INTERLACED);
if (cm.tx_pixelrep != tx_pixelrep) { if (cm.tx_pixelrep != tx_pixelrep) {
cm.tx_pixelrep = tx_pixelrep; cm.tx_pixelrep = tx_pixelrep;
cm.hdmitx_pixr_ifr = hdmitx_pixr_ifr; cm.hdmitx_pixr_ifr = hdmitx_pixr_ifr;
if (cm.cc.full_tx_setup)
TX_enable(tc.tx_mode);
TX_SetPixelRepetition(cm.tx_pixelrep, ((cm.cc.tx_mode==TX_HDMI) && (cm.tx_pixelrep == cm.hdmitx_pixr_ifr)) ? 1 : 0); TX_SetPixelRepetition(cm.tx_pixelrep, ((cm.cc.tx_mode==TX_HDMI) && (cm.tx_pixelrep == cm.hdmitx_pixr_ifr)) ? 1 : 0);
if (cm.cc.tx_mode==TX_HDMI) if (cm.cc.tx_mode==TX_HDMI)
HDMITX_SetAVIInfoFrame(HDMI_Unkown, 0, 0, tc.hdmi_itc, cm.hdmitx_pixr_ifr); HDMITX_SetAVIInfoFrame(cm.hdmitx_vic, 0, 0, tc.hdmi_itc, cm.hdmitx_pixr_ifr);
} }
} }

1
software/sys_controller/ossc/av_controller.h
View File

@ -87,6 +87,7 @@ typedef struct {
alt_u8 fpga_hmultmode; alt_u8 fpga_hmultmode;
alt_u8 tx_pixelrep; alt_u8 tx_pixelrep;
alt_u8 hdmitx_pixr_ifr; alt_u8 hdmitx_pixr_ifr;
alt_u8 hdmitx_vic;
alt_u8 sample_mult; alt_u8 sample_mult;
alt_u8 sample_sel; alt_u8 sample_sel;
alt_u8 hsync_cut; alt_u8 hsync_cut;

82
software/sys_controller/tvp7002/video_modes.h
View File

@ -22,6 +22,7 @@
#include <alt_types.h> #include <alt_types.h>
#include "sysconfig.h" #include "sysconfig.h"
#include "it6613_sys.h"
#define H_TOTAL_MIN 300 #define H_TOTAL_MIN 300
#define H_TOTAL_MAX 2300 #define H_TOTAL_MAX 2300
@ -84,7 +85,8 @@ typedef enum {
typedef struct { typedef struct {
char name[10]; char name[10];
alt_u16 h_active; HDMI_Video_Type vic:5;
alt_u16 h_active:11;
alt_u16 v_active; alt_u16 v_active;
alt_u16 h_total; alt_u16 h_total;
alt_u16 v_total; alt_u16 v_total;
@ -100,47 +102,47 @@ typedef struct {
#define VIDEO_MODES_DEF { \ #define VIDEO_MODES_DEF { \
/* 240p modes */ \ /* 240p modes */ \
{ "1536x240", 1536, 240, 2046, 262, 234, 15, 150, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L5_GEN_4_3 | MODE_PLLDIVBY2) }, \ { "1536x240", HDMI_Unknown, 1536, 240, 2046, 262, 234, 15, 150, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L5_GEN_4_3 | MODE_PLLDIVBY2) }, \
{ "1280x240", 1280, 240, 1560, 262, 170, 15, 72, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2) }, \ { "1280x240", HDMI_Unknown, 1280, 240, 1560, 262, 170, 15, 72, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2) }, \
{ "960x240", 960, 240, 1170, 262, 128, 15, 54, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L3_GEN_4_3 | MODE_PLLDIVBY2) }, \ { "960x240", HDMI_Unknown, 960, 240, 1170, 262, 128, 15, 54, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L3_GEN_4_3 | MODE_PLLDIVBY2) }, \
{ "320x240", 320, 240, 426, 262, 49, 14, 31, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L2_320_COL | MODE_L3_320_COL | MODE_L4_320_COL | MODE_L5_320_COL) }, \ { "320x240", HDMI_Unknown, 320, 240, 426, 262, 49, 14, 31, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L2_320_COL | MODE_L3_320_COL | MODE_L4_320_COL | MODE_L5_320_COL) }, \
{ "256x240", 256, 240, 341, 262, 39, 14, 25, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L2_256_COL | MODE_L3_256_COL | MODE_L4_256_COL | MODE_L5_256_COL) }, \ { "256x240", HDMI_Unknown, 256, 240, 341, 262, 39, 14, 25, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L2_256_COL | MODE_L3_256_COL | MODE_L4_256_COL | MODE_L5_256_COL) }, \
{ "240p", 720, 240, 858, 262, 57, 15, 62, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) }, \ { "240p", HDMI_Unknown, 720, 240, 858, 262, 57, 15, 62, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) }, \
/* 288p modes */ \ /* 288p modes */ \
{ "1536x240L", 1536, 240, 2046, 312, 234, 41, 150, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L5_GEN_4_3 | MODE_PLLDIVBY2) }, \ { "1536x240L", HDMI_Unknown, 1536, 240, 2046, 312, 234, 41, 150, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L5_GEN_4_3 | MODE_PLLDIVBY2) }, \
{ "1280x288", 1280, 288, 1560, 312, 170, 15, 72, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2) }, \ { "1280x288", HDMI_Unknown, 1280, 288, 1560, 312, 170, 15, 72, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2) }, \
{ "960x288", 960, 288, 1170, 312, 128, 15, 54, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L3_GEN_4_3 | MODE_PLLDIVBY2) }, \ { "960x288", HDMI_Unknown, 960, 288, 1170, 312, 128, 15, 54, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L3_GEN_4_3 | MODE_PLLDIVBY2) }, \
{ "320x240LB", 320, 240, 426, 312, 49, 41, 31, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L2_320_COL | MODE_L3_320_COL | MODE_L4_320_COL | MODE_L5_320_COL) }, \ { "320x240LB", HDMI_Unknown, 320, 240, 426, 312, 49, 41, 31, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L2_320_COL | MODE_L3_320_COL | MODE_L4_320_COL | MODE_L5_320_COL) }, \
{ "256x240LB", 256, 240, 341, 312, 39, 41, 25, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L2_256_COL | MODE_L3_256_COL | MODE_L4_256_COL | MODE_L5_256_COL) }, \ { "256x240LB", HDMI_Unknown, 256, 240, 341, 312, 39, 41, 25, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_L2_256_COL | MODE_L3_256_COL | MODE_L4_256_COL | MODE_L5_256_COL) }, \
{ "288p", 720, 288, 864, 312, 69, 19, 63, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) }, \ { "288p", HDMI_Unknown, 720, 288, 864, 312, 69, 19, 63, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_240P, (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) }, \
/* 384p: Sega Model 2 */ \ /* 384p: Sega Model 2 */ \
{ "384p", 496, 384, 640, 423, 50, 29, 62, 3, (VIDEO_EDTV), GROUP_384P, (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) }, \ { "384p", HDMI_Unknown, 496, 384, 640, 423, 50, 29, 62, 3, (VIDEO_EDTV), GROUP_384P, (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) }, \
/* 640x400, VGA Mode 13h */ \ /* 640x400, VGA Mode 13h */ \
{ "640x400", 640, 400, 800, 449, 48, 36, 96, 2, VIDEO_PC, GROUP_384P, (MODE_PT | MODE_L2) }, \ { "640x400", HDMI_Unknown, 640, 400, 800, 449, 48, 36, 96, 2, VIDEO_PC, GROUP_384P, (MODE_PT | MODE_L2) }, \
/* 384p: X68k @ 24kHz */ \ /* 384p: X68k @ 24kHz */ \
{ "640x384", 640, 384, 800, 492, 48, 63, 96, 2, VIDEO_PC, GROUP_384P, (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) }, \ { "640x384", HDMI_Unknown, 640, 384, 800, 492, 48, 63, 96, 2, VIDEO_PC, GROUP_384P, (MODE_PT | MODE_L2 | MODE_PLLDIVBY2) }, \
/* ~525-line modes */ \ /* ~525-line modes */ \
{ "480i", 720, 240, 858, 525, 57, 15, 62, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_480I, (MODE_PT | MODE_L2 | MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2 | MODE_INTERLACED) }, \ { "480i", HDMI_Unknown, 720, 240, 858, 525, 57, 15, 62, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_480I, (MODE_PT | MODE_L2 | MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2 | MODE_INTERLACED) }, \
{ "480p", 720, 480, 858, 525, 60, 30, 62, 6, (VIDEO_EDTV | VIDEO_PC), GROUP_480P, (MODE_PT | MODE_L2) }, \ { "480p", HDMI_Unknown, 720, 480, 858, 525, 60, 30, 62, 6, (VIDEO_EDTV | VIDEO_PC), GROUP_480P, (MODE_PT | MODE_L2) }, \
{ "640x480", 640, 480, 800, 525, 48, 33, 96, 2, (VIDEO_PC | VIDEO_EDTV), GROUP_480P, (MODE_PT | MODE_L2) }, \ { "640x480", HDMI_Unknown, 640, 480, 800, 525, 48, 33, 96, 2, (VIDEO_PC | VIDEO_EDTV), GROUP_480P, (MODE_PT | MODE_L2) }, \
/* X68k @ 31kHz */ \ /* X68k @ 31kHz */ \
{ "640x512", 640, 512, 800, 568, 48, 28, 96, 2, (VIDEO_PC | VIDEO_EDTV), GROUP_480P, (MODE_PT | MODE_L2) }, \ { "640x512", HDMI_Unknown, 640, 512, 800, 568, 48, 28, 96, 2, (VIDEO_PC | VIDEO_EDTV), GROUP_480P, (MODE_PT | MODE_L2) }, \
/* ~625-line modes */ \ /* ~625-line modes */ \
{ "576i", 720, 288, 864, 625, 69, 19, 63, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_480I, (MODE_PT | MODE_L2 | MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2 | MODE_INTERLACED) }, \ { "576i", HDMI_Unknown, 720, 288, 864, 625, 69, 19, 63, 3, (VIDEO_SDTV | VIDEO_PC), GROUP_480I, (MODE_PT | MODE_L2 | MODE_L3_GEN_16_9 | MODE_L4_GEN_4_3 | MODE_PLLDIVBY2 | MODE_INTERLACED) }, \
{ "576p", 720, 576, 864, 625, 68, 39, 64, 5, VIDEO_EDTV, GROUP_480P, (MODE_PT | MODE_L2) }, \ { "576p", HDMI_Unknown, 720, 576, 864, 625, 68, 39, 64, 5, VIDEO_EDTV, GROUP_480P, (MODE_PT | MODE_L2) }, \
{ "800x600", 800, 600, 1056, 628, 88, 23, 128, 4, VIDEO_PC, GROUP_NONE, MODE_PT }, \ { "800x600", HDMI_Unknown, 800, 600, 1056, 628, 88, 23, 128, 4, VIDEO_PC, GROUP_NONE, MODE_PT }, \
/* 720p modes */ \ /* 720p modes */ \
{ "720p", 1280, 720, 1650, 750, 220, 20, 40, 5, (VIDEO_HDTV | VIDEO_PC), GROUP_NONE, MODE_PT }, \ { "720p", HDMI_Unknown, 1280, 720, 1650, 750, 220, 20, 40, 5, (VIDEO_HDTV | VIDEO_PC), GROUP_NONE, MODE_PT }, \
/* VESA XGA and SXGA modes */ \ /* VESA XGA and SXGA modes */ \
{ "1024x768", 1024, 768, 1344, 806, 160, 29, 136, 6, VIDEO_PC, GROUP_NONE, MODE_PT }, \ { "1024x768", HDMI_Unknown, 1024, 768, 1344, 806, 160, 29, 136, 6, VIDEO_PC, GROUP_NONE, MODE_PT }, \
{ "1280x1024", 1280, 1024, 1688, 1066, 248, 38, 112, 3, VIDEO_PC, GROUP_NONE, MODE_PT }, \ { "1280x1024", HDMI_Unknown, 1280, 1024, 1688, 1066, 248, 38, 112, 3, VIDEO_PC, GROUP_NONE, MODE_PT }, \
/* PS2 GSM 960i mode */ \ /* PS2 GSM 960i mode */ \
{ "640x960i", 640, 480, 800, 1050, 48, 33, 96, 2, (VIDEO_EDTV | VIDEO_PC), GROUP_1080I, (MODE_PT | MODE_L2 | MODE_INTERLACED) }, \ { "640x960i", HDMI_Unknown, 640, 480, 800, 1050, 48, 33, 96, 2, (VIDEO_EDTV | VIDEO_PC), GROUP_1080I, (MODE_PT | MODE_L2 | MODE_INTERLACED) }, \
/* 1080i/p modes */ \ /* 1080i/p modes */ \
{ "1080i", 1920, 540, 2200, 1125, 148, 16, 44, 5, (VIDEO_HDTV | VIDEO_PC), GROUP_1080I, (MODE_PT | MODE_L2 | MODE_INTERLACED) }, \ { "1080i", HDMI_Unknown, 1920, 540, 2200, 1125, 148, 16, 44, 5, (VIDEO_HDTV | VIDEO_PC), GROUP_1080I, (MODE_PT | MODE_L2 | MODE_INTERLACED) }, \
{ "1080p", 1920, 1080, 2200, 1125, 148, 36, 44, 5, (VIDEO_HDTV | VIDEO_PC), GROUP_NONE, MODE_PT }, \ { "1080p", HDMI_Unknown, 1920, 1080, 2200, 1125, 148, 36, 44, 5, (VIDEO_HDTV | VIDEO_PC), GROUP_NONE, MODE_PT }, \
/* VESA UXGA with 49 H.backporch cycles exchanged for H.synclen */ \ /* VESA UXGA with 49 H.backporch cycles exchanged for H.synclen */ \
{ "1600x1200", 1600, 1200, 2160, 1250, 255, 46, 241, 3, VIDEO_PC, GROUP_NONE, MODE_PT }, \ { "1600x1200", HDMI_Unknown, 1600, 1200, 2160, 1250, 255, 46, 241, 3, VIDEO_PC, GROUP_NONE, MODE_PT }, \
} }
#define VIDEO_MODES_SIZE (sizeof((mode_data_t[])VIDEO_MODES_DEF)) #define VIDEO_MODES_SIZE (sizeof((mode_data_t[])VIDEO_MODES_DEF))
@ -148,16 +150,16 @@ typedef struct {
#define VIDEO_MODES_VGEN { \ #define VIDEO_MODES_VGEN { \
{ "480p STD", 720, 480, 858, 525, 60, 30, 62, 6, (VIDEO_EDTV), 0, 0 }, \ { "480p STD", HDMI_480p60, 720, 480, 858, 525, 60, 30, 62, 6, (VIDEO_EDTV), 0, 0 }, \
{ "576p STD", 720, 576, 864, 625, 68, 39, 64, 5, (VIDEO_EDTV), 0, 0 }, \ { "576p STD", HDMI_576p50, 720, 576, 864, 625, 68, 39, 64, 5, (VIDEO_EDTV), 0, 0 }, \
{ "480i STD", 720, 240, 858, 525, 57, 15, 62, 3, (VIDEO_SDTV), 0, MODE_INTERLACED }, \ { "480i STD", HDMI_480i60, 720, 240, 858, 525, 57, 15, 62, 3, (VIDEO_SDTV), 0, MODE_INTERLACED }, \
{ "576i STD", 720, 288, 864, 625, 69, 19, 63, 3, (VIDEO_SDTV), 0, MODE_INTERLACED }, \ { "576i STD", HDMI_576i50, 720, 288, 864, 625, 69, 19, 63, 3, (VIDEO_SDTV), 0, MODE_INTERLACED }, \
{ "480p Bob", 720, 480, 858, 525, 60, 30, 62, 6, (VIDEO_EDTV), 1, 0 }, \ { "480p Bob", HDMI_Unknown, 720, 480, 858, 525, 60, 30, 62, 6, (VIDEO_EDTV), 1, 0 }, \
{ "480p 59.5", 720, 480, 858, 529, 60, 30, 62, 6, (VIDEO_EDTV), 3, 0 }, \ { "480p 59.5", HDMI_Unknown, 720, 480, 858, 529, 60, 30, 62, 6, (VIDEO_EDTV), 3, 0 }, \
{ "480p 60.5", 720, 480, 858, 520, 60, 30, 62, 6, (VIDEO_EDTV), 3, 0 }, \ { "480p 60.5", HDMI_Unknown, 720, 480, 858, 520, 60, 30, 62, 6, (VIDEO_EDTV), 3, 0 }, \
{ "480p 55.0", 720, 480, 858, 572, 60, 30, 62, 6, (VIDEO_EDTV), 3, 0 }, \ { "480p 55.0", HDMI_Unknown, 720, 480, 858, 572, 60, 30, 62, 6, (VIDEO_EDTV), 3, 0 }, \
{ "400p 70.0", 640, 400, 800, 449, 48, 36, 96, 2, VIDEO_PC, 3, 0 }, \ { "400p 70.0", HDMI_Unknown, 640, 400, 800, 449, 48, 36, 96, 2, VIDEO_PC, 3, 0 }, \
{ "960p", 720, 2*480, 858, 2*525, 60, 2*30, 62, 2*6, VIDEO_HDTV, 2, 0 }, \ { "960p", HDMI_Unknown, 720, 2*480, 858, 2*525, 60, 2*30, 62, 2*6, VIDEO_HDTV, 2, 0 }, \
} }
#define VIDEO_MODES_VGEN_CNT (sizeof((mode_data_t[])VIDEO_MODES_VGEN)/sizeof(mode_data_t)) #define VIDEO_MODES_VGEN_CNT (sizeof((mode_data_t[])VIDEO_MODES_VGEN)/sizeof(mode_data_t))

4
software/sys_controller_bsp/settings.bsp
View File

@ -2,8 +2,8 @@
<sch:Settings xmlns:sch="http://www.altera.com/embeddedsw/bsp/schema"> <sch:Settings xmlns:sch="http://www.altera.com/embeddedsw/bsp/schema">
<BspType>hal</BspType> <BspType>hal</BspType>
<BspVersion>default</BspVersion> <BspVersion>default</BspVersion>
<BspGeneratedTimeStamp>Sep 10, 2018 8:39:50 PM</BspGeneratedTimeStamp> <BspGeneratedTimeStamp>Jul 1, 2019 7:53:20 PM</BspGeneratedTimeStamp>
<BspGeneratedUnixTimeStamp>1536601190499</BspGeneratedUnixTimeStamp> <BspGeneratedUnixTimeStamp>1562000000231</BspGeneratedUnixTimeStamp>
<BspGeneratedLocation>./</BspGeneratedLocation> <BspGeneratedLocation>./</BspGeneratedLocation>
<BspSettingsFile>settings.bsp</BspSettingsFile> <BspSettingsFile>settings.bsp</BspSettingsFile>
<SopcDesignFile>../../sys.sopcinfo</SopcDesignFile> <SopcDesignFile>../../sys.sopcinfo</SopcDesignFile>

4
sys.sopcinfo
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<EnsembleReport name="sys" kind="sys" version="1.0" fabric="QSYS"> <EnsembleReport name="sys" kind="sys" version="1.0" fabric="QSYS">
<!-- Format version 17.1 590 (Future versions may contain additional information.) --> <!-- Format version 17.1 590 (Future versions may contain additional information.) -->
<!-- 2018.09.10.20:51:26 --> <!-- 2019.07.01.19:46:46 -->
<!-- A collection of modules and connections --> <!-- A collection of modules and connections -->
<parameter name="AUTO_GENERATION_ID"> <parameter name="AUTO_GENERATION_ID">
<type>java.lang.Integer</type> <type>java.lang.Integer</type>
<value>1536601885</value> <value>1561999606</value>
<derived>false</derived> <derived>false</derived>
<enabled>true</enabled> <enabled>true</enabled>
<visible>false</visible> <visible>false</visible>