Changeset b0b4592e in mainline for uspace/lib/drv/generic/remote_clock_dev.c

Timestamp:

2014-03-15T19:21:53Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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/lib/drv/generic/remote_clock_dev.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_clock_dev.c

@@ -36 +36 @@
 #include <errno.h>
 #include <time.h>
+#include <macros.h>
+#include <device/clock_dev.h>
 
 #include <ops/clock_dev.h>
@@ -46 +48 @@
 
 /** Remote clock interface operations */
-static remote_iface_func_ptr_t remote_clock_dev_iface_ops[] = {
-        &remote_clock_time_get,
-        &remote_clock_time_set,
+static const remote_iface_func_ptr_t remote_clock_dev_iface_ops[] = {
+        [CLOCK_DEV_TIME_GET] = remote_clock_time_get,
+        [CLOCK_DEV_TIME_SET] = remote_clock_time_set,
 };
 
@@ -56 +58 @@
  * addressed by the clock interface.
  */
-remote_iface_t remote_clock_dev_iface = {
-        .method_count = sizeof(remote_clock_dev_iface_ops) /
-            sizeof(remote_iface_func_ptr_t),
+const remote_iface_t remote_clock_dev_iface = {
+        .method_count = ARRAY_SIZE(remote_clock_dev_iface_ops),
         .methods = remote_clock_dev_iface_ops,
 };