OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

common_source_project-fm7: Commit

Common Source Code Project for Qt (a.k.a for FM-7).


Commit MetaInfo

Revisiond5c85e2da19eb42779389a41996513bcfb326b97 (tree)
Zeit2023-02-07 19:52:53
AutorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM][EMU][Qt] Fix FTBFS.

Ändern Zusammenfassung

Diff

--- a/source/src/emu.cpp
+++ b/source/src/emu.cpp
@@ -2983,7 +2983,7 @@ void EMU::open_hard_disk(int drv, const _TCHAR* file_path)
29832983 #else
29842984 out_message(_T("HD: Unmounted"));
29852985 #endif
2986- osdcall_int((EMU_MEDIA_TYPE::HARD_DISK,
2986+ osdcall_int(EMU_MEDIA_TYPE::HARD_DISK,
29872987 drv,
29882988 EMU_MESSAGE_TYPE::MEDIA_REMOVED,
29892989 0);
@@ -3014,7 +3014,7 @@ void EMU::close_hard_disk(int drv)
30143014 #else
30153015 out_message(_T("HD: Unmounted"));
30163016 #endif
3017- osdcall_int((EMU_MEDIA_TYPE::HARD_DISK,
3017+ osdcall_int(EMU_MEDIA_TYPE::HARD_DISK,
30183018 drv,
30193019 EMU_MESSAGE_TYPE::MEDIA_REMOVED,
30203020 0);
@@ -3396,7 +3396,7 @@ void EMU::open_bubble_casette(int drv, const _TCHAR* file_path, int bank)
33963396 #else
33973397 out_message(_T("Bubble: %s"), file_path);
33983398 #endif
3399- osdcall_string(EMU_MEDIA_TYPE::BUBBLE_CASETTE | (bank & EMU_MEDIA_TYPE::MULIPLE_SLOT_MASK),
3399+ osdcall_string(EMU_MEDIA_TYPE::BUBBLE_CASETTE | (bank & EMU_MEDIA_TYPE::MULTIPLE_SLOT_MASK),
34003400 drv,
34013401 EMU_MESSAGE_TYPE::MEDIA_MOUNTED,
34023402 (_TCHAR*)file_path);
--- a/source/src/vm/fmtowns/crtc.cpp
+++ b/source/src/vm/fmtowns/crtc.cpp
@@ -29,7 +29,7 @@ enum {
2929 EVENT_CRTC_VDE = 34,
3030 EVENT_CRTC_HDS = 36,
3131 EVENT_CRTC_HDE = 38,
32-
32+
3333 };
3434
3535
@@ -55,7 +55,7 @@ void TOWNS_CRTC::initialize()
5555 event_id_vde[i] = -1;
5656 event_id_hds[i] = -1;
5757 event_id_hde[i] = -1;
58- }
58+ }
5959 for(int i = 0; i < 4; i++) {
6060 for(int l = 0; l < TOWNS_CRTC_MAX_LINES; l++) {
6161 memset(&(linebuffers[i][l]), 0x00, sizeof(linebuffer_t));
@@ -81,7 +81,7 @@ void TOWNS_CRTC::reset()
8181 // initialize
8282 display_enabled = true;
8383 vsync = hsync = false;
84- fo1_offset_value = 0;
84+ fo1_offset_value = 0;
8585 // memset(regs, 0, sizeof(regs));
8686 crtc_ch = 0;
8787 sprite_offset = 0x00000;
@@ -91,7 +91,7 @@ void TOWNS_CRTC::reset()
9191 // crtc_clock = 28.6363e6; // OK?
9292 interlace_field = false;
9393 is_compatible = true;
94-
94+
9595 line_count[0] = line_count[1] = 0;
9696 vert_line_count = -1;
9797 display_linebuf = 0;
@@ -110,7 +110,7 @@ void TOWNS_CRTC::reset()
110110 uint16_t r = ((i & 2) != 0) ? 0x7f : 0;
111111 uint16_t g = ((i & 4) != 0) ? 0x7f : 0;
112112 uint16_t b = ((i & 1) != 0) ? 0x7f : 0;
113-
113+
114114 if((i & 8) != 0) {
115115 r <<= 1;
116116 b <<= 1;
@@ -128,7 +128,7 @@ void TOWNS_CRTC::reset()
128128 apalette_16_rgb[0][i][TOWNS_CRTC_PALETTE_R] = r;
129129 apalette_16_rgb[0][i][TOWNS_CRTC_PALETTE_G] = g;
130130 apalette_16_rgb[0][i][TOWNS_CRTC_PALETTE_B] = b;
131-
131+
132132 apalette_16_rgb[1][i][TOWNS_CRTC_PALETTE_R] = r;
133133 apalette_16_rgb[1][i][TOWNS_CRTC_PALETTE_G] = g;
134134 apalette_16_rgb[1][i][TOWNS_CRTC_PALETTE_B] = b;
@@ -169,7 +169,7 @@ void TOWNS_CRTC::reset()
169169 zoom_factor_vert[i] = 1;
170170 zoom_factor_horiz[i] = 1;
171171 zoom_count_vert[i] = 1;
172- }
172+ }
173173 for(int i = 0; i < 2; i++) {
174174 crtout[i] = true;
175175 crtout_top[i] = true;
@@ -195,7 +195,7 @@ void TOWNS_CRTC::reset()
195195 cancel_event_by_id(event_id_vsync);
196196 cancel_event_by_id(event_id_vstart);
197197 cancel_event_by_id(event_id_vst1);
198- cancel_event_by_id(event_id_vst2);
198+ cancel_event_by_id(event_id_vst2);
199199 cancel_event_by_id(event_id_hstart);
200200
201201 for(int i = 0; i < 2; i++) {
@@ -210,7 +210,7 @@ void TOWNS_CRTC::reset()
210210 set_frames_per_sec(FRAMES_PER_SEC); // Its dummy.
211211 set_lines_per_frame(512);
212212 //set_pixels_per_line(640);
213-
213+
214214 write_signals(&outputs_int_vsync, 0x0);
215215
216216 hst_tmp = 640;
@@ -433,7 +433,7 @@ void TOWNS_CRTC::force_recalc_crtc_param(void)
433433 horiz_width_nega_us = crtc_clock * ((double)(regs[1] & 0x00fe)); // HSW2
434434 horiz_us = crtc_clock * ((double)((regs[4] & 0x07fe) + 1)); // HST
435435 double horiz_ref = horiz_us / 2.0;
436-
436+
437437 vst1_us = ((double)(regs[5] & 0x1f)) * horiz_ref; // VST1
438438 vst2_us = ((double)(regs[6] & 0x1f)) * horiz_ref; // VST2
439439 eet_us = ((double)(regs[7] & 0x1f)) * horiz_ref; // EET
@@ -443,7 +443,7 @@ void TOWNS_CRTC::force_recalc_crtc_param(void)
443443 } else {
444444 frame_us = 1.0e6 / FRAMES_PER_SEC;
445445 set_frames_per_sec(FRAMES_PER_SEC); // Its dummy.
446- }
446+ }
447447 // out_debug_log(_T("RECALC PARAM: horiz_us=%f frame_us=%f"), horiz_us, frame_us);
448448 for(int layer = 0; layer < 2; layer++) {
449449 vert_offset_tmp[layer] = (int)(regs[(layer << 1) + 13] & 0x07ff) - (int)(regs[6] & 0x1f);
@@ -453,7 +453,7 @@ void TOWNS_CRTC::force_recalc_crtc_param(void)
453453 horiz_start_us[layer] = ((double)(regs[(layer << 1) + 9] & 0x07ff)) * crtc_clock ; // HDSx
454454 horiz_end_us[layer] = ((double)(regs[(layer << 1) + 9 + 1] & 0x07ff)) * crtc_clock ; // HDEx
455455 }
456-
456+
457457 hst_tmp = (regs[4] & 0x7fe) + 1;
458458 vst_tmp = (regs[8] & 0x7ff) + 1;
459459 if((voutreg_ctrl & 0x10) == 0) {
@@ -509,7 +509,7 @@ void TOWNS_CRTC::write_io8(uint32_t addr, uint32_t data)
509509 write_io16(addr, rdata.w);
510510 }
511511 break;
512-
512+
513513 case 0x0448:
514514 voutreg_num = data & 0x01;
515515 break;
@@ -518,7 +518,7 @@ void TOWNS_CRTC::write_io8(uint32_t addr, uint32_t data)
518518 voutreg_ctrl = data;
519519 } else if(voutreg_num == 1) {
520520 voutreg_prio = data;
521- }
521+ }
522522 break;
523523 case 0x044c:
524524 break;
@@ -609,7 +609,7 @@ void TOWNS_CRTC::write_io16(uint32_t addr, uint32_t data)
609609 case 3: // LOx
610610 line_offset[localch] = (uint32_t)(data & 0xffff);
611611 break;
612- }
612+ }
613613 // }
614614 } else { // All reg
615615 // if(regs[crtc_ch] != (uint16_t)data) {
@@ -741,7 +741,7 @@ uint32_t TOWNS_CRTC::read_io16(uint32_t addr)
741741 switch(addr & 0xfffe) {
742742 case 0x0442:
743743 /* if(crtc_ch == 21) { // FO1
744- return ((regs[21] & 0x7fff) + fo1_offset_value);
744+ return ((regs[21] & 0x7fff) + fo1_offset_value);
745745 } else */if(crtc_ch == 30) {
746746 return (uint32_t)read_reg30();
747747 } else {
@@ -792,7 +792,7 @@ uint32_t TOWNS_CRTC::read_io8(uint32_t addr)
792792 return voutreg_ctrl;
793793 } else if(voutreg_num == 1) {
794794 return voutreg_prio;
795- }
795+ }
796796 break;
797797 case 0x044c:
798798 {
@@ -844,14 +844,14 @@ uint32_t TOWNS_CRTC::read_io8(uint32_t addr)
844844 return 0x00;
845845 }
846846 break;
847- }
847+ }
848848 return 0xff;
849849 }
850850
851851 bool TOWNS_CRTC::render_32768(scrntype_t* dst, scrntype_t *mask, int y, int layer, bool do_alpha)
852852 {
853853 __UNLIKELY_IF(dst == nullptr) return false;
854-
854+
855855 int trans = (display_linebuf == 0) ? display_linebuf_mask : ((display_linebuf - 1) & display_linebuf_mask);
856856 // int trans = display_linebuf & 3;
857857 int magx = linebuffers[trans][y].mag[layer];
@@ -889,9 +889,9 @@ bool TOWNS_CRTC::render_32768(scrntype_t* dst, scrntype_t *mask, int y, int laye
889889 __DECL_ALIGNED(32) uint8_t a2buf[8];
890890 pair16_t ptmp16;
891891 int rwidth = pwidth & 7;
892-
892+
893893 int k = 0;
894-
894+
895895 for(int x = 0; x < (pwidth >> 3); x++) {
896896 __DECL_VECTORIZED_LOOP
897897 for(int i = 0; i < 8; i++) {
@@ -904,12 +904,12 @@ __DECL_VECTORIZED_LOOP
904904 rbuf[i] = pbuf[i];
905905 gbuf[i] = pbuf[i];
906906 bbuf[i] = pbuf[i];
907- }
907+ }
908908 __DECL_VECTORIZED_LOOP
909909 for(int i = 0; i < 8; i++) {
910910 rbuf[i] = rbuf[i] >> 5;
911911 gbuf[i] = gbuf[i] >> 10;
912- }
912+ }
913913 __DECL_VECTORIZED_LOOP
914914 for(int i = 0; i < 8; i++) {
915915 rbuf[i] = rbuf[i] & 0x1f;
@@ -989,7 +989,7 @@ __DECL_VECTORIZED_LOOP
989989 for(int ii = 0; ii < magx; ii++) {
990990 *q++ = sbuf[i];
991991 }
992-
992+
993993 }
994994 __LIKELY_IF(r2 != nullptr) {
995995 __DECL_VECTORIZED_LOOP
@@ -1027,14 +1027,14 @@ __DECL_VECTORIZED_LOOP
10271027 }
10281028 }
10291029 __LIKELY_IF(k >= width) return true;
1030-
1030+
10311031 __UNLIKELY_IF((pwidth & 7) != 0) {
10321032
10331033 __DECL_VECTORIZED_LOOP
10341034 for(int i = 0; i < 8; i++) {
10351035 pbuf[i] = 0x8000;
10361036 }
1037-
1037+
10381038 for(int i = 0; i < rwidth; i++) {
10391039 ptmp16.read_2bytes_le_from(p);
10401040 pbuf[i] = ptmp16.w;
@@ -1046,7 +1046,7 @@ __DECL_VECTORIZED_LOOP
10461046 rbuf[i] = pbuf[i];
10471047 gbuf[i] = pbuf[i];
10481048 bbuf[i] = pbuf[i];
1049- }
1049+ }
10501050
10511051 __DECL_VECTORIZED_LOOP
10521052 for(int i = 0; i < 8; i++) {
@@ -1079,7 +1079,7 @@ __DECL_VECTORIZED_LOOP
10791079 for(int i = 0; i < 8; i++) {
10801080 sbuf[i] = RGBA_COLOR(rbuf[i], gbuf[i], bbuf[i], 255);
10811081 }
1082- }
1082+ }
10831083 __UNLIKELY_IF(magx == 1) {
10841084 for(int i = 0; i < rwidth; i++) {
10851085 *q++ = sbuf[i];
@@ -1154,7 +1154,7 @@ bool TOWNS_CRTC::render_256(scrntype_t* dst, int y)
11541154
11551155 __DECL_ALIGNED(32) scrntype_t apal256[256];
11561156 my_memcpy(apal256, apalette_256_pixel, sizeof(scrntype_t) * 256);
1157-
1157+
11581158 __DECL_ALIGNED(16) uint8_t pbuf[16];
11591159 __DECL_ALIGNED(32) scrntype_t sbuf[16];
11601160 // out_debug_log(_T("Y=%d MAGX=%d WIDTH=%d pWIDTH=%d"), y, magx, width, pwidth);
@@ -1322,13 +1322,13 @@ bool TOWNS_CRTC::render_16(scrntype_t* dst, scrntype_t *mask, scrntype_t* pal, i
13221322 __DECL_ALIGNED(32) scrntype_t sbuf[16];
13231323 __DECL_ALIGNED(32) scrntype_t abuf[16];
13241324 __DECL_ALIGNED(32) scrntype_t a2buf[16];
1325-
1325+
13261326 __DECL_ALIGNED(32) scrntype_t palbuf[16];
13271327 uint8_t pmask = linebuffers[trans][y].r50_planemask & 0x0f;
13281328 __DECL_VECTORIZED_LOOP
13291329 for(int i = 0; i < 16; i++) {
13301330 mbuf[i] = pmask;
1331- }
1331+ }
13321332 __UNLIKELY_IF(pal == nullptr) {
13331333 __DECL_ALIGNED(16) uint8_t tmp_r[16];
13341334 __DECL_ALIGNED(16) uint8_t tmp_g[16];
@@ -1362,7 +1362,7 @@ __DECL_VECTORIZED_LOOP
13621362 RGBA_COLOR(255, 255, 255, 255),
13631363 RGBA_COLOR(255, 255, 255, 255),
13641364 RGBA_COLOR(255, 255, 255, 255),
1365-
1365+
13661366 RGBA_COLOR(255, 255, 255, 255),
13671367 RGBA_COLOR(255, 255, 255, 255),
13681368 RGBA_COLOR(255, 255, 255, 255),
@@ -1378,7 +1378,7 @@ __DECL_VECTORIZED_LOOP
13781378 RGBA_COLOR(255, 255, 255, 255),
13791379 RGBA_COLOR(255, 255, 255, 255)
13801380 };
1381-
1381+
13821382 int k = 0;
13831383 pwidth = pwidth / 2; // 20201210 K.O
13841384 for(int x = 0; x < (pwidth >> 3); x++) {
@@ -1389,11 +1389,11 @@ __DECL_VECTORIZED_LOOP
13891389 __DECL_VECTORIZED_LOOP
13901390 for(int i = 0; i < 16; i += 2) {
13911391 hlbuf[i] = pbuf[i >> 1];
1392- }
1392+ }
13931393 __DECL_VECTORIZED_LOOP
13941394 for(int i = 0; i < 16; i += 2) {
13951395 hlbuf[i + 1] = hlbuf[i];
1396- }
1396+ }
13971397 __DECL_VECTORIZED_LOOP
13981398 for(int i = 0; i < 16; i += 2) {
13991399 hlbuf[i + 1] >>= 4;
@@ -1553,8 +1553,8 @@ __DECL_VECTORIZED_LOOP
15531553 __UNLIKELY_IF(k >= TOWNS_CRTC_MAX_PIXELS) break;
15541554 }
15551555 __UNLIKELY_IF(k >= TOWNS_CRTC_MAX_PIXELS) break;
1556- }
1557- } else {
1556+ }
1557+ } else {
15581558 ah = (tmph == 0) ? RGBA_COLOR(0, 0, 0, 0) : RGBA_COLOR(255, 255, 255, 255);
15591559 al = (tmpl == 0) ? RGBA_COLOR(0, 0, 0, 0) : RGBA_COLOR(255, 255, 255, 255);
15601560 if(magx == 1) {
@@ -1612,7 +1612,7 @@ void TOWNS_CRTC::mix_screen(int y, int width, bool do_mix0, bool do_mix1)
16121612 __UNLIKELY_IF(width <= 0) return;
16131613
16141614 int trans = (display_linebuf == 0) ? display_linebuf_mask : ((display_linebuf - 1) & display_linebuf_mask);
1615-
1615+
16161616 int bitshift0 = linebuffers[trans][y].bitshift[0];
16171617 int bitshift1 = linebuffers[trans][y].bitshift[1];
16181618 scrntype_t *pp = osd->get_vm_screen_buffer(y);
@@ -1687,7 +1687,7 @@ __DECL_VECTORIZED_LOOP
16871687 }
16881688 pp += 8;
16891689 }
1690-#if 0
1690+#if 0
16911691 int rrwidth = width & 7;
16921692 if(rrwidth > 0) {
16931693 scrntype_t pix0, pix1, mask0, mask1;
@@ -1747,7 +1747,7 @@ void TOWNS_CRTC::draw_screen()
17471747 // Will remove.
17481748 __UNLIKELY_IF(lines <= 0) lines = 1;
17491749 __UNLIKELY_IF(width <= 16) width = 16;
1750-
1750+
17511751 __UNLIKELY_IF(lines > TOWNS_CRTC_MAX_LINES) lines = TOWNS_CRTC_MAX_LINES;
17521752 __UNLIKELY_IF(width > TOWNS_CRTC_MAX_PIXELS) width = TOWNS_CRTC_MAX_PIXELS;
17531753 osd->set_vm_screen_size(width, lines, SCREEN_WIDTH, SCREEN_HEIGHT, -1, -1);
@@ -1755,7 +1755,7 @@ void TOWNS_CRTC::draw_screen()
17551755 // if((lines != vst[trans2]) || (width != hst[trans])) {
17561756 // return; // Wait (a frame) if surface attributes are changed
17571757 // }
1758-
1758+
17591759 memset(lbuffer1, 0x00, sizeof(lbuffer1));
17601760 memset(abuffer1, 0xff, sizeof(abuffer1));
17611761 memset(lbuffer0, 0x00, sizeof(lbuffer0));
@@ -1765,7 +1765,7 @@ void TOWNS_CRTC::draw_screen()
17651765 __DECL_ALIGNED(32) scrntype_t apal16[2][16];
17661766 my_memcpy(apal16[0], apalette_16_pixel[0], sizeof(scrntype_t) * 16);
17671767 my_memcpy(apal16[1], apalette_16_pixel[1], sizeof(scrntype_t) * 16);
1768-
1768+
17691769 for(int y = 0; y < lines; y++) {
17701770 bool do_mix0 = false;
17711771 bool do_mix1 = false;
@@ -1819,7 +1819,7 @@ void TOWNS_CRTC::draw_screen()
18191819 // }
18201820 mix_screen(y, width, do_mix0, do_mix1);
18211821 }
1822-
1822+
18231823 //display_linebuf = (display_linebuf + 1) & 3;
18241824 return;
18251825 }
@@ -1905,7 +1905,7 @@ void TOWNS_CRTC::render_text()
19051905 uint32_t color = attr & 0x07;
19061906 uint8_t tmpdata = 0;
19071907 if(attr & 0x20) color |= 0x08;
1908-
1908+
19091909 // Do render
19101910 // out_debug_log("ROMADDR=%08X", romaddr);
19111911 uint32_t of = addr_of;
@@ -1925,7 +1925,7 @@ void TOWNS_CRTC::render_text()
19251925 uint32_t pix = 0;
19261926 uint8_t *p = d_vram->get_vram_address(of + plane_offset);
19271927 __LIKELY_IF(p != nullptr) {
1928-
1928+
19291929 d_vram->lock();
19301930 __DECL_VECTORIZED_LOOP
19311931 for(int nb = 0; nb < 8; nb += 2) {
@@ -1953,12 +1953,12 @@ void TOWNS_CRTC::transfer_line(int line)
19531953 uint8_t ctrl, prio;
19541954 ctrl = voutreg_ctrl;
19551955 prio = voutreg_prio;
1956-
1956+
19571957 //int trans = (display_linebuf - 1) & 3;
19581958 int trans = display_linebuf & display_linebuf_mask;
19591959 __UNLIKELY_IF(linebuffers[trans] == nullptr) return;
19601960
1961-__DECL_VECTORIZED_LOOP
1961+__DECL_VECTORIZED_LOOP
19621962 for(int i = 0; i < 4; i++) {
19631963 linebuffers[trans][line].mode[i] = 0;
19641964 linebuffers[trans][line].pixels[i] = 0;
@@ -2043,7 +2043,7 @@ __DECL_VECTORIZED_LOOP
20432043 to_disp[l] = true;
20442044 address_shift[l] = 2; // FM-Towns Manual P.145
20452045 break;
2046- case 0x03:
2046+ case 0x03:
20472047 linebuffers[trans][line].mode[l] = DISPMODE_32768;
20482048 to_disp[l] = true;
20492049 address_shift[l] = 2; // FM-Towns Manual P.145
@@ -2061,11 +2061,11 @@ __DECL_VECTORIZED_LOOP
20612061 if(linebuffers[trans][line].crtout[0] == 0) {
20622062 linebuffers[trans][line].mode[page0] = DISPMODE_NONE;
20632063 to_disp[0] = false;
2064- }
2064+ }
20652065 if(linebuffers[trans][line].crtout[1] == 0) {
20662066 linebuffers[trans][line].mode[page1] = DISPMODE_NONE;
20672067 to_disp[1] = false;
2068- }*/
2068+ }*/
20692069 // Fill by skelton colors;
20702070 for(int l = 0; l < 2; l++) {
20712071 uint32_t *p = (uint32_t*)(&(linebuffers[trans][line].pixels_layer[l][0]));
@@ -2099,7 +2099,7 @@ __DECL_VECTORIZED_LOOP
20992099 uint16_t _end = regs[10 + l * 2] & 0x7ff; // HDEx
21002100 int ashift = address_shift[l];
21012101 uint32_t shift_mask = (1 << ashift) - 1;
2102-
2102+
21032103 int bit_shift = 0;
21042104 uint16_t haj = hstart_words[l];
21052105 // FAx
@@ -2137,7 +2137,7 @@ __DECL_VECTORIZED_LOOP
21372137 } else {
21382138 _x = _x - 0x8a;
21392139 _y = (_y - 0x46) >> 1;
2140- }
2140+ }
21412141 break;
21422142 default:
21432143 _x = 0;
@@ -2168,7 +2168,7 @@ __DECL_VECTORIZED_LOOP
21682168 __LIKELY_IF(_begin < _end) {
21692169 int pixels = _end - _begin;
21702170 uint8_t magx = zoom_factor_horiz[l];
2171-
2171+
21722172 int npixels = pixels;
21732173 // if((npixels % magx) != 0) npixels++;
21742174 __LIKELY_IF((pixels >= magx) && (magx != 0)){
@@ -2213,13 +2213,13 @@ __DECL_VECTORIZED_LOOP
22132213 d_vram->lock();
22142214 __UNLIKELY_IF(((offset & address_mask[l]) + tr_bytes) > address_mask[l]) {
22152215 // Wrap
2216- int __left = (address_mask[l] + 1 - (offset & address_mask[l]));
2216+ int __left = (address_mask[l] + 1 - (offset & address_mask[l]));
22172217 my_memcpy(&(linebuffers[trans][line].pixels_layer[(is_256) ? 0 : l][0])
22182218 , p
22192219 , __left);
22202220 offset = ((page_16mode != 0) ? 0x20000 : 0);
22212221 offset += address_add[l];
2222-
2222+
22232223 uint8_t *p2 = d_vram->get_vram_address(offset);
22242224 my_memcpy(&(linebuffers[trans][line].pixels_layer[(is_256) ? 0 : l][__left])
22252225 , p2
@@ -2251,7 +2251,7 @@ __DECL_VECTORIZED_LOOP
22512251
22522252 void TOWNS_CRTC::update_timing(int new_clocks, double new_frames_per_sec, int new_lines_per_frame)
22532253 {
2254-
2254+
22552255 max_lines = new_lines_per_frame;
22562256 frames_per_sec = new_frames_per_sec;
22572257 cpu_clocks = new_clocks;
@@ -2339,9 +2339,9 @@ void TOWNS_CRTC::event_frame()
23392339 //register_event(this, EVENT_CRTC_VSTART, frame_us, false, &event_id_frame); // EVENT_VSTART MOVED TO event_frame().
23402340 cancel_event_by_id(event_id_vst1);
23412341 cancel_event_by_id(event_id_vst2);
2342-
2342+
23432343 set_vsync(false, true);
2344-
2344+
23452345 if(vst1_us > 0.0) {
23462346 register_event(this, EVENT_CRTC_VST1, vst1_us, false, &event_id_vst1); // VST1
23472347 }
@@ -2351,7 +2351,7 @@ void TOWNS_CRTC::event_frame()
23512351 set_vsync(true, true);
23522352 set_vsync(false, false);
23532353 }
2354-
2354+
23552355 for(int i = 0; i < 2; i++) {
23562356 frame_in[i] = false;
23572357 cancel_event_by_id(event_id_vds[i]);
@@ -2364,7 +2364,7 @@ void TOWNS_CRTC::event_frame()
23642364 }
23652365 head_address[i] = 0;
23662366 }
2367-
2367+
23682368 cancel_event_by_id(event_id_hstart);
23692369 cancel_event_by_id(event_id_hsw);
23702370 if(horiz_us > 0.0) {
@@ -2400,13 +2400,13 @@ bool TOWNS_CRTC::get_debug_regs_info(_TCHAR *buffer, size_t buffer_len)
24002400 , vert_start_us[0], vert_start_us[1], vert_end_us[0], vert_end_us[1]
24012401 , horiz_start_us[0], horiz_start_us[1], horiz_end_us[0], horiz_end_us[1]
24022402 );
2403-
2403+
24042404 _TCHAR regstr[1024] = {0};
24052405 my_stprintf_s(regstr, sizeof(regstr) / sizeof(_TCHAR),
24062406 _T("REGS: +0 +1 +2 +3 +4 +5 +6 +7\n")
24072407 _T("------------------------------------------------------\n")
24082408 );
2409-
2409+
24102410 for(int r = 0; r < 32; r += 8) {
24112411 _TCHAR tmps[32] = {0};
24122412 my_stprintf_s(tmps, sizeof(tmps) / sizeof(_TCHAR), "+%02d: ", r);
@@ -2432,7 +2432,7 @@ bool TOWNS_CRTC::get_debug_regs_info(_TCHAR *buffer, size_t buffer_len)
24322432 , voutreg_ctrl, voutreg_prio
24332433 , crtc_ch
24342434 );
2435-
2435+
24362436 my_stprintf_s(buffer, buffer_len,
24372437 _T("%s")
24382438 _T("ZOOM[0] V=%d H=%d VCOUNT=%d / ZOOM[1] V=%d H=%d VCOUNT=%d\n")
@@ -2518,7 +2518,7 @@ void TOWNS_CRTC::event_callback(int event_id, int err)
25182518 for(int i = 0; i < 2; i++) {
25192519 cancel_event_by_id(event_id_hds[i]);
25202520 cancel_event_by_id(event_id_hde[i]);
2521-
2521+
25222522 if(horiz_start_us[i] > 0.0) {
25232523 register_event(this, EVENT_CRTC_HDS + i, horiz_start_us[i], false, &event_id_hds[i]); // HDS0
25242524 } else {
@@ -2592,7 +2592,7 @@ uint32_t TOWNS_CRTC::read_signal(int ch)
25922592 }
25932593 return 0;
25942594 }
2595-
2595+
25962596 void TOWNS_CRTC::write_signal(int ch, uint32_t data, uint32_t mask)
25972597 {
25982598 if(ch == SIG_TOWNS_CRTC_MMIO_CFF82H) {
@@ -2602,7 +2602,7 @@ void TOWNS_CRTC::write_signal(int ch, uint32_t data, uint32_t mask)
26022602 } else if(ch == SIG_TOWNS_CRTC_COMPATIBLE_MMIO) {
26032603 is_compatible = ((data & mask) != 0) ? true : false;
26042604 } else if(ch == SIG_TOWNS_CRTC_ADD_VAL_FO1) {
2605- fo1_offset_value = data & 0xffff;
2605+ fo1_offset_value = data & 0xffff;
26062606 }
26072607 }
26082608
@@ -2620,7 +2620,7 @@ bool TOWNS_CRTC::process_state(FILEIO* state_fio, bool loading)
26202620 state_fio->StateValue(machine_id);
26212621 state_fio->StateValue(cpu_id);
26222622 state_fio->StateValue(is_compatible);
2623-
2623+
26242624 state_fio->StateArray(regs, sizeof(regs), 1);
26252625 state_fio->StateArray(regs_written, sizeof(regs_written), 1);
26262626 state_fio->StateValue(crtc_ch);
@@ -2640,17 +2640,17 @@ bool TOWNS_CRTC::process_state(FILEIO* state_fio, bool loading)
26402640 state_fio->StateArray(vstart_addr, sizeof(vstart_addr), 1);
26412641 state_fio->StateArray(hstart_words, sizeof(hstart_words), 1);
26422642 state_fio->StateArray(hend_words, sizeof(hend_words), 1);
2643-
2643+
26442644 state_fio->StateArray(frame_offset, sizeof(frame_offset), 1);
26452645 state_fio->StateArray(line_offset, sizeof(line_offset), 1);
2646-
2646+
26472647 state_fio->StateArray(frame_offset_bak, sizeof(frame_offset_bak), 1);
26482648 state_fio->StateArray(line_offset_bak, sizeof(line_offset_bak), 1);
2649-
2649+
26502650 state_fio->StateArray(head_address, sizeof(head_address), 1);
26512651 state_fio->StateArray(impose_mode, sizeof(impose_mode), 1);
26522652 state_fio->StateArray(carry_enable, sizeof(carry_enable), 1);
2653-
2653+
26542654 state_fio->StateArray(zoom_factor_vert, sizeof(zoom_factor_vert), 1);
26552655 state_fio->StateArray(zoom_factor_horiz, sizeof(zoom_factor_horiz), 1);
26562656 state_fio->StateArray(zoom_count_vert, sizeof(zoom_count_vert), 1);
@@ -2658,7 +2658,7 @@ bool TOWNS_CRTC::process_state(FILEIO* state_fio, bool loading)
26582658
26592659 state_fio->StateValue(fo1_offset_value);
26602660 state_fio->StateValue(vert_line_count);
2661-
2661+
26622662 state_fio->StateValue(vsync);
26632663 state_fio->StateValue(hsync);
26642664 state_fio->StateArray(hdisp, sizeof(hdisp), 1);
@@ -2702,7 +2702,7 @@ bool TOWNS_CRTC::process_state(FILEIO* state_fio, bool loading)
27022702
27032703 state_fio->StateValue(is_sprite);
27042704 state_fio->StateValue(sprite_offset);
2705-
2705+
27062706 state_fio->StateValue(event_id_hsync);
27072707 state_fio->StateValue(event_id_hsw);
27082708 state_fio->StateValue(event_id_vsync);
@@ -2710,7 +2710,7 @@ bool TOWNS_CRTC::process_state(FILEIO* state_fio, bool loading)
27102710 state_fio->StateValue(event_id_vst2);
27112711 state_fio->StateValue(event_id_vstart);
27122712 state_fio->StateValue(event_id_hstart);
2713-
2713+
27142714 state_fio->StateArray(event_id_vds, sizeof(event_id_vds), 1);
27152715 state_fio->StateArray(event_id_vde, sizeof(event_id_vde), 1);
27162716 state_fio->StateArray(event_id_hds, sizeof(event_id_hds), 1);
Show on old repository browser