SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/char/stm32f2xx_usart: Extract common IRQ update code to update_irq()

Browse Source 
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Hans-Erik Floryd <hans-erik.floryd@rt-labs.com>
Message-id: 20231030151528.1138131-2-hans-erik.floryd@rt-labs.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Hans-Erik Floryd 2023-10-30 16:15:16 +01:00 committed by Peter Maydell
parent b11293c212
commit b80e20dbbf
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/char/stm32f2xx_usart.c
View File

@ -53,6 +53,17 @@ static int stm32f2xx_usart_can_receive(void *opaque)
return 0; return 0;
} }
static void stm32f2xx_update_irq(STM32F2XXUsartState *s)
{
uint32_t mask = s->usart_sr & s->usart_cr1;
if (mask & (USART_SR_TXE | USART_SR_TC | USART_SR_RXNE)) {
qemu_set_irq(s->irq, 1);
} else {
qemu_set_irq(s->irq, 0);
}
}
static void stm32f2xx_usart_receive(void *opaque, const uint8_t *buf, int size) static void stm32f2xx_usart_receive(void *opaque, const uint8_t *buf, int size)
{ {
STM32F2XXUsartState *s = opaque; STM32F2XXUsartState *s = opaque;
@ -66,9 +77,7 @@ static void stm32f2xx_usart_receive(void *opaque, const uint8_t *buf, int size)
s->usart_dr = *buf; s->usart_dr = *buf;
s->usart_sr |= USART_SR_RXNE; s->usart_sr |= USART_SR_RXNE;
if (s->usart_cr1 & USART_CR1_RXNEIE) { stm32f2xx_update_irq(s);
qemu_set_irq(s->irq, 1);
}
DB_PRINT("Receiving: %c\n", s->usart_dr); DB_PRINT("Receiving: %c\n", s->usart_dr);
} }
@ -85,7 +94,7 @@ static void stm32f2xx_usart_reset(DeviceState *dev)
s->usart_cr3 = 0x00000000; s->usart_cr3 = 0x00000000;
s->usart_gtpr = 0x00000000; s->usart_gtpr = 0x00000000;
qemu_set_irq(s->irq, 0); stm32f2xx_update_irq(s);
} }
static uint64_t stm32f2xx_usart_read(void *opaque, hwaddr addr, static uint64_t stm32f2xx_usart_read(void *opaque, hwaddr addr,
@ -106,7 +115,7 @@ static uint64_t stm32f2xx_usart_read(void *opaque, hwaddr addr,
retvalue = s->usart_dr & 0x3FF; retvalue = s->usart_dr & 0x3FF;
s->usart_sr &= ~USART_SR_RXNE; s->usart_sr &= ~USART_SR_RXNE;
qemu_chr_fe_accept_input(&s->chr); qemu_chr_fe_accept_input(&s->chr);
qemu_set_irq(s->irq, 0); stm32f2xx_update_irq(s);
return retvalue; return retvalue;
case USART_BRR: case USART_BRR:
return s->usart_brr; return s->usart_brr;
@ -145,9 +154,7 @@ static void stm32f2xx_usart_write(void *opaque, hwaddr addr,
} else { } else {
s->usart_sr &= value; s->usart_sr &= value;
} }
if (!(s->usart_sr & USART_SR_RXNE)) { stm32f2xx_update_irq(s);
qemu_set_irq(s->irq, 0);
}
return; return;
case USART_DR: case USART_DR:
if (value < 0xF000) { if (value < 0xF000) {
@ -168,10 +175,7 @@ static void stm32f2xx_usart_write(void *opaque, hwaddr addr,
return; return;
case USART_CR1: case USART_CR1:
s->usart_cr1 = value; s->usart_cr1 = value;
if (s->usart_cr1 & USART_CR1_RXNEIE && stm32f2xx_update_irq(s);
s->usart_sr & USART_SR_RXNE) {
qemu_set_irq(s->irq, 1);
}
return; return;
case USART_CR2: case USART_CR2:
s->usart_cr2 = value; s->usart_cr2 = value;