Changeset 0b749a3 in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.c

Timestamp:

2010-11-22T15:39:53Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0eddb76, aae339e9

Parents:

9a1d8ab (diff), 8cd1aa5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

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

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

@@ -54 +54 @@
 #define NAMESPACE "char"
 
-/* Bits in UTRSTAT register */
-#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[] = {
         {
@@ -101 +92 @@
                 return -1;
 
-        rc = devmap_device_register(NAMESPACE "/" NAME, &uart->dev_handle);
+        rc = devmap_device_register(NAMESPACE "/" NAME, &uart->devmap_handle);
         if (rc != EOK) {
                 devmap_hangup_phone(DEVMAP_DRIVER);
@@ -169 +160 @@
                 }
 
-                if (status & 0x0f)
+                if (status != 0)
                         printf(NAME ": Error status 0x%x\n", status);
         }
@@ -202 +193 @@
 
         /* Enable FIFO, Tx trigger level: empty, Rx trigger level: 1 byte. */
-        pio_write_32(&uart->io->ufcon, 0x01);
+        pio_write_32(&uart->io->ufcon, UFCON_FIFO_ENABLE |
+            UFCON_TX_FIFO_TLEVEL_EMPTY | UFCON_RX_FIFO_TLEVEL_1B);
 
         /* Set RX interrupt to pulse mode */
         pio_write_32(&uart->io->ucon,
-            pio_read_32(&uart->io->ucon) & ~(1 << 8));
+            pio_read_32(&uart->io->ucon) & ~UCON_RX_INT_LEVEL);
 
         return EOK;