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

etrax-ser: Support the uart rx fifo.

Browse Source 
Add support for the rx fifo to speed up bulk transfers.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@axis.com>
This commit is contained in:
Edgar E. Iglesias 2010-06-14 18:41:12 +02:00
parent f471a17e9d
commit f2fcffbbe8
1 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
hw/etraxfs_ser.c
View File

@ -49,20 +49,27 @@ struct etrax_serial
CharDriverState *chr; CharDriverState *chr;
qemu_irq irq; qemu_irq irq;
/* This pending thing is a hack. */
int pending_tx; int pending_tx;
uint8_t rx_fifo[16];
unsigned int rx_fifo_pos;
unsigned int rx_fifo_len;
/* Control registers. */ /* Control registers. */
uint32_t regs[R_MAX]; uint32_t regs[R_MAX];
}; };
static void ser_update_irq(struct etrax_serial *s) static void ser_update_irq(struct etrax_serial *s)
{ {
s->regs[R_INTR] &= ~(s->regs[RW_ACK_INTR]);
s->regs[R_MASKED_INTR] = s->regs[R_INTR] & s->regs[RW_INTR_MASK];
if (s->rx_fifo_len) {
s->regs[R_INTR] |= 8;
} else {
s->regs[R_INTR] &= ~8;
}
s->regs[R_MASKED_INTR] = s->regs[R_INTR] & s->regs[RW_INTR_MASK];
qemu_set_irq(s->irq, !!s->regs[R_MASKED_INTR]); qemu_set_irq(s->irq, !!s->regs[R_MASKED_INTR]);
s->regs[RW_ACK_INTR] = 0;
} }
static uint32_t ser_readl (void *opaque, target_phys_addr_t addr) static uint32_t ser_readl (void *opaque, target_phys_addr_t addr)
@ -75,16 +82,25 @@ static uint32_t ser_readl (void *opaque, target_phys_addr_t addr)
switch (addr) switch (addr)
{ {
case R_STAT_DIN: case R_STAT_DIN:
r = s->regs[RS_STAT_DIN]; r = s->rx_fifo[(s->rx_fifo_pos - s->rx_fifo_len) & 15];
if (s->rx_fifo_len) {
r |= 1 << STAT_DAV;
}
r |= 1 << STAT_TR_RDY;
r |= 1 << STAT_TR_IDLE;
break; break;
case RS_STAT_DIN: case RS_STAT_DIN:
r = s->regs[addr]; r = s->rx_fifo[(s->rx_fifo_pos - s->rx_fifo_len) & 15];
/* Read side-effect: clear dav. */ if (s->rx_fifo_len) {
s->regs[addr] &= ~(1 << STAT_DAV); r |= 1 << STAT_DAV;
s->rx_fifo_len--;
}
r |= 1 << STAT_TR_RDY;
r |= 1 << STAT_TR_IDLE;
break; break;
default: default:
r = s->regs[addr]; r = s->regs[addr];
D(printf ("%s %x=%x\n", __func__, addr, r)); D(printf ("%s " TARGET_FMT_plx "=%x\n", __func__, addr, r));
break; break;
} }
return r; return r;
@ -97,23 +113,25 @@ ser_writel (void *opaque, target_phys_addr_t addr, uint32_t value)
unsigned char ch = value; unsigned char ch = value;
D(CPUState *env = s->env); D(CPUState *env = s->env);
D(printf ("%s %x %x\n", __func__, addr, value)); D(printf ("%s " TARGET_FMT_plx "=%x\n", __func__, addr, value));
addr >>= 2; addr >>= 2;
switch (addr) switch (addr)
{ {
case RW_DOUT: case RW_DOUT:
qemu_chr_write(s->chr, &ch, 1); qemu_chr_write(s->chr, &ch, 1);
s->regs[R_INTR] |= 1; s->regs[R_INTR] |= 3;
s->pending_tx = 1; s->pending_tx = 1;
s->regs[addr] = value; s->regs[addr] = value;
break; break;
case RW_ACK_INTR: case RW_ACK_INTR:
s->regs[addr] = value; if (s->pending_tx) {
if (s->pending_tx && (s->regs[addr] & 1)) { value &= ~1;
s->regs[R_INTR] |= 1;
s->pending_tx = 0; s->pending_tx = 0;
s->regs[addr] &= ~1; D(printf("fixedup value=%x r_intr=%x\n", value, s->regs[R_INTR]));
} }
s->regs[addr] = value;
s->regs[R_INTR] &= ~value;
D(printf("r_intr=%x\n", s->regs[R_INTR]));
break; break;
default: default:
s->regs[addr] = value; s->regs[addr] = value;
@ -135,11 +153,21 @@ static CPUWriteMemoryFunc * const ser_write[] = {
static void serial_receive(void *opaque, const uint8_t *buf, int size) static void serial_receive(void *opaque, const uint8_t *buf, int size)
{ {
struct etrax_serial *s = opaque; struct etrax_serial *s = opaque;
int i;
/* Got a byte. */
if (s->rx_fifo_len >= 16) {
printf("WARNING: UART dropped char.\n");
return;
}
for (i = 0; i < size; i++) {
s->rx_fifo[s->rx_fifo_pos] = buf[i];
s->rx_fifo_pos++;
s->rx_fifo_pos &= 15;
s->rx_fifo_len++;
}
s->regs[R_INTR] |= 8;
s->regs[RS_STAT_DIN] &= ~0xff;
s->regs[RS_STAT_DIN] |= (buf[0] & 0xff);
s->regs[RS_STAT_DIN] |= (1 << STAT_DAV); /* dav. */
ser_update_irq(s); ser_update_irq(s);
} }
@ -149,10 +177,11 @@ static int serial_can_receive(void *opaque)
int r; int r;
/* Is the receiver enabled? */ /* Is the receiver enabled? */
r = s->regs[RW_REC_CTRL] & 1; if (!(s->regs[RW_REC_CTRL] & (1 << 3))) {
return 0;
}
/* Pending rx data? */ r = sizeof(s->rx_fifo) - s->rx_fifo_len;
r |= !(s->regs[R_INTR] & 8);
return r; return r;
} }