mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

escc: implement hard reset as described in the datasheet

Browse Source 
The hardware reset differs from a device reset in that it only changes the contents
of specific registers. Remove the code that resets all the registers to zero during
hardware reset and implement the default values using the existing soft reset code
with the additional changes listed in the table in the "Z85C30 Reset" section.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20210903113223.19551-7-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
This commit is contained in:
Mark Cave-Ayland 2021-09-03 12:32:20 +01:00
parent 1f476e78a8
commit 160509aebe
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/char/escc.c
View File

@ -118,6 +118,8 @@
#define W_SYNC2 7 #define W_SYNC2 7
#define W_TXBUF 8 #define W_TXBUF 8
#define W_MINTR 9 #define W_MINTR 9
#define MINTR_VIS 0x01
#define MINTR_NV 0x02
#define MINTR_STATUSHI 0x10 #define MINTR_STATUSHI 0x10
#define MINTR_SOFTIACK 0x20 #define MINTR_SOFTIACK 0x20
#define MINTR_RST_MASK 0xc0 #define MINTR_RST_MASK 0xc0
@ -347,36 +349,19 @@ static void escc_soft_reset_chn(ESCCChannelState *s)
static void escc_hard_reset_chn(ESCCChannelState *s) static void escc_hard_reset_chn(ESCCChannelState *s)
{ {
int i; escc_soft_reset_chn(s);
s->reg = 0; /*
for (i = 0; i < ESCC_SERIAL_REGS; i++) { * Hard reset is almost identical to soft reset above, except that the
s->rregs[i] = 0; * values of WR9 (W_MINTR), WR10 (W_MISC1), WR11 (W_CLOCK) and WR14
s->wregs[i] = 0; * (W_MISC2) have extra bits forced to 0/1
} */
/* 1X divisor, 1 stop bit, no parity */ s->wregs[W_MINTR] &= MINTR_VIS | MINTR_NV;
s->wregs[W_TXCTRL1] = TXCTRL1_1STOP; s->wregs[W_MINTR] |= MINTR_RST_B | MINTR_RST_A;
s->wregs[W_MINTR] = MINTR_RST_ALL; s->wregs[W_MISC1] = 0;
/* Synch mode tx clock = TRxC */
s->wregs[W_CLOCK] = CLOCK_TRXC; s->wregs[W_CLOCK] = CLOCK_TRXC;
/* PLL disabled */ s->wregs[W_MISC2] &= MISC2_PLLCMD1 | MISC2_PLLCMD2;
s->wregs[W_MISC2] = MISC2_PLLDIS; s->wregs[W_MISC2] |= MISC2_LCL_LOOP | MISC2_PLLCMD0;
/* Enable most interrupts */
s->wregs[W_EXTINT] = EXTINT_DCD | EXTINT_SYNCINT | EXTINT_CTSINT |
EXTINT_TXUNDRN | EXTINT_BRKINT;
if (s->disabled) {
s->rregs[R_STATUS] = STATUS_TXEMPTY | STATUS_DCD | STATUS_SYNC |
STATUS_CTS | STATUS_TXUNDRN;
} else {
s->rregs[R_STATUS] = STATUS_TXEMPTY | STATUS_TXUNDRN;
}
s->rregs[R_SPEC] = SPEC_BITS8 | SPEC_ALLSENT;
s->rx = s->tx = 0;
s->rxint = s->txint = 0;
s->rxint_under_svc = s->txint_under_svc = 0;
s->e0_mode = s->led_mode = s->caps_lock_mode = s->num_lock_mode = 0;
clear_queue(s);
} }
static void escc_reset(DeviceState *d) static void escc_reset(DeviceState *d)