diff options
Diffstat (limited to 'hw')
-rw-r--r-- | hw/ccid-card-passthru.c | 4 | ||||
-rw-r--r-- | hw/debugcon.c | 2 | ||||
-rw-r--r-- | hw/escc.c | 2 | ||||
-rw-r--r-- | hw/etraxfs_ser.c | 2 | ||||
-rw-r--r-- | hw/grlib_apbuart.c | 2 | ||||
-rw-r--r-- | hw/lm32_juart.c | 2 | ||||
-rw-r--r-- | hw/lm32_uart.c | 2 | ||||
-rw-r--r-- | hw/mcf_uart.c | 2 | ||||
-rw-r--r-- | hw/milkymist-uart.c | 2 | ||||
-rw-r--r-- | hw/omap2.c | 6 | ||||
-rw-r--r-- | hw/parallel.c | 2 | ||||
-rw-r--r-- | hw/pl011.c | 2 | ||||
-rw-r--r-- | hw/pxa2xx.c | 2 | ||||
-rw-r--r-- | hw/serial.c | 2 | ||||
-rw-r--r-- | hw/sh_serial.c | 2 | ||||
-rw-r--r-- | hw/spapr_vty.c | 4 | ||||
-rw-r--r-- | hw/strongarm.c | 2 | ||||
-rw-r--r-- | hw/syborg_serial.c | 4 | ||||
-rw-r--r-- | hw/usb-serial.c | 2 | ||||
-rw-r--r-- | hw/virtio-console.c | 2 | ||||
-rw-r--r-- | hw/xen_console.c | 2 | ||||
-rw-r--r-- | hw/xilinx_uartlite.c | 2 |
22 files changed, 27 insertions, 27 deletions
diff --git a/hw/ccid-card-passthru.c b/hw/ccid-card-passthru.c index 28eb9d18f8..082fd82cf9 100644 --- a/hw/ccid-card-passthru.c +++ b/hw/ccid-card-passthru.c @@ -72,8 +72,8 @@ static void ccid_card_vscard_send_msg(PassthruState *s, scr_msg_header.type = htonl(type); scr_msg_header.reader_id = htonl(reader_id); scr_msg_header.length = htonl(length); - qemu_chr_write(s->cs, (uint8_t *)&scr_msg_header, sizeof(VSCMsgHeader)); - qemu_chr_write(s->cs, payload, length); + qemu_chr_fe_write(s->cs, (uint8_t *)&scr_msg_header, sizeof(VSCMsgHeader)); + qemu_chr_fe_write(s->cs, payload, length); } static void ccid_card_vscard_send_apdu(PassthruState *s, diff --git a/hw/debugcon.c b/hw/debugcon.c index 5ee6821206..c9ee6d90b0 100644 --- a/hw/debugcon.c +++ b/hw/debugcon.c @@ -51,7 +51,7 @@ static void debugcon_ioport_write(void *opaque, uint32_t addr, uint32_t val) printf("debugcon: write addr=0x%04x val=0x%02x\n", addr, val); #endif - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); } @@ -551,7 +551,7 @@ static void escc_mem_write(void *opaque, target_phys_addr_t addr, s->tx = val; if (s->wregs[W_TXCTRL2] & TXCTRL2_TXEN) { // tx enabled if (s->chr) - qemu_chr_write(s->chr, &s->tx, 1); + qemu_chr_fe_write(s->chr, &s->tx, 1); else if (s->type == kbd && !s->disabled) { handle_kbd_command(s, val); } diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c index 28b86ea2d4..00360371e3 100644 --- a/hw/etraxfs_ser.c +++ b/hw/etraxfs_ser.c @@ -119,7 +119,7 @@ ser_writel (void *opaque, target_phys_addr_t addr, uint32_t value) switch (addr) { case RW_DOUT: - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); s->regs[R_INTR] |= 3; s->pending_tx = 1; s->regs[addr] = value; diff --git a/hw/grlib_apbuart.c b/hw/grlib_apbuart.c index 169a56eb1b..c90b810413 100644 --- a/hw/grlib_apbuart.c +++ b/hw/grlib_apbuart.c @@ -114,7 +114,7 @@ grlib_apbuart_writel(void *opaque, target_phys_addr_t addr, uint32_t value) switch (addr) { case DATA_OFFSET: c = value & 0xFF; - qemu_chr_write(uart->chr, &c, 1); + qemu_chr_fe_write(uart->chr, &c, 1); return; case STATUS_OFFSET: diff --git a/hw/lm32_juart.c b/hw/lm32_juart.c index fddcf7ea14..5454aa4e4d 100644 --- a/hw/lm32_juart.c +++ b/hw/lm32_juart.c @@ -72,7 +72,7 @@ void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx) s->jtx = jtx; if (s->chr) { - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); } } diff --git a/hw/lm32_uart.c b/hw/lm32_uart.c index 09090e93b2..367854550c 100644 --- a/hw/lm32_uart.c +++ b/hw/lm32_uart.c @@ -169,7 +169,7 @@ static void uart_write(void *opaque, target_phys_addr_t addr, uint32_t value) switch (addr) { case R_RXTX: if (s->chr) { - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); } break; case R_IER: diff --git a/hw/mcf_uart.c b/hw/mcf_uart.c index 6118ccb604..e6b2ab067a 100644 --- a/hw/mcf_uart.c +++ b/hw/mcf_uart.c @@ -110,7 +110,7 @@ static void mcf_uart_do_tx(mcf_uart_state *s) { if (s->tx_enabled && (s->sr & MCF_UART_TxEMP) == 0) { if (s->chr) - qemu_chr_write(s->chr, (unsigned char *)&s->tb, 1); + qemu_chr_fe_write(s->chr, (unsigned char *)&s->tb, 1); s->sr |= MCF_UART_TxEMP; } if (s->tx_enabled) { diff --git a/hw/milkymist-uart.c b/hw/milkymist-uart.c index 56c90da0b6..e8e309de7c 100644 --- a/hw/milkymist-uart.c +++ b/hw/milkymist-uart.c @@ -77,7 +77,7 @@ static void uart_write(void *opaque, target_phys_addr_t addr, uint32_t value) switch (addr) { case R_RXTX: if (s->chr) { - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); } trace_milkymist_uart_pulse_irq_tx(); qemu_irq_pulse(s->tx_irq); diff --git a/hw/omap2.c b/hw/omap2.c index 3b51ac525f..e32cd94d2c 100644 --- a/hw/omap2.c +++ b/hw/omap2.c @@ -748,14 +748,14 @@ static void omap_sti_fifo_write(void *opaque, target_phys_addr_t addr, if (ch == STI_TRACE_CONTROL_CHANNEL) { /* Flush channel <i>value</i>. */ - qemu_chr_write(s->chr, (const uint8_t *) "\r", 1); + qemu_chr_fe_write(s->chr, (const uint8_t *) "\r", 1); } else if (ch == STI_TRACE_CONSOLE_CHANNEL || 1) { if (value == 0xc0 || value == 0xc3) { /* Open channel <i>ch</i>. */ } else if (value == 0x00) - qemu_chr_write(s->chr, (const uint8_t *) "\n", 1); + qemu_chr_fe_write(s->chr, (const uint8_t *) "\n", 1); else - qemu_chr_write(s->chr, &byte, 1); + qemu_chr_fe_write(s->chr, &byte, 1); } } diff --git a/hw/parallel.c b/hw/parallel.c index 71f30ea1e8..84feab8955 100644 --- a/hw/parallel.c +++ b/hw/parallel.c @@ -120,7 +120,7 @@ parallel_ioport_write_sw(void *opaque, uint32_t addr, uint32_t val) if (val & PARA_CTR_STROBE) { s->status &= ~PARA_STS_BUSY; if ((s->control & PARA_CTR_STROBE) == 0) - qemu_chr_write(s->chr, &s->dataw, 1); + qemu_chr_fe_write(s->chr, &s->dataw, 1); } else { if (s->control & PARA_CTR_INTEN) { s->irq_pending = 1; diff --git a/hw/pl011.c b/hw/pl011.c index 997ce848f8..707a161046 100644 --- a/hw/pl011.c +++ b/hw/pl011.c @@ -133,7 +133,7 @@ static void pl011_write(void *opaque, target_phys_addr_t offset, /* ??? Check if transmitter is enabled. */ ch = value; if (s->chr) - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); s->int_level |= PL011_INT_TX; pl011_update(s); break; diff --git a/hw/pxa2xx.c b/hw/pxa2xx.c index d00edc6177..2aa876001e 100644 --- a/hw/pxa2xx.c +++ b/hw/pxa2xx.c @@ -1923,7 +1923,7 @@ static void pxa2xx_fir_write(void *opaque, target_phys_addr_t addr, else ch = ~value; if (s->chr && s->enable && (s->control[0] & (1 << 3))) /* TXE */ - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); break; case ICSR0: s->status[0] &= ~(value & 0x66); diff --git a/hw/serial.c b/hw/serial.c index 222e356bed..427eb4b045 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -334,7 +334,7 @@ static void serial_xmit(void *opaque) if (s->mcr & UART_MCR_LOOP) { /* in loopback mode, say that we just received a char */ serial_receive1(s, &s->tsr, 1); - } else if (qemu_chr_write(s->chr, &s->tsr, 1) != 1) { + } else if (qemu_chr_fe_write(s->chr, &s->tsr, 1) != 1) { if ((s->tsr_retry > 0) && (s->tsr_retry <= MAX_XMIT_RETRY)) { s->tsr_retry++; qemu_mod_timer(s->transmit_timer, new_xmit_ts + s->char_transmit_time); diff --git a/hw/sh_serial.c b/hw/sh_serial.c index 1767c97fcc..a20c59ef77 100644 --- a/hw/sh_serial.c +++ b/hw/sh_serial.c @@ -105,7 +105,7 @@ static void sh_serial_write(void *opaque, uint32_t offs, uint32_t val) case 0x0c: /* FTDR / TDR */ if (s->chr) { ch = val; - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); } s->dr = val; s->flags &= ~SH_SERIAL_FLAG_TDE; diff --git a/hw/spapr_vty.c b/hw/spapr_vty.c index 6fc0105eac..f5046d9183 100644 --- a/hw/spapr_vty.c +++ b/hw/spapr_vty.c @@ -50,8 +50,8 @@ void vty_putchars(VIOsPAPRDevice *sdev, uint8_t *buf, int len) { VIOsPAPRVTYDevice *dev = (VIOsPAPRVTYDevice *)sdev; - /* FIXME: should check the qemu_chr_write() return value */ - qemu_chr_write(dev->chardev, buf, len); + /* FIXME: should check the qemu_chr_fe_write() return value */ + qemu_chr_fe_write(dev->chardev, buf, len); } static int spapr_vty_init(VIOsPAPRDevice *sdev) diff --git a/hw/strongarm.c b/hw/strongarm.c index 3a7fd6da8f..84855cbb10 100644 --- a/hw/strongarm.c +++ b/hw/strongarm.c @@ -1067,7 +1067,7 @@ static void strongarm_uart_tx(void *opaque) if (s->utcr3 & UTCR3_LBM) /* loopback */ { strongarm_uart_receive(s, &s->tx_fifo[s->tx_start], 1); } else if (s->chr) { - qemu_chr_write(s->chr, &s->tx_fifo[s->tx_start], 1); + qemu_chr_fe_write(s->chr, &s->tx_fifo[s->tx_start], 1); } s->tx_start = (s->tx_start + 1) % 8; diff --git a/hw/syborg_serial.c b/hw/syborg_serial.c index 4d0ec04e31..c83f82c36e 100644 --- a/hw/syborg_serial.c +++ b/hw/syborg_serial.c @@ -119,7 +119,7 @@ static void do_dma_tx(SyborgSerialState *s, uint32_t count) /* optimize later. Now, 1 byte per iteration */ while (count--) { cpu_physical_memory_read(s->dma_tx_ptr, &ch, 1); - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); s->dma_tx_ptr++; } } else { @@ -203,7 +203,7 @@ static void syborg_serial_write(void *opaque, target_phys_addr_t offset, case SERIAL_DATA: ch = value; if (s->chr) - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); break; case SERIAL_INT_ENABLE: s->int_enable = value; diff --git a/hw/usb-serial.c b/hw/usb-serial.c index bf2b775e83..8ed0fa6a3b 100644 --- a/hw/usb-serial.c +++ b/hw/usb-serial.c @@ -371,7 +371,7 @@ static int usb_serial_handle_data(USBDevice *dev, USBPacket *p) goto fail; for (i = 0; i < p->iov.niov; i++) { iov = p->iov.iov + i; - qemu_chr_write(s->cs, iov->iov_base, iov->iov_len); + qemu_chr_fe_write(s->cs, iov->iov_base, iov->iov_len); } break; diff --git a/hw/virtio-console.c b/hw/virtio-console.c index fe5e188bf4..6c386fa46f 100644 --- a/hw/virtio-console.c +++ b/hw/virtio-console.c @@ -27,7 +27,7 @@ static ssize_t flush_buf(VirtIOSerialPort *port, const uint8_t *buf, size_t len) VirtConsole *vcon = DO_UPCAST(VirtConsole, port, port); ssize_t ret; - ret = qemu_chr_write(vcon->chr, buf, len); + ret = qemu_chr_fe_write(vcon->chr, buf, len); trace_virtio_console_flush_buf(port->id, len, ret); if (ret < 0) { diff --git a/hw/xen_console.c b/hw/xen_console.c index 99ff442f85..8468891614 100644 --- a/hw/xen_console.c +++ b/hw/xen_console.c @@ -156,7 +156,7 @@ static void xencons_send(struct XenConsole *con) size = con->buffer.size - con->buffer.consumed; if (con->chr) - len = qemu_chr_write(con->chr, con->buffer.data + con->buffer.consumed, + len = qemu_chr_fe_write(con->chr, con->buffer.data + con->buffer.consumed, size); else len = size; diff --git a/hw/xilinx_uartlite.c b/hw/xilinx_uartlite.c index 9b94e98fe3..467a26cc9e 100644 --- a/hw/xilinx_uartlite.c +++ b/hw/xilinx_uartlite.c @@ -129,7 +129,7 @@ uart_writel (void *opaque, target_phys_addr_t addr, uint32_t value) case R_TX: if (s->chr) - qemu_chr_write(s->chr, &ch, 1); + qemu_chr_fe_write(s->chr, &ch, 1); s->regs[addr] = value; |