Common Source Code Project for Qt (a.k.a for FM-7).
| Revision | eae4a809254bf50abc89ab4dd389c06a9e143e91 (tree) |
|---|---|
| Zeit | 2020-02-21 01:07:48 |
| Autor | K.Ohta <whatisthis.sowhat@gmai...> |
| Commiter | K.Ohta |
[VM][FMTOWNS][TIMER] Negate polarity of RTC's BUSY signal.
[VM][FMTOWNS][TOWNS_DMAC] .
source/src/vm/fmtowns/timer.cpp (diff) source/src/vm/fmtowns/towns_dmac.cpp (diff)| @@ -44,7 +44,7 @@ void TIMER::reset() | ||
| 44 | 44 | void TIMER::write_io8(uint32_t addr, uint32_t data) |
| 45 | 45 | { |
| 46 | 46 | switch(addr) { |
| 47 | - case 0x60: | |
| 47 | + case 0x0060: | |
| 48 | 48 | if(data & 0x80) { |
| 49 | 49 | tmout0 = false; |
| 50 | 50 | } |
| @@ -80,10 +80,10 @@ void TIMER::write_io8(uint32_t addr, uint32_t data) | ||
| 80 | 80 | register_event(this, EVENT_1US_WAIT, 1.0, false, &event_wait_1us); |
| 81 | 81 | write_signals(&outputs_halt_line, 0xffffffff); |
| 82 | 82 | } |
| 83 | - case 0x70: | |
| 83 | + case 0x0070: | |
| 84 | 84 | d_rtc->write_signal(SIG_MSM58321_DATA, data, 0x0f); |
| 85 | 85 | break; |
| 86 | - case 0x80: | |
| 86 | + case 0x0080: | |
| 87 | 87 | d_rtc->write_signal(SIG_MSM58321_CS, data, 0x80); |
| 88 | 88 | d_rtc->write_signal(SIG_MSM58321_READ, data, 0x04); |
| 89 | 89 | d_rtc->write_signal(SIG_MSM58321_WRITE, data, 0x02); |
| @@ -110,12 +110,12 @@ void TIMER::do_interval(void) | ||
| 110 | 110 | uint32_t TIMER::read_io8(uint32_t addr) |
| 111 | 111 | { |
| 112 | 112 | switch(addr) { |
| 113 | - case 0x26: | |
| 113 | + case 0x0026: | |
| 114 | 114 | free_run_counter = (uint16_t)get_passed_usec(0); |
| 115 | 115 | return free_run_counter & 0xff; |
| 116 | - case 0x27: | |
| 116 | + case 0x0027: | |
| 117 | 117 | return free_run_counter >> 8; |
| 118 | - case 0x60: | |
| 118 | + case 0x0060: | |
| 119 | 119 | return (tmout0 ? 1 : 0) | (tmout1 ? 2 : 0) | ((intr_reg & 7) << 2) | 0xe0; |
| 120 | 120 | case 0x0068: // |
| 121 | 121 | if(machine_id >= 0x0300) { // After UX*/10F/20F/40H/80H |
| @@ -141,8 +141,8 @@ uint32_t TIMER::read_io8(uint32_t addr) | ||
| 141 | 141 | if(machine_id >= 0x0300) { // After UX*/10F/20F/40H/80H |
| 142 | 142 | return 0x00; |
| 143 | 143 | } |
| 144 | - case 0x70: | |
| 145 | - return (rtc_data & 0x7f) | ((rtc_busy) ? 0 : 0x80); | |
| 144 | + case 0x0070: | |
| 145 | + return (rtc_data & 0x7f) | ((rtc_busy) ? 0x80 : 0x00); | |
| 146 | 146 | } |
| 147 | 147 | return 0xff; |
| 148 | 148 | } |
| @@ -21,7 +21,7 @@ void TOWNS_DMAC::reset() | ||
| 21 | 21 | void TOWNS_DMAC::write_io8(uint32_t addr, uint32_t data) |
| 22 | 22 | { |
| 23 | 23 | // 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); | |
| 25 | 25 | switch(addr & 0x0f) { |
| 26 | 26 | case 0x07: |
| 27 | 27 | dma_high_address = (data & 0xff) << 24; |
| @@ -221,7 +221,7 @@ void TOWNS_DMAC::write_signal(int id, uint32_t data, uint32_t mask) | ||
| 221 | 221 | |
| 222 | 222 | void TOWNS_DMAC::write_via_debugger_data8(uint32_t addr, uint32_t data) |
| 223 | 223 | { |
| 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); | |
| 225 | 225 | d_mem->write_dma_data8(addr & dma_addr_mask, data); |
| 226 | 226 | } |
| 227 | 227 |
Fork