Changeset 8e7c9fe in mainline for uspace/lib/drv/generic/remote_led_dev.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/lib/drv/generic/remote_led_dev.c (moved) (moved from uspace/lib/drv/generic/remote_graph_dev.c ) (2 diffs)

uspace/lib/drv/generic/remote_led_dev.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Petr Koupy
+ * Copyright (c) 2014 Martin Decky
  * All rights reserved.
  *
@@ -33 +33 @@
  */
 
+#include <async.h>
 #include <errno.h>
-#include <async.h>
+#include <io/pixel.h>
 #include <macros.h>
+#include <device/led_dev.h>
+#include <ops/led_dev.h>
+#include <ddf/driver.h>
 
-#include "ops/graph_dev.h"
-#include "graph_iface.h"
-#include "ddf/driver.h"
+static void remote_led_color_set(ddf_fun_t *, void *, ipc_callid_t,
+    ipc_call_t *);
 
-typedef enum {
-        GRAPH_DEV_CONNECT = 0
-} graph_dev_method_t;
-
-int graph_dev_connect(async_sess_t *sess)
-{
-        async_exch_t *exch = async_exchange_begin(sess);
-        int ret = async_req_1_0(exch, DEV_IFACE_ID(GRAPH_DEV_IFACE), GRAPH_DEV_CONNECT);
-        async_exchange_end(exch);
-
-        return ret;
-}
-
-static void remote_graph_connect(ddf_fun_t *, void *, ipc_callid_t, ipc_call_t *);
-
-static const remote_iface_func_ptr_t remote_graph_dev_iface_ops[] = {
-        [GRAPH_DEV_CONNECT] = remote_graph_connect
+/** Remote LED interface operations */
+static const remote_iface_func_ptr_t remote_led_dev_iface_ops[] = {
+        [LED_DEV_COLOR_SET] = remote_led_color_set
 };
 
-const remote_iface_t remote_graph_dev_iface = {
-        .method_count = ARRAY_SIZE(remote_graph_dev_iface_ops),
-        .methods = remote_graph_dev_iface_ops
+/** Remote LED interface structure
+ *
+ * Interface for processing requests from remote clients
+ * addressed by the LED interface.
+ *
+ */
+const remote_iface_t remote_led_dev_iface = {
+        .method_count = ARRAY_SIZE(remote_led_dev_iface_ops),
+        .methods = remote_led_dev_iface_ops
 };
 
-static void remote_graph_connect(ddf_fun_t *fun, void *ops, ipc_callid_t callid,
+/** Process the color_set() request from the remote client
+ *
+ * @param fun The function to which the data are written
+ * @param ops The local ops structure
+ *
+ */
+static void remote_led_color_set(ddf_fun_t *fun, void *ops, ipc_callid_t callid,
     ipc_call_t *call)
 {
-        graph_dev_ops_t *graph_dev_ops = (graph_dev_ops_t *) ops;
-
-        if (!graph_dev_ops->connect || !ddf_fun_data_get(fun)) {
+        led_dev_ops_t *led_dev_ops = (led_dev_ops_t *) ops;
+        pixel_t color = DEV_IPC_GET_ARG1(*call);
+        
+        if (!led_dev_ops->color_set) {
                 async_answer_0(callid, ENOTSUP);
                 return;
         }
-
-        (*graph_dev_ops->connect)(ddf_fun_data_get(fun), callid, call, NULL);
+        
+        int rc = (*led_dev_ops->color_set)(fun, color);
+        async_answer_0(callid, rc);
 }