Reverted build 2263's commit as it's no longer needed, fixes #1050.
This commit is contained in:
@@ -369,7 +369,7 @@ ctr_latch_status(ctr_t *ctr)
|
|||||||
static void
|
static void
|
||||||
ctr_latch_count(ctr_t *ctr)
|
ctr_latch_count(ctr_t *ctr)
|
||||||
{
|
{
|
||||||
int count = (ctr->latch || ctr->null_count || (ctr->state == 1)) ? ctr->l : ctr->count;
|
int count = (ctr->latch || (ctr->state == 1)) ? ctr->l : ctr->count;
|
||||||
|
|
||||||
switch (ctr->rm & 0x03) {
|
switch (ctr->rm & 0x03) {
|
||||||
case 0x00:
|
case 0x00:
|
||||||
@@ -581,8 +581,6 @@ pit_write(uint16_t addr, uint8_t val, void *priv)
|
|||||||
case 1:
|
case 1:
|
||||||
case 2: /* the actual timers */
|
case 2: /* the actual timers */
|
||||||
ctr = &dev->counters[t];
|
ctr = &dev->counters[t];
|
||||||
/* Reloading timer count, so set null_count to 1. */
|
|
||||||
ctr->null_count = 1;
|
|
||||||
|
|
||||||
switch (ctr->wm) {
|
switch (ctr->wm) {
|
||||||
case 0:
|
case 0:
|
||||||
@@ -650,7 +648,7 @@ pit_read(uint16_t addr, void *priv)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
count = (ctr->null_count || (ctr->state == 1)) ? ctr->l : ctr->count;
|
count = (ctr->state == 1) ? ctr->l : ctr->count;
|
||||||
|
|
||||||
if (ctr->latched) {
|
if (ctr->latched) {
|
||||||
ret = (ctr->rl) >> ((ctr->rm & 0x80) ? 8 : 0);
|
ret = (ctr->rl) >> ((ctr->rm & 0x80) ? 8 : 0);
|
||||||
|
Reference in New Issue
Block a user