Give pit_fast unique logging name
This commit is contained in:
@@ -47,22 +47,22 @@
|
|||||||
#define PIT_CUSTOM_CLOCK 64 /* The PIT uses custom clock inputs provided by another provider. */
|
#define PIT_CUSTOM_CLOCK 64 /* The PIT uses custom clock inputs provided by another provider. */
|
||||||
#define PIT_SECONDARY 128 /* The PIT is secondary (ports 0048-004B). */
|
#define PIT_SECONDARY 128 /* The PIT is secondary (ports 0048-004B). */
|
||||||
|
|
||||||
#ifdef ENABLE_PIT_LOG
|
#ifdef ENABLE_PIT_FAST_LOG
|
||||||
int pit_do_log = ENABLE_PIT_LOG;
|
int pit_fast_do_log = ENABLE_PIT_FAST_LOG;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
pit_log(const char *fmt, ...)
|
pit_fast_log(const char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list ap;
|
va_list ap;
|
||||||
|
|
||||||
if (pit_do_log) {
|
if (pit_fast_do_log) {
|
||||||
va_start(ap, fmt);
|
va_start(ap, fmt);
|
||||||
pclog_ex(fmt, ap);
|
pclog_ex(fmt, ap);
|
||||||
va_end(ap);
|
va_end(ap);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
# define pit_log(fmt, ...)
|
# define pit_fast_log(fmt, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void
|
static void
|
||||||
@@ -420,7 +420,7 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
|
|||||||
int t = (addr & 3);
|
int t = (addr & 3);
|
||||||
ctrf_t *ctr;
|
ctrf_t *ctr;
|
||||||
|
|
||||||
pit_log("[%04X:%08X] pit_write(%04X, %02X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
|
pit_fast_log("[%04X:%08X] pit_write(%04X, %02X, %08X)\n", CS, cpu_state.pc, addr, val, priv);
|
||||||
|
|
||||||
cycles -= ISA_CYCLES(8);
|
cycles -= ISA_CYCLES(8);
|
||||||
|
|
||||||
@@ -438,7 +438,7 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
|
|||||||
pitf_ctr_latch_count(&dev->counters[1]);
|
pitf_ctr_latch_count(&dev->counters[1]);
|
||||||
if (val & 8)
|
if (val & 8)
|
||||||
pitf_ctr_latch_count(&dev->counters[2]);
|
pitf_ctr_latch_count(&dev->counters[2]);
|
||||||
pit_log("PIT %i: Initiated readback command\n", t);
|
pit_fast_log("PIT %i: Initiated readback command\n", t);
|
||||||
}
|
}
|
||||||
if (!(val & 0x10)) {
|
if (!(val & 0x10)) {
|
||||||
if (val & 2)
|
if (val & 2)
|
||||||
@@ -456,7 +456,7 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
|
|||||||
if (!(dev->ctrl & 0x30)) {
|
if (!(dev->ctrl & 0x30)) {
|
||||||
pitf_ctr_latch_count(ctr);
|
pitf_ctr_latch_count(ctr);
|
||||||
dev->ctrl |= 0x30;
|
dev->ctrl |= 0x30;
|
||||||
pit_log("PIT %i: Initiated latched read, %i bytes latched\n",
|
pit_fast_log("PIT %i: Initiated latched read, %i bytes latched\n",
|
||||||
t, ctr->latched);
|
t, ctr->latched);
|
||||||
} else {
|
} else {
|
||||||
ctr->ctrl = val;
|
ctr->ctrl = val;
|
||||||
@@ -476,7 +476,7 @@ pitf_write(uint16_t addr, uint8_t val, void *priv)
|
|||||||
pitf_ctr_set_out(ctr, 1, dev);
|
pitf_ctr_set_out(ctr, 1, dev);
|
||||||
ctr->disabled = 1;
|
ctr->disabled = 1;
|
||||||
|
|
||||||
pit_log("PIT %i: M = %i, RM/WM = %i, Out = %i\n", t, ctr->m, ctr->rm, ctr->out);
|
pit_fast_log("PIT %i: M = %i, RM/WM = %i, Out = %i\n", t, ctr->m, ctr->rm, ctr->out);
|
||||||
}
|
}
|
||||||
ctr->thit = 0;
|
ctr->thit = 0;
|
||||||
}
|
}
|
||||||
@@ -619,7 +619,7 @@ pitf_read(uint16_t addr, void *priv)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
pit_log("[%04X:%08X] pit_read(%04X, %08X) = %02X\n", CS, cpu_state.pc, addr, priv, ret);
|
pit_fast_log("[%04X:%08X] pit_read(%04X, %08X) = %02X\n", CS, cpu_state.pc, addr, priv, ret);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user