serial: Use enum device_endian in serial_mm_init parameter The use of DEVICE_NATIVE_ENDIAN cleans up lots of ifdefs in many of the callers. 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 ea07d32..9a87a8e 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c
@@ -264,18 +264,12 @@ /* Serial ports */ if (serial_hds[0]) { -#ifdef TARGET_WORDS_BIGENDIAN - serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[0], 1, 1); -#else - serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[0], 1, 0); -#endif + serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[0], + 1, DEVICE_NATIVE_ENDIAN); } if (serial_hds[1]) { -#ifdef TARGET_WORDS_BIGENDIAN - serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[1], 1, 1); -#else - serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[1], 1, 0); -#endif + serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[1], + 1, DEVICE_NATIVE_ENDIAN); } /* Parallel port */
diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 1ec1228..0b16914 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c
@@ -446,11 +446,8 @@ s->display = qemu_chr_new("fpga", "vc:320x200", malta_fpga_led_init); -#ifdef TARGET_WORDS_BIGENDIAN - s->uart = serial_mm_init(base + 0x900, 3, uart_irq, 230400, uart_chr, 1, 1); -#else - s->uart = serial_mm_init(base + 0x900, 3, uart_irq, 230400, uart_chr, 1, 0); -#endif + s->uart = serial_mm_init(base + 0x900, 3, uart_irq, 230400, uart_chr, + 1, 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 9b1f380..e79b07e 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c
@@ -1486,22 +1486,12 @@ pic[MP_TIMER4_IRQ], NULL); if (serial_hds[0]) { -#ifdef TARGET_WORDS_BIGENDIAN serial_mm_init(MP_UART1_BASE, 2, pic[MP_UART1_IRQ], 1825000, - serial_hds[0], 1, 1); -#else - serial_mm_init(MP_UART1_BASE, 2, pic[MP_UART1_IRQ], 1825000, - serial_hds[0], 1, 0); -#endif + serial_hds[0], 1, DEVICE_NATIVE_ENDIAN); } if (serial_hds[1]) { -#ifdef TARGET_WORDS_BIGENDIAN serial_mm_init(MP_UART2_BASE, 2, pic[MP_UART2_IRQ], 1825000, - serial_hds[1], 1, 1); -#else - serial_mm_init(MP_UART2_BASE, 2, pic[MP_UART2_IRQ], 1825000, - serial_hds[1], 1, 0); -#endif + serial_hds[1], 1, DEVICE_NATIVE_ENDIAN); } /* Register flash */
diff --git a/hw/omap_uart.c b/hw/omap_uart.c index 191a0c2..66696ab 100644 --- a/hw/omap_uart.c +++ b/hw/omap_uart.c
@@ -60,15 +60,9 @@ s->base = base; s->fclk = fclk; s->irq = irq; -#ifdef TARGET_WORDS_BIGENDIAN s->serial = serial_mm_init(base, 2, irq, omap_clk_getrate(fclk)/16, chr ?: qemu_chr_new(label, "null", NULL), 1, - 1); -#else - s->serial = serial_mm_init(base, 2, irq, omap_clk_getrate(fclk)/16, - chr ?: qemu_chr_new(label, "null", NULL), 1, - 0); -#endif + DEVICE_NATIVE_ENDIAN); return s; } @@ -182,15 +176,8 @@ void omap_uart_attach(struct omap_uart_s *s, CharDriverState *chr) { /* TODO: Should reuse or destroy current s->serial */ -#ifdef TARGET_WORDS_BIGENDIAN s->serial = serial_mm_init(s->base, 2, s->irq, omap_clk_getrate(s->fclk) / 16, chr ?: qemu_chr_new("null", "null", NULL), 1, - 1); -#else - s->serial = serial_mm_init(s->base, 2, s->irq, - omap_clk_getrate(s->fclk) / 16, - chr ?: qemu_chr_new("null", "null", NULL), 1, - 0); -#endif + DEVICE_NATIVE_ENDIAN); }
diff --git a/hw/pc.h b/hw/pc.h index 7e6ddba..d70b81a 100644 --- a/hw/pc.h +++ b/hw/pc.h
@@ -18,7 +18,7 @@ SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, qemu_irq irq, int baudbase, CharDriverState *chr, int ioregister, - int be); + 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 38db521..97ff33d 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, 0); + serial_hds[0], 1, 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 9d5d2af..35584df 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, 1); + serial_hds[0], 1, DEVICE_BIG_ENDIAN); } if (serial_hds[1] != NULL) { serial_mm_init(0xef600400, 0, pic[1], PPC_SERIAL_MM_BAUDBASE, - serial_hds[1], 1, 1); + serial_hds[1], 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, 1); + serial_hds[0], 1, DEVICE_BIG_ENDIAN); } if (serial_hds[1] != NULL) { serial_mm_init(0xef600400, 0, pic[1], PPC_SERIAL_MM_BAUDBASE, - serial_hds[1], 1, 1); + serial_hds[1], 1, DEVICE_BIG_ENDIAN); } /* OCM */ ppc405_ocm_init(env);
diff --git a/hw/ppc440.c b/hw/ppc440.c index 5885ff0..9dd9215 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, 1); + serial_hds[0], 1, DEVICE_BIG_ENDIAN); } if (serial_hds[1] != NULL) { serial_mm_init(0xef600400, 0, pic[1], PPC_SERIAL_MM_BAUDBASE, - serial_hds[1], 1, 1); + serial_hds[1], 1, DEVICE_BIG_ENDIAN); } return env;
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c index 1274a3e..c3583f9 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, 1); + serial_hds[0], 1, DEVICE_BIG_ENDIAN); } if (serial_hds[1]) { serial_mm_init(MPC8544_SERIAL1_REGS_BASE, 0, mpic[12+26], 399193, - serial_hds[0], 1, 1); + serial_hds[0], 1, DEVICE_BIG_ENDIAN); } /* General Utility device */
diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index 2aa8760..55b5d8c 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c
@@ -2113,19 +2113,16 @@ qdev_get_gpio_in(s->dma, PXA2XX_RX_RQ_MMCI), qdev_get_gpio_in(s->dma, PXA2XX_TX_RQ_MMCI)); - for (i = 0; pxa270_serial[i].io_base; i ++) - if (serial_hds[i]) -#ifdef TARGET_WORDS_BIGENDIAN + for (i = 0; pxa270_serial[i].io_base; i++) { + 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, 1); -#else - 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, 0); -#endif - else + qdev_get_gpio_in(s->pic, pxa270_serial[i].irqn), + 14857000 / 16, serial_hds[i], 1, + DEVICE_NATIVE_ENDIAN); + } else { break; + } + } if (serial_hds[i]) s->fir = pxa2xx_fir_init(0x40800000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_ICP), @@ -2248,20 +2245,16 @@ qdev_get_gpio_in(s->dma, PXA2XX_RX_RQ_MMCI), qdev_get_gpio_in(s->dma, PXA2XX_TX_RQ_MMCI)); - for (i = 0; pxa255_serial[i].io_base; i ++) + for (i = 0; pxa255_serial[i].io_base; i++) { if (serial_hds[i]) { -#ifdef TARGET_WORDS_BIGENDIAN 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, 1); -#else - 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, 0); -#endif + qdev_get_gpio_in(s->pic, pxa255_serial[i].irqn), + 14745600 / 16, serial_hds[i], 1, + DEVICE_NATIVE_ENDIAN); } else { break; } + } if (serial_hds[i]) s->fir = pxa2xx_fir_init(0x40800000, qdev_get_gpio_in(s->pic, PXA2XX_PIC_ICP),
diff --git a/hw/serial.c b/hw/serial.c index 310bfde..a533c04 100644 --- a/hw/serial.c +++ b/hw/serial.c
@@ -858,10 +858,9 @@ SerialState *serial_mm_init (target_phys_addr_t base, int it_shift, qemu_irq irq, int baudbase, CharDriverState *chr, int ioregister, - int be) + enum device_endian end) { SerialState *s; - enum device_endian end; s = g_malloc0(sizeof(SerialState)); @@ -873,7 +872,6 @@ serial_init_core(s); vmstate_register(NULL, base, &vmstate_serial, s); - end = (be ? DEVICE_BIG_ENDIAN : DEVICE_LITTLE_ENDIAN); memory_region_init_io(&s->io, &serial_mm_ops[end], s, "serial", 8 << it_shift); if (ioregister) {
diff --git a/hw/sm501.c b/hw/sm501.c index 1ed0a7e..26e2dfe 100644 --- a/hw/sm501.c +++ b/hw/sm501.c
@@ -1440,15 +1440,9 @@ /* bridge to serial emulation module */ if (chr) { -#ifdef TARGET_WORDS_BIGENDIAN serial_mm_init(base + MMIO_BASE_OFFSET + SM501_UART0, 2, NULL, /* TODO : chain irq to IRL */ - 115200, chr, 1, 1); -#else - serial_mm_init(base + MMIO_BASE_OFFSET + SM501_UART0, 2, - NULL, /* TODO : chain irq to IRL */ - 115200, chr, 1, 0); -#endif + 115200, chr, 1, DEVICE_NATIVE_ENDIAN); } /* create qemu graphic console */
diff --git a/hw/sun4u.c b/hw/sun4u.c index fbef350..b6d8171 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, 1); + serial_hds[i], 1, DEVICE_BIG_ENDIAN); i++; } for(; i < MAX_SERIAL_PORTS; i++) {
diff --git a/hw/virtex_ml507.c b/hw/virtex_ml507.c index 7459b0b..a4721e3 100644 --- a/hw/virtex_ml507.c +++ b/hw/virtex_ml507.c
@@ -226,7 +226,8 @@ irq[i] = qdev_get_gpio_in(dev, i); } - serial_mm_init(0x83e01003ULL, 2, irq[9], 115200, serial_hds[0], 1, 0); + serial_mm_init(0x83e01003ULL, 2, irq[9], 115200, serial_hds[0], + 1, DEVICE_LITTLE_ENDIAN); /* 2 timers at irq 2 @ 62 Mhz. */ xilinx_timer_create(0x83c00000, irq[3], 2, 62 * 1000000);