Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unified naming between UART and VirtIO console methods.

Browse Source
This commit is contained in:
Florian Nücke
2020-09-24 16:56:06 +02:00
parent df49fcb580
commit 78ec00379e
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/java/li/cil/circuity/vm/device/UART16550A.java
View File

@@ -133,17 +133,34 @@ public final class UART16550A implements Resettable, Steppable, MemoryMappedDevi
return interrupt;
}
public boolean canReceive() {
return receiveFifo.size() < FIFO_QUEUE_CAPACITY;
public int read() {
synchronized (lock) {
if ((lsr & UART_LSR_TEMT) != 0) {
return -1;
}
final byte value;
if ((fcr & UART_FCR_FE) != 0) {
value = transmitFifo.dequeueByte();
if (transmitFifo.isEmpty()) {
lsr |= UART_LSR_THRE | UART_LSR_TEMT;
}
} else {
value = thr;
lsr |= UART_LSR_THRE | UART_LSR_TEMT;
}
if ((lsr & UART_LSR_THRE) != 0 && !transmitInterruptPending) {
transmitInterruptPending = true;
interruptUpdatePending = true;
}
return value;
}
}
public void putBreak() {
synchronized (lock) {
rbr = 0;
// QEMU says: when the LSR_DR is set a null byte is pushed into the fifo.
putByte((byte) 0);
lsr |= UART_LSR_BI | UART_LSR_DR;
}
public boolean canPutByte() {
return receiveFifo.size() < FIFO_QUEUE_CAPACITY;
}
public void putByte(final byte value) {
@@ -168,29 +185,12 @@ public final class UART16550A implements Resettable, Steppable, MemoryMappedDevi
}
}
public int getByte() {
public void putBreak() {
synchronized (lock) {
if ((lsr & UART_LSR_TEMT) != 0) {
return -1;
}
final byte value;
if ((fcr & UART_FCR_FE) != 0) {
value = transmitFifo.dequeueByte();
if (transmitFifo.isEmpty()) {
lsr |= UART_LSR_THRE | UART_LSR_TEMT;
}
} else {
value = thr;
lsr |= UART_LSR_THRE | UART_LSR_TEMT;
}
if ((lsr & UART_LSR_THRE) != 0 && !transmitInterruptPending) {
transmitInterruptPending = true;
interruptUpdatePending = true;
}
return value;
rbr = 0;
// QEMU says: when the LSR_DR is set a null byte is pushed into the fifo.
putByte((byte) 0);
lsr |= UART_LSR_BI | UART_LSR_DR;
}
}