Changeset 6843a9c in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (4 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -52 +52 @@
 #include "s3c24xx_ts.h"
 
-#define NAME       "s3c24ser"
+#define NAME       "s3c24xx_ts"
 #define NAMESPACE  "hid"
 
@@ -62 +62 @@
 
 static irq_code_t ts_irq_code = {
+        0,
+        NULL,
         sizeof(ts_irq_cmds) / sizeof(irq_cmd_t),
         ts_irq_cmds
@@ -82 +84 @@
 int main(int argc, char *argv[])
 {
-        int rc;
-
-        printf(NAME ": S3C24xx touchscreen driver\n");
-
-        rc = loc_server_register(NAME, s3c24xx_ts_connection);
-        if (rc < 0) {
-                printf(NAME ": Unable to register driver.\n");
-                return -1;
+        printf("%s: S3C24xx touchscreen driver\n", NAME);
+        
+        async_set_client_connection(s3c24xx_ts_connection);
+        int rc = loc_server_register(NAME);
+        if (rc != EOK) {
+                printf("%s: Unable to register driver.\n", NAME);
+                return rc;
         }
 
@@ -139 +140 @@
 
         async_set_interrupt_received(s3c24xx_ts_irq_handler);
-        register_irq(inr, device_assign_devno(), 0, &ts_irq_code);
+        irq_register(inr, device_assign_devno(), 0, &ts_irq_code);
 
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);