Changeset 43018
- Timestamp:
- 11/18/18 20:11:51 (5 years ago)
- Location:
- titan/titan
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/mipselport.h
r41783 r43018 254 254 if(status.bcm == 1 && status.usedirectfb == 0) 255 255 bcm_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, posx, posy, width, height, 0, 0); 256 #ifdef HAVE_HISILICON_ACCEL 257 else if(status.usedirectfb == 0) 258 dinobot_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, posx, posy, width, height, 0, 0, 0); 259 #endif 256 260 blit(); 257 261 … … 260 264 { 261 265 bcm_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, posx, posy, width, height, 0, 0); 266 #ifdef HAVE_HISILICON_ACCEL 267 dinobot_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, posx, posy, width, height, 0, 0, 0); 268 #endif 262 269 blit(); 263 270 } … … 380 387 if(status.screenanim < 10) 381 388 bcm_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, dst_left, dst_top, dst_width, dst_height, 0, 0); 389 #ifdef HAVE_HISILICON_ACCEL 390 if(status.screenanim < 10) 391 dinobot_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, dst_left, dst_top, dst_width, dst_height, 0, 0, 0); 392 #endif 382 393 else 383 394 { … … 391 402 dsleft = 0; 392 403 bcm_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, dsleft, dstop, dswidth, dsheight, dst_left, dst_top, dst_width, dst_height, 0, 0); 404 #ifdef HAVE_HISILICON_ACCEL 405 dinobot_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, dsleft, dstop, dswidth, dsheight, dst_left, dst_top, dst_width, dst_height, 0, 0, 0); 406 #endif 393 407 } 394 408 } … … 405 419 } 406 420 if(status.bcm == 1 && status.usedirectfb == 0) 421 { 407 422 bcm_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, posx, posy, width, height, 0, 0); 423 } 424 #ifdef HAVE_HISILICON_ACCEL 425 else if(status.usedirectfb == 0) 426 dinobot_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, posx, posy, width, height, 0, 0, 0); 427 #endif 408 428 else 409 429 { … … 419 439 if(status.bcm == 1 && status.usedirectfb == 0) 420 440 bcm_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, posx, posy, width, height, 0, 0); 441 #ifdef HAVE_HISILICON_ACCEL 442 else if(status.usedirectfb == 0) 443 dinobot_accel_blit(skinfb->data_phys, skinfb->width, skinfb->height, skinfb->pitch, 0, fb->data_phys, fb->width, fb->height, fb->pitch, 0, 0, skinfb->width, skinfb->height, posx, posy, width, height, 0, 0, 0); 444 #endif 421 445 } 422 446 if(doblit == 1) … … 746 770 if(mode == 0 || mode == 2) 747 771 { 748 772 //#ifdef BCM_ACCEL 749 773 if(status.bcm == 1 && tmpfb->data_phys != 0) 750 774 { 751 775 bcm_accel_fill(tmpfb->data_phys, tmpfb->width, tmpfb->height, tmpfb->pitch, posx, posy, width, height, tmpcol); 752 776 } 777 //#endif 778 #ifdef HAVE_HISILICON_ACCEL 779 else if(tmpfb->data_phys != 0) 780 { 781 dinobot_accel_fill(tmpfb->data_phys, tmpfb->width, tmpfb->height, tmpfb->pitch, posx, posy, width, height, tmpcol); 782 } 783 #endif 753 784 else 754 785 { … … 974 1005 flag = 1; 975 1006 } 1007 #ifdef HAVE_HISILICON_ACCEL 1008 else if(source_phys > 0 && target_phys >0) 1009 { 1010 dinobot_accel_blit(source_phys, qwidth, qheight, qpitch, 0, target_phys, zwidth, zheight, zpitch, 0, 0, width, height, posx, posy, scalewidth, scaleheight, 0, 0, 0); 1011 flag = 1; 1012 } 1013 #endif 976 1014 else 977 1015 { -
titan/titan/titan.c
r43014 r43018 253 253 #endif 254 254 255 #define TIMECODE "1472042241" 256 255 #define TIMECODE "1542558853" 256 257 #if !defined(HAVE_HISILICON_ACCEL) 257 258 // mipsel start 258 259 /* Apparently, surfaces must be 64-byte aligned */ … … 264 265 //gAccel *gAccel::instance; 265 266 #define BCM_ACCEL 267 #endif 268 269 #ifdef HAVE_HISILICON_ACCEL 270 extern int dinobot_accel_init(void); 271 extern void dinobot_accel_close(void); 272 extern void dinobot_accel_blit( 273 int src_addr, int src_width, int src_height, int src_stride, int src_format, 274 int dst_addr, int dst_width, int dst_height, int dst_stride, 275 int src_x, int src_y, int width, int height, 276 int dst_x, int dst_y, int dwidth, int dheight, 277 int pal_addr,int pal_size, int flags); 278 extern void dinobot_accel_fill( 279 int dst_addr, int dst_width, int dst_height, int dst_stride, 280 int x, int y, int width, int height, 281 unsigned long color); 282 extern bool dinobot_accel_has_alphablending(); 283 #endif 266 284 267 285 #ifdef BCM_ACCEL … … 803 821 initlocale(getconfig("localepath", NULL)); 804 822 805 #ifdef MIPSEL 823 //#ifdef MIPSEL 824 #ifdef BCM_ACCEL 806 825 bcm_accel_init(); 807 826 #endif 827 #ifdef HAVE_HISILICON_ACCEL 828 dinobot_accel_init(); 829 #endif 830 //#endif 808 831 809 832 fb = openfb(getconfig("fbdev", NULL), 0); … … 1027 1050 if(checkbox("ATEMIO510") == 0) 1028 1051 addtimer(&updatevfd, START, 1000, -1, NULL, NULL, NULL); 1052 1053 printf("00000000\n"); 1054 1055 setvideomode("720", 0); 1056 changefbresolution("720", 0); 1057 autoresolution(); 1058 printf("00001111\n"); 1059 1029 1060 1030 1061 if(getconfigint("firststart", NULL) == 1) … … 1082 1113 addconfig("autoscan", "0"); 1083 1114 } 1084 1085 // oe-alliance needs this 1086 setvideomode("720", 0); 1087 changefbresolution("720", 0); 1088 autoresolution(); 1089 1115 printf("111111111\n"); 1116 1090 1117 //first wizzard 1091 1118 if(getconfigint("nofirstwizzard", NULL) < 2) … … 1129 1156 textbox(_("Info"), _(msg), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 1100, 680, 30, 0); 1130 1157 free(msg); msg = NULL; 1158 printf("2222222222\n"); 1131 1159 1132 1160 writevfd(""); … … 1134 1162 drawscreen(skin, 0, 0); 1135 1163 addconfig("nofirstwizzard", "2"); 1164 printf("3333333333\n"); 1165 1136 1166 } 1137 1167 else … … 1144 1174 servicecheckret(serviceret, 0); 1145 1175 } 1176 printf("4444444444\n"); 1146 1177 1147 1178 // fixt manual start … … 1162 1193 ret = settint(getconfigint("vs_tint", NULL)); 1163 1194 videoApplySettings(); 1195 printf("555555555\n"); 1164 1196 1165 1197 #ifndef SIMULATE … … 1200 1232 //start newsletter 1201 1233 startnewsletter(1); 1234 printf("6666666666\n"); 1202 1235 1203 1236 //thumb create thread … … 1220 1253 // work 1221 1254 resettvpic(); 1222 1255 1223 1256 char* cmd = NULL; 1224 1257 #ifdef SH4 … … 1229 1262 cmd = ostrcat("/media/hdd/movie/titankey.mipsel", NULL, 0, 0); 1230 1263 #endif 1264 printf("777777777\n"); 1231 1265 1232 1266 //for atemio to unlock box with stick … … 1262 1296 } 1263 1297 free(cmd); cmd = NULL; 1298 printf("88888888888\n"); 1264 1299 1265 1300 //must called direct befor screeninfobar … … 1318 1353 } 1319 1354 } 1355 printf("9999999999\n"); 1320 1356 1321 1357 addtimer(&guestthread, START, 1000, 1, NULL, NULL, NULL); 1358 printf("9999999999111\n"); 1359 1322 1360 startinternreader(1); 1361 printf("9999999999222\n"); 1323 1362 1324 1363 screeninfobar(); 1364 printf("9999999999333\n"); 1325 1365 1326 1366 //for testign screens
Note: See TracChangeset
for help on using the changeset viewer.