Changeset 7943c43 in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

Timestamp:

2012-01-16T22:45:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (2 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -85 +85 @@
 
         printf(NAME ": S3C24xx touchscreen driver\n");
-
-        rc = loc_server_register(NAME, s3c24xx_ts_connection);
+        
+        async_set_client_connection(s3c24xx_ts_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");
@@ -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);