Changeset 3d9d948 in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

Timestamp:

2010-07-27T20:13:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1720cf9

Parents:

a9b5b5f

Message:

Operate S3C24xx UART in FIFO mode.

File:

• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (3 diffs)

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

@@ -57 +57 @@
 #define S3C24XX_UTRSTAT_TX_EMPTY        0x4
 #define S3C24XX_UTRSTAT_RDATA           0x1
+
+/* Bits in UFSTAT register */
+#define S3C24XX_UFSTAT_TX_FULL          0x4000
+#define S3C24XX_UFSTAT_RX_FULL          0x0040
+#define S3C24XX_UFSTAT_RX_COUNT         0x002f
 
 static irq_cmd_t uart_irq_cmds[] = {
@@ -155 +160 @@
         (void) iid; (void) call;
 
-        if ((pio_read_32(&uart->io->utrstat) & S3C24XX_UTRSTAT_RDATA) != 0) {
+        while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_RX_COUNT) != 0) {
                 uint32_t data = pio_read_32(&uart->io->urxh) & 0xff;
+                pio_read_32(&uart->io->uerstat);
 
                 if (uart->client_phone != -1) {
@@ -206 +212 @@
 static void s3c24xx_uart_sendb(s3c24xx_uart_t *uart, uint8_t byte)
 {
-        /* Wait for transmitter to be empty. */
-        while ((pio_read_32(&uart->io->utrstat) & S3C24XX_UTRSTAT_TX_EMPTY) == 0)
+        /* Wait for space becoming available in Tx FIFO. */
+        while ((pio_read_32(&uart->io->ufstat) & S3C24XX_UFSTAT_TX_FULL) != 0)
                 ;