Changeset 5828554 in mainline for uspace/lib/drv/generic/remote_usb.c

Timestamp:

2014-01-19T14:37:22Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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_usb.c (modified) (3 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -36 +36 @@
 #include <async.h>
 #include <errno.h>
+#include <macros.h>
 
 #include "usb_iface.h"
@@ -107 +108 @@
 
 /** Remote USB interface operations. */
-static remote_iface_func_ptr_t remote_usb_iface_ops [] = {
+static const remote_iface_func_ptr_t remote_usb_iface_ops [] = {
         [IPC_M_USB_GET_MY_ADDRESS] = remote_usb_get_my_address,
         [IPC_M_USB_GET_MY_INTERFACE] = remote_usb_get_my_interface,
@@ -115 +116 @@
 /** Remote USB interface structure.
  */
-remote_iface_t remote_usb_iface = {
-        .method_count = sizeof(remote_usb_iface_ops) /
-            sizeof(remote_usb_iface_ops[0]),
+const remote_iface_t remote_usb_iface = {
+        .method_count = ARRAY_SIZE(remote_usb_iface_ops),
         .methods = remote_usb_iface_ops
 };