diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-10-08 15:40:08 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-08 15:40:08 +0000 |
| commit | 53e621704c9734d68fcae52d89ff00680df53044 (patch) | |
| tree | 5d0df45382fd56599ad8bd78eedb9844cfa0282d /trace-events | |
| parent | 211685040f4e579f83a3ed8b3aa7a3f363ad384f (diff) | |
| parent | 779277cab4ab748dea3dfc8c8e035c7a40523e1b (diff) | |
Merge branch 'for-upstream' of git://git.serverraum.org/git/mw/qemu-lm32
* 'for-upstream' of git://git.serverraum.org/git/mw/qemu-lm32:
milkymist: new interrupt map
milkymist_uart: support new core version
lm32: add missing qemu_init_vcpu() call
Diffstat (limited to 'trace-events')
| -rw-r--r-- | trace-events | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/trace-events b/trace-events index 9528c04fed..63d8c8ed75 100644 --- a/trace-events +++ b/trace-events @@ -445,8 +445,8 @@ milkymist_tmu2_pulse_irq(void) "Pulse IRQ" # hw/milkymist-uart.c milkymist_uart_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x" milkymist_uart_memory_write(uint32_t addr, uint32_t value) "addr %08x value %08x" -milkymist_uart_pulse_irq_rx(void) "Pulse IRQ RX" -milkymist_uart_pulse_irq_tx(void) "Pulse IRQ TX" +milkymist_uart_raise_irq(void) "Raise IRQ" +milkymist_uart_lower_irq(void) "Lower IRQ" # hw/milkymist-vgafb.c milkymist_vgafb_memory_read(uint32_t addr, uint32_t value) "addr %08x value %08x" |