Changeset 8e7c9fe in mainline for uspace/drv/fb/kfb/port.c

Timestamp:

2014-09-12T03:45:25Z (10 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/drv/fb/kfb/port.c (modified) (3 diffs)

uspace/drv/fb/kfb/port.c

@@ -207 +207 @@
 };
 
+static void graph_vsl_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg)
+{
+        visualizer_t *vsl;
+
+        vsl = (visualizer_t *) ddf_fun_data_get((ddf_fun_t *)arg);
+        graph_visualizer_connection(vsl, iid, icall, NULL);
+}
+
 int port_init(ddf_dev_t *dev)
 {
@@ -333 +341 @@
         
         kfb.size = scanline * height;
+        kfb.addr = AS_AREA_ANY;
+        
         rc = physmem_map(paddr + offset,
             ALIGN_UP(kfb.size, PAGE_SIZE) >> PAGE_WIDTH,
@@ -344 +354 @@
                 return ENOMEM;
         }
-        ddf_fun_set_ops(fun_vs, &graph_vsl_device_ops);
+        ddf_fun_set_conn_handler(fun_vs, &graph_vsl_connection);
 
         visualizer_t *vs = ddf_fun_data_alloc(fun_vs, sizeof(visualizer_t));