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

Timestamp:

2010-07-27T21:42:47Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

69a60c4

Parents:

5a9f4d7 (diff), 1720cf9 (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 from lp:~jsvoboda/helenos/gta02.

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;
+
+/** 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