Changeset 925a21e in mainline for uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h

Timestamp:

2011-09-24T14:20:29Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5bf76c1

Parents:

867e2555 (diff), 1ab4aca (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:

• uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h (modified) (2 diffs)

uspace/srv/hw/char/s3c24xx_uart/s3c24xx_uart.h

@@ -39 +39 @@
 
 #include <sys/types.h>
+#include <async.h>
 
 /** S3C24xx UART I/O */
@@ -84 +85 @@
         s3c24xx_uart_io_t *io;
 
-        /** Callback phone to the client */
-        int client_phone;
+        /** Callback session to the client */
+        async_sess_t *client_sess;
 
-        /** Device handle */
-        devmap_handle_t devmap_handle;
+        /** Service ID */
+        service_id_t service_id;
 } s3c24xx_uart_t;