OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • 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

Revisión0d4f7f1d45a2e1db1cd33a02060c1e1ca5003633 (tree)
Tiempo2018-10-25 00:28:40
AutorK.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM] Really update to upstream 2018-10-07.

Cambiar Resumen

Diferencia incremental

--- a/source/src/vm/fp1100/fp1100.h
+++ b/source/src/vm/fp1100/fp1100.h
@@ -26,7 +26,6 @@
2626 #define SCREEN_HEIGHT 400
2727 #define WINDOW_HEIGHT_ASPECT 480
2828 #define MAX_DRIVE 4
29-#define SUPPORT_VARIABLE_TIMING
3029
3130 // device informations for win32
3231 #define SUPPORT_TV_RENDER
--- a/source/src/vm/fp200/io.cpp
+++ b/source/src/vm/fp200/io.cpp
@@ -507,51 +507,11 @@ void IO::close_tape()
507507
508508 wav_header_t wav_header;
509509 wav_chunk_t wav_chunk;
510-#if 0
511- pair_t __riff_chunk_size;
512- pair_t __fmt_chunk_size;
513- pair_t __wav_chunk_size;
514- pair16_t __fmt_id;
515- pair16_t __channels;
516- pair_t __sample_rate;
517- pair16_t __block_size;
518- pair16_t __sample_bits;
519-
520- __riff_chunk_size.d = length - 8;
521- __fmt_chunk_size.d = 16;
522- __fmt_id.u16 = 1;
523- __channels.u16 = 1;
524- __sample_rate.d = CMT_SAMPLE_RATE;
525- __block_size.u16 = 1;
526- __sample_bits.u16 = 8;
527-
528- memcpy(wav_header.riff_chunk.id, "RIFF", 4);
529- wav_header.riff_chunk.size = __riff_chunk_size.get_4bytes_le_to();
530-
531- memcpy(wav_header.wave, "WAVE", 4);
532- memcpy(wav_header.fmt_chunk.id, "fmt ", 4);
533- wav_header.fmt_chunk.size = __riff_chunk_size.get_4bytes_le_to();
534- wav_header.format_id = __fmt_id.get_2bytes_le_to();
535- wav_header.channels = __channels.get_2byte_le_to();
536- wav_header.sample_rate = __sample_rate.get_4bytes_le_to();
537- wav_header.data_speed = __sample_rate.get_4bytes_le_to();
538- wav_header.block_size = __block_size.get_2bytes_le_to();
539- wav_header.sample_bits = __sample_bits_get_2bytes_le_to();
540-
541- memcpy(wav_chunk.id, "data", 4);
542- __wav_chunk_size.d = length - sizeof(wav_header) - sizeof(wav_chunk);
543- wav_chunk.size = __wav_chunk_size.get_4bytes_le_to();
544-
545- cmt_fio->Fseek(0, FILEIO_SEEK_SET);
546- cmt_fio->Fwrite(&wav_header, sizeof(wav_header), 1);
547- cmt_fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
548-#else
549510 if(set_wav_header(&wav_header, &wav_chunk, 1, CMT_SAMPLE_RATE, 8, length)) {
550511 cmt_fio->Fseek(0, FILEIO_SEEK_SET);
551512 cmt_fio->Fwrite(&wav_header, sizeof(wav_header), 1);
552513 cmt_fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
553514 }
554-#endif
555515 }
556516 }
557517 cmt_fio->Fclose();
--- a/source/src/vm/msx/memory.h
+++ b/source/src/vm/msx/memory.h
@@ -240,7 +240,7 @@ public:
240240 void write_signal(int id, uint32_t data, uint32_t mask);
241241 #if !defined(_PX7)
242242 uint32_t read_signal(int id);
243- bool bios_ret_z80(uint16_t PC, pair_t* af, pair_t* bc, pair_t* de, pair_t* hl, pair_t* ix, pair_t* iy, uint8_t* iff1);
243+ bool bios_ret_z80(uint16_t PC, pair32_t* af, pair32_t* bc, pair32_t* de, pair32_t* hl, pair32_t* ix, pair32_t* iy, uint8_t* iff1);
244244 #endif
245245 bool process_state(FILEIO* state_fio, bool loading);
246246
--- a/source/src/vm/msx/memory_ex.h
+++ b/source/src/vm/msx/memory_ex.h
@@ -413,7 +413,7 @@ public:
413413 void write_signal(int id, uint32_t data, uint32_t mask);
414414 #if defined(FDD_PATCH_SLOT)
415415 uint32_t read_signal(int id);
416- bool bios_ret_z80(uint16_t PC, pair_t* af, pair_t* bc, pair_t* de, pair_t* hl, pair_t* ix, pair_t* iy, uint8_t* iff1);
416+ bool bios_ret_z80(uint16_t PC, pair32_t* af, pair32_t* bc, pair32_t* de, pair32_t* hl, pair32_t* ix, pair32_t* iy, uint8_t* iff1);
417417 #endif
418418 bool process_state(FILEIO* state_fio, bool loading);
419419
--- a/source/src/vm/multi8/multi8.h
+++ b/source/src/vm/multi8/multi8.h
@@ -26,7 +26,6 @@
2626 #define MAX_DRIVE 4
2727 #define UPD765A_DONT_WAIT_SEEK
2828 #define HAS_AY_3_8912
29-#define SUPPORT_VARIABLE_TIMING
3029
3130 // device informations for win32
3231 #define SUPPORT_TV_RENDER
--- a/source/src/vm/pc6001/psub.cpp
+++ b/source/src/vm/pc6001/psub.cpp
@@ -817,51 +817,11 @@ void PSUB::close_tape()
817817 }
818818 #endif
819819 uint32_t length = fio->Ftell();
820-#if 0
821- pair_t __riff_chunk_size;
822- pair_t __fmt_chunk_size;
823- pair_t __wav_chunk_size;
824- pair16_t __fmt_id;
825- pair16_t __channels;
826- pair_t __sample_rate;
827- pair16_t __block_size;
828- pair16_t __sample_bits;
829-
830- __riff_chunk_size.d = length - 8;
831- __fmt_chunk_size.d = 16;
832- __fmt_id.w = 1;
833- __channels.w = 1;
834- __sample_rate.d = sample_rate;
835- __block_size.w = 1;
836- __sample_bits.w = 8;
837-
838- memcpy(wav_header.riff_chunk.id, "RIFF", 4);
839- wav_header.riff_chunk.size = __riff_chunk_size.get_4bytes_le_to();
840-
841- memcpy(wav_header.wave, "WAVE", 4);
842- memcpy(wav_header.fmt_chunk.id, "fmt ", 4);
843- wav_header.fmt_chunk.size = __riff_chunk_size.get_4bytes_le_to();
844- wav_header.format_id = __fmt_id.get_2bytes_le_to();
845- wav_header.channels = __channels.get_2byte_le_to();
846- wav_header.sample_rate = __sample_rate.get_4bytes_le_to();
847- wav_header.data_speed = __sample_rate.get_4bytes_le_to();
848- wav_header.block_size = __block_size.get_2bytes_le_to();
849- wav_header.sample_bits = __sample_bits_get_2bytes_le_to();
850-
851- memcpy(wav_chunk.id, "data", 4);
852- __wav_chunk_size.d = length - sizeof(wav_header) - sizeof(wav_chunk);
853- wav_chunk.size = __wav_chunk_size.get_4bytes_le_to();
854-
855- fio->Fseek(0, FILEIO_SEEK_SET);
856- fio->Fwrite(&wav_header, sizeof(wav_header), 1);
857- fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
858-#else
859820 if(set_wav_header(&wav_header, &wav_chunk, 1, sample_rate, 8, length)) {
860821 fio->Fseek(0, FILEIO_SEEK_SET);
861822 fio->Fwrite(&wav_header, sizeof(wav_header), 1);
862823 fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
863824 }
864-#endif
865825 } else {
866826 fio->Fwrite(CasData, CasIndex, 1);
867827 if(is_p6t) {
--- a/source/src/vm/pc6001/sub.cpp
+++ b/source/src/vm/pc6001/sub.cpp
@@ -293,51 +293,11 @@ void SUB::close_tape()
293293 }
294294 #endif
295295 uint32_t length = fio->Ftell();
296-#if 0
297- pair_t __riff_chunk_size;
298- pair_t __fmt_chunk_size;
299- pair_t __wav_chunk_size;
300- pair16_t __fmt_id;
301- pair16_t __channels;
302- pair_t __sample_rate;
303- pair16_t __block_size;
304- pair16_t __sample_bits;
305-
306- __riff_chunk_size.d = length - 8;
307- __fmt_chunk_size.d = 16;
308- __fmt_id.w = 1;
309- __channels.w = 1;
310- __sample_rate.d = sample_rate;
311- __block_size.w = 1;
312- __sample_bits.w = 8;
313-
314- memcpy(wav_header.riff_chunk.id, "RIFF", 4);
315- wav_header.riff_chunk.size = __riff_chunk_size.get_4bytes_le_to();
316-
317- memcpy(wav_header.wave, "WAVE", 4);
318- memcpy(wav_header.fmt_chunk.id, "fmt ", 4);
319- wav_header.fmt_chunk.size = __riff_chunk_size.get_4bytes_le_to();
320- wav_header.format_id = __fmt_id.get_2bytes_le_to();
321- wav_header.channels = __channels.get_2byte_le_to();
322- wav_header.sample_rate = __sample_rate.get_4bytes_le_to();
323- wav_header.data_speed = __sample_rate.get_4bytes_le_to();
324- wav_header.block_size = __block_size.get_2bytes_le_to();
325- wav_header.sample_bits = __sample_bits_get_2bytes_le_to();
326-
327- memcpy(wav_chunk.id, "data", 4);
328- __wav_chunk_size.d = length - sizeof(wav_header) - sizeof(wav_chunk);
329- wav_chunk.size = __wav_chunk_size.get_4bytes_le_to();
330-
331- fio->Fseek(0, FILEIO_SEEK_SET);
332- fio->Fwrite(&wav_header, sizeof(wav_header), 1);
333- fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
334-#else
335296 if(set_wav_header(&wav_header, &wav_chunk, 1, sample_rate, 8, length)) {
336297 fio->Fseek(0, FILEIO_SEEK_SET);
337298 fio->Fwrite(&wav_header, sizeof(wav_header), 1);
338299 fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
339300 }
340-#endif
341301 } else {
342302 fio->Fwrite(buffer, index, 1);
343303 if(is_p6t) {
--- a/source/src/vm/pc8201/cmt.cpp
+++ b/source/src/vm/pc8201/cmt.cpp
@@ -129,53 +129,11 @@ void CMT::close_tape()
129129 uint32_t length = fio->Ftell();
130130 wav_header_t wav_header;
131131 wav_chunk_t wav_chunk;
132-#if 0
133-
134- pair_t __riff_chunk_size;
135- pair_t __fmt_chunk_size;
136- pair_t __wav_chunk_size;
137- pair16_t __fmt_id;
138- pair16_t __channels;
139- pair_t __sample_rate;
140- pair16_t __block_size;
141- pair16_t __sample_bits;
142-
143- __riff_chunk_size.d = length - 8;
144- __fmt_chunk_size.d = 16;
145- __fmt_id.w = 1;
146- __channels.w = 1;
147- __sample_rate.d = SAMPLE_RATE;
148- __block_size.w = 1;
149- __sample_bits.w = 8;
150-
151- memcpy(wav_header.riff_chunk.id, "RIFF", 4);
152- wav_header.riff_chunk.size = __riff_chunk_size.get_4bytes_le_to();
153-
154- memcpy(wav_header.wave, "WAVE", 4);
155- memcpy(wav_header.fmt_chunk.id, "fmt ", 4);
156- wav_header.fmt_chunk.size = __riff_chunk_size.get_4bytes_le_to();
157- wav_header.format_id = __fmt_id.get_2bytes_le_to();
158- wav_header.channels = __channels.get_2byte_le_to();
159- wav_header.sample_rate = __sample_rate.get_4bytes_le_to();
160- wav_header.data_speed = __sample_rate.get_4bytes_le_to();
161- wav_header.block_size = __block_size.get_2bytes_le_to();
162- wav_header.sample_bits = __sample_bits_get_2bytes_le_to();
163-
164- memcpy(wav_chunk.id, "data", 4);
165- __wav_chunk_size.d = length - sizeof(wav_header) - sizeof(wav_chunk);
166- wav_chunk.size = __wav_chunk_size.get_4bytes_le_to();
167-
168-
169- fio->Fseek(0, FILEIO_SEEK_SET);
170- fio->Fwrite(&wav_header, sizeof(wav_header), 1);
171- fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
172-#else
173132 if(set_wav_header(&wav_header, &wav_chunk, 1, SAMPLE_RATE, 8, length)) {
174133 fio->Fseek(0, FILEIO_SEEK_SET);
175134 fio->Fwrite(&wav_header, sizeof(wav_header), 1);
176135 fio->Fwrite(&wav_chunk, sizeof(wav_chunk), 1);
177136 }
178-#endif
179137 }
180138 fio->Fclose();
181139 }
Show on old repository browser