Changeset f14291b in mainline for kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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 mainline changes.

File:

• kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h (modified) (1 diff)

kernel/genarch/include/drivers/s3c24xx_uart/s3c24xx_uart.h

@@ -38 +38 @@
 #define KERN_S3C24XX_UART_H_
 
+#include <ddi/irq.h>
+#include <console/chardev.h>
 #include <typedefs.h>
-#include <console/chardev.h>
 
-extern outdev_t *s3c24xx_uart_init(ioport8_t *);
+/** S3C24xx UART I/O */
+typedef struct {
+        uint32_t ulcon;
+        uint32_t ucon;
+        uint32_t ufcon;
+        uint32_t umcon;
+
+        uint32_t utrstat;
+        uint32_t uerstat;
+        uint32_t ufstat;
+        uint32_t umstat;
+
+        uint32_t utxh;
+        uint32_t urxh;
+
+        uint32_t ubrdiv;
+} s3c24xx_uart_io_t;
+
+/* 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
+
+/* Bits in UCON register */
+#define UCON_RX_INT_LEVEL               0x100
+
+/* Bits in UFCON register */
+#define UFCON_TX_FIFO_TLEVEL_EMPTY      0x00
+#define UFCON_RX_FIFO_TLEVEL_1B         0x00
+#define UFCON_FIFO_ENABLE               0x01
+
+
+/** S3C24xx UART instance */
+typedef struct {
+        s3c24xx_uart_io_t *io;
+        indev_t *indev;
+        irq_t irq;
+} s3c24xx_uart_t;
+
+extern outdev_t *s3c24xx_uart_init(s3c24xx_uart_io_t *, inr_t inr);
+extern void s3c24xx_uart_input_wire(s3c24xx_uart_t *,
+    indev_t *);
 
 #endif