• R/O
  • HTTP
  • SSH
  • HTTPS

common_source_project-fm7: 提交

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


Commit MetaInfo

修订版eae4a809254bf50abc89ab4dd389c06a9e143e91 (tree)
时间2020-02-21 01:07:48
作者K.Ohta <whatisthis.sowhat@gmai...>
CommiterK.Ohta

Log Message

[VM][FMTOWNS][TIMER] Negate polarity of RTC's BUSY signal.
[VM][FMTOWNS][TOWNS_DMAC] .

更改概述

差异

--- a/source/src/vm/fmtowns/timer.cpp
+++ b/source/src/vm/fmtowns/timer.cpp
@@ -44,7 +44,7 @@ void TIMER::reset()
4444 void TIMER::write_io8(uint32_t addr, uint32_t data)
4545 {
4646 switch(addr) {
47- case 0x60:
47+ case 0x0060:
4848 if(data & 0x80) {
4949 tmout0 = false;
5050 }
@@ -80,10 +80,10 @@ void TIMER::write_io8(uint32_t addr, uint32_t data)
8080 register_event(this, EVENT_1US_WAIT, 1.0, false, &event_wait_1us);
8181 write_signals(&outputs_halt_line, 0xffffffff);
8282 }
83- case 0x70:
83+ case 0x0070:
8484 d_rtc->write_signal(SIG_MSM58321_DATA, data, 0x0f);
8585 break;
86- case 0x80:
86+ case 0x0080:
8787 d_rtc->write_signal(SIG_MSM58321_CS, data, 0x80);
8888 d_rtc->write_signal(SIG_MSM58321_READ, data, 0x04);
8989 d_rtc->write_signal(SIG_MSM58321_WRITE, data, 0x02);
@@ -110,12 +110,12 @@ void TIMER::do_interval(void)
110110 uint32_t TIMER::read_io8(uint32_t addr)
111111 {
112112 switch(addr) {
113- case 0x26:
113+ case 0x0026:
114114 free_run_counter = (uint16_t)get_passed_usec(0);
115115 return free_run_counter & 0xff;
116- case 0x27:
116+ case 0x0027:
117117 return free_run_counter >> 8;
118- case 0x60:
118+ case 0x0060:
119119 return (tmout0 ? 1 : 0) | (tmout1 ? 2 : 0) | ((intr_reg & 7) << 2) | 0xe0;
120120 case 0x0068: //
121121 if(machine_id >= 0x0300) { // After UX*/10F/20F/40H/80H
@@ -141,8 +141,8 @@ uint32_t TIMER::read_io8(uint32_t addr)
141141 if(machine_id >= 0x0300) { // After UX*/10F/20F/40H/80H
142142 return 0x00;
143143 }
144- case 0x70:
145- return (rtc_data & 0x7f) | ((rtc_busy) ? 0 : 0x80);
144+ case 0x0070:
145+ return (rtc_data & 0x7f) | ((rtc_busy) ? 0x80 : 0x00);
146146 }
147147 return 0xff;
148148 }
--- a/source/src/vm/fmtowns/towns_dmac.cpp
+++ b/source/src/vm/fmtowns/towns_dmac.cpp
@@ -21,7 +21,7 @@ void TOWNS_DMAC::reset()
2121 void TOWNS_DMAC::write_io8(uint32_t addr, uint32_t data)
2222 {
2323 // if((addr & 0x0f) == 0x0c) out_debug_log("WRITE REG: %08X %08X", addr, data);
24- out_debug_log("WRITE REG: %04X %02X", addr, data);
24+// out_debug_log("WRITE REG: %04X %02X", addr, data);
2525 switch(addr & 0x0f) {
2626 case 0x07:
2727 dma_high_address = (data & 0xff) << 24;
@@ -221,7 +221,7 @@ void TOWNS_DMAC::write_signal(int id, uint32_t data, uint32_t mask)
221221
222222 void TOWNS_DMAC::write_via_debugger_data8(uint32_t addr, uint32_t data)
223223 {
224- out_debug_log(_T("WRITE 8BIT ADDR %08X to DATA:%02X"), addr, data);
224+// out_debug_log(_T("WRITE 8BIT ADDR %08X to DATA:%02X"), addr, data);
225225 d_mem->write_dma_data8(addr & dma_addr_mask, data);
226226 }
227227
Show on old repository browser