serial: Remove ioregister parameter from serial_mm_init All callers passed 1. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index 9a87a8e..1f3998f 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c
@@ -265,11 +265,11 @@ /* Serial ports */ if (serial_hds[0]) { serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[0], - 1, DEVICE_NATIVE_ENDIAN); + DEVICE_NATIVE_ENDIAN); } if (serial_hds[1]) { serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[1], - 1, DEVICE_NATIVE_ENDIAN); + DEVICE_NATIVE_ENDIAN); } /* Parallel port */
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 0b16914..84d1e47 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c
@@ -447,7 +447,7 @@ s->display = qemu_chr_new("fpga", "vc:320x200", malta_fpga_led_init); s->uart = serial_mm_init(base + 0x900, 3, uart_irq, 230400, uart_chr, - 1, DEVICE_NATIVE_ENDIAN); + DEVICE_NATIVE_ENDIAN); malta_fpga_reset(s); qemu_register_reset(malta_fpga_reset, s);
diff --git a/hw/musicpal.c b/hw/musicpal.c index e79b07e..2131db1 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c
@@ -1487,11 +1487,11 @@ if (serial_hds[0]) { serial_mm_init(MP_UART1_BASE, 2, pic[MP_UART1_IRQ], 1825000, - serial_hds[0], 1, DEVICE_NATIVE_ENDIAN); + serial_hds[0], DEVICE_NATIVE_ENDIAN); } if (serial_hds[1]) { serial_mm_init(MP_UART2_BASE, 2, pic[MP_UART2_IRQ], 1825000, - serial_hds[1], 1, DEVICE_NATIVE_ENDIAN); + serial_hds[1], DEVICE_NATIVE_ENDIAN); } /* Register flash */
diff --git a/hw/omap_uart.c b/hw/omap_uart.c index 66696ab..b43f04c 100644 --- a/hw/omap_uart.c +++ b/hw/omap_uart.c
@@ -61,7 +61,7 @@ s->fclk = fclk; s->irq = irq; s->serial = serial_mm_init(base, 2, irq, omap_clk_getrate(fclk)/16, - chr ?: qemu_chr_new(label, "null", NULL), 1, + chr ?: qemu_chr_new(label, "null", NULL), DEVICE_NATIVE_ENDIAN); return s; } @@ -178,6 +178,6 @@ /* TODO: Should reuse or destroy current s->serial */ s->serial = serial_mm_init(s->base, 2, s->irq, omap_clk_getrate(s->fclk) / 16, - chr ?: qemu_chr_new("null", "null", NULL), 1, + chr ?: qemu_chr_new("null", "null", NULL), DEVICE_NATIVE_ENDIAN); }
diff --git a/hw/pc.h b/hw/pc.h index d70b81a..a0d7265 100644 --- a/hw/pc.h +++ b/hw/pc.h
@@ -17,8 +17,7 @@ CharDriverState *chr); SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, qemu_irq irq, int baudbase, - CharDriverState *chr, int ioregister, - enum device_endian); + CharDriverState *chr, enum device_endian); static inline bool serial_isa_init(int index, CharDriverState *chr) { ISADevice *dev;
diff --git a/hw/petalogix_ml605_mmu.c b/hw/petalogix_ml605_mmu.c index 97ff33d..ab89341 100644 --- a/hw/petalogix_ml605_mmu.c +++ b/hw/petalogix_ml605_mmu.c
@@ -185,7 +185,7 @@ } serial_mm_init(UART16550_BASEADDR + 0x1000, 2, irq[5], 115200, - serial_hds[0], 1, DEVICE_LITTLE_ENDIAN); + serial_hds[0], DEVICE_LITTLE_ENDIAN); /* 2 timers at irq 2 @ 100 Mhz. */ xilinx_timer_create(TIMER_BASEADDR, irq[2], 2, 100 * 1000000);
diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c index 35584df..924aada 100644 --- a/hw/ppc405_uc.c +++ b/hw/ppc405_uc.c
@@ -2150,11 +2150,11 @@ /* Serial ports */ if (serial_hds[0] != NULL) { serial_mm_init(0xef600300, 0, pic[0], PPC_SERIAL_MM_BAUDBASE, - serial_hds[0], 1, DEVICE_BIG_ENDIAN); + serial_hds[0], DEVICE_BIG_ENDIAN); } if (serial_hds[1] != NULL) { serial_mm_init(0xef600400, 0, pic[1], PPC_SERIAL_MM_BAUDBASE, - serial_hds[1], 1, DEVICE_BIG_ENDIAN); + serial_hds[1], DEVICE_BIG_ENDIAN); } /* IIC controller */ ppc405_i2c_init(0xef600500, pic[2]); @@ -2505,11 +2505,11 @@ /* Serial ports */ if (serial_hds[0] != NULL) { serial_mm_init(0xef600300, 0, pic[0], PPC_SERIAL_MM_BAUDBASE, - serial_hds[0], 1, DEVICE_BIG_ENDIAN); + serial_hds[0], DEVICE_BIG_ENDIAN); } if (serial_hds[1] != NULL) { serial_mm_init(0xef600400, 0, pic[1], PPC_SERIAL_MM_BAUDBASE, - serial_hds[1], 1, DEVICE_BIG_ENDIAN); + serial_hds[1], DEVICE_BIG_ENDIAN); } /* OCM */ ppc405_ocm_init(env);
diff --git a/hw/ppc440.c b/hw/ppc440.c index 9dd9215..0cd7bca 100644 --- a/hw/ppc440.c +++ b/hw/ppc440.c
@@ -93,11 +93,11 @@ if (serial_hds[0] != NULL) { serial_mm_init(0xef600300, 0, pic[0], PPC_SERIAL_MM_BAUDBASE, - serial_hds[0], 1, DEVICE_BIG_ENDIAN); + serial_hds[0], DEVICE_BIG_ENDIAN); } if (serial_hds[1] != NULL) { serial_mm_init(0xef600400, 0, pic[1], PPC_SERIAL_MM_BAUDBASE, - serial_hds[1], 1, DEVICE_BIG_ENDIAN); + serial_hds[1], DEVICE_BIG_ENDIAN); } return env;
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index c3583f9..fc46991 100644 --- a/hw/ppce500_mpc8544ds.c +++ b/hw/ppce500_mpc8544ds.c
@@ -276,13 +276,13 @@ if (serial_hds[0]) { serial_mm_init(MPC8544_SERIAL0_REGS_BASE, 0, mpic[12+26], 399193, - serial_hds[0], 1, DEVICE_BIG_ENDIAN); + serial_hds[0], DEVICE_BIG_ENDIAN); } if (serial_hds[1]) { serial_mm_init(MPC8544_SERIAL1_REGS_BASE, 0, mpic[12+26], 399193, - serial_hds[0], 1, DEVICE_BIG_ENDIAN); + serial_hds[0], DEVICE_BIG_ENDIAN); } /* General Utility device */
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index 55b5d8c..60f4c34 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c
@@ -2117,7 +2117,7 @@ if (serial_hds[i]) { serial_mm_init(pxa270_serial[i].io_base, 2, qdev_get_gpio_in(s->pic, pxa270_serial[i].irqn), - 14857000 / 16, serial_hds[i], 1, + 14857000 / 16, serial_hds[i], DEVICE_NATIVE_ENDIAN); } else { break; @@ -2249,7 +2249,7 @@ if (serial_hds[i]) { serial_mm_init(pxa255_serial[i].io_base, 2, qdev_get_gpio_in(s->pic, pxa255_serial[i].irqn), - 14745600 / 16, serial_hds[i], 1, + 14745600 / 16, serial_hds[i], DEVICE_NATIVE_ENDIAN); } else { break;
diff --git a/hw/serial.c b/hw/serial.c index a533c04..0fafc1d 100644 --- a/hw/serial.c +++ b/hw/serial.c
@@ -857,8 +857,7 @@ SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, qemu_irq irq, int baudbase, - CharDriverState *chr, int ioregister, - enum device_endian end) + CharDriverState *chr, enum device_endian end) { SerialState *s; @@ -874,9 +873,8 @@ memory_region_init_io(&s->io, &serial_mm_ops[end], s, "serial", 8 << it_shift); - if (ioregister) { - memory_region_add_subregion(get_system_memory(), base, &s->io); - } + memory_region_add_subregion(get_system_memory(), base, &s->io); + serial_update_msl(s); return s; }
diff --git a/hw/sm501.c b/hw/sm501.c index 26e2dfe..fddf21a 100644 --- a/hw/sm501.c +++ b/hw/sm501.c
@@ -1442,7 +1442,7 @@ if (chr) { serial_mm_init(base + MMIO_BASE_OFFSET + SM501_UART0, 2, NULL, /* TODO : chain irq to IRL */ - 115200, chr, 1, DEVICE_NATIVE_ENDIAN); + 115200, chr, DEVICE_NATIVE_ENDIAN); } /* create qemu graphic console */
diff --git a/hw/sun4u.c b/hw/sun4u.c index b6d8171..60e1e9d 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c
@@ -771,7 +771,7 @@ i = 0; if (hwdef->console_serial_base) { serial_mm_init(hwdef->console_serial_base, 0, NULL, 115200, - serial_hds[i], 1, DEVICE_BIG_ENDIAN); + serial_hds[i], DEVICE_BIG_ENDIAN); i++; } for(; i < MAX_SERIAL_PORTS; i++) {
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index a4721e3..8c52a06 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c
@@ -227,7 +227,7 @@ } serial_mm_init(0x83e01003ULL, 2, irq[9], 115200, serial_hds[0], - 1, DEVICE_LITTLE_ENDIAN); + DEVICE_LITTLE_ENDIAN); /* 2 timers at irq 2 @ 62 Mhz. */ xilinx_timer_create(0x83c00000, irq[3], 2, 62 * 1000000);