david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

char/cadence_uart: s/r_fifo/rx_fifo

Browse Source 
Rename this field to match the many other uses of "rx". Xilinx
docmentation (UG585) also refers to this as "RxFIFO".

Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 7386d7cee0ea175f7e53ed5ff045265528d34e32.1388626249.git.peter.crosthwaite@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Crosthwaite 2014-01-06 10:16:38 +00:00 committed by Peter Maydell
parent 823dd48761
commit 1e77c91e24
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/char/cadence_uart.c
View File

@ -116,7 +116,7 @@ typedef struct {
MemoryRegion iomem; MemoryRegion iomem;
uint32_t r[R_MAX]; uint32_t r[R_MAX];
uint8_t r_fifo[RX_FIFO_SIZE]; uint8_t rx_fifo[RX_FIFO_SIZE];
uint32_t rx_wpos; uint32_t rx_wpos;
uint32_t rx_count; uint32_t rx_count;
uint64_t char_tx_time; uint64_t char_tx_time;
@ -280,7 +280,7 @@ static void uart_write_rx_fifo(void *opaque, const uint8_t *buf, int size)
s->r[R_CISR] |= UART_INTR_ROVR; s->r[R_CISR] |= UART_INTR_ROVR;
} else { } else {
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
s->r_fifo[s->rx_wpos] = buf[i]; s->rx_fifo[s->rx_wpos] = buf[i];
s->rx_wpos = (s->rx_wpos + 1) % RX_FIFO_SIZE; s->rx_wpos = (s->rx_wpos + 1) % RX_FIFO_SIZE;
s->rx_count++; s->rx_count++;
@ -344,7 +344,7 @@ static void uart_read_rx_fifo(UartState *s, uint32_t *c)
if (s->rx_count) { if (s->rx_count) {
uint32_t rx_rpos = uint32_t rx_rpos =
(RX_FIFO_SIZE + s->rx_wpos - s->rx_count) % RX_FIFO_SIZE; (RX_FIFO_SIZE + s->rx_wpos - s->rx_count) % RX_FIFO_SIZE;
*c = s->r_fifo[rx_rpos]; *c = s->rx_fifo[rx_rpos];
s->rx_count--; s->rx_count--;
if (!s->rx_count) { if (!s->rx_count) {
@ -492,7 +492,7 @@ static const VMStateDescription vmstate_cadence_uart = {
.post_load = cadence_uart_post_load, .post_load = cadence_uart_post_load,
.fields = (VMStateField[]) { .fields = (VMStateField[]) {
VMSTATE_UINT32_ARRAY(r, UartState, R_MAX), VMSTATE_UINT32_ARRAY(r, UartState, R_MAX),
VMSTATE_UINT8_ARRAY(r_fifo, UartState, RX_FIFO_SIZE), VMSTATE_UINT8_ARRAY(rx_fifo, UartState, RX_FIFO_SIZE),
VMSTATE_UINT32(rx_count, UartState), VMSTATE_UINT32(rx_count, UartState),
VMSTATE_UINT32(rx_wpos, UartState), VMSTATE_UINT32(rx_wpos, UartState),
VMSTATE_TIMER(fifo_trigger_handle, UartState), VMSTATE_TIMER(fifo_trigger_handle, UartState),