Changeset 4f5dc18 in mainline for contrib/arch/uspace/srv/console/console.adl

Timestamp:

2009-11-03T21:36:54Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1647323

Parents:

bbddafb (diff), b1c21c2 (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 with mainline.

File:

• contrib/arch/uspace/srv/console/console.adl (modified) (3 diffs)

contrib/arch/uspace/srv/console/console.adl

@@ -48 +48 @@
         requires:
                 [/uspace/lib/libc/requires]
+                ns ns;
+                devmap_driver devmap_driver;
+                sys_console sys_console;
                 kbd kbd;
                 fb fb;
-                ns ns;
-                sys_console sys_console;
+        initialization:
+                !ns.ipc_m_connect_me_to /* kbd */ ;
+                !kbd.ipc_m_connect_to_me ;
+                !ns.ipc_m_connect_me_to /* fb */ ;
+                [/uspace/lib/libc/fnc.devmap_driver_register] ;
+                !fb.get_resolution ;
+                (
+                        [fnc.vp_create] +
+                        [fnc.vp_switch]
+                )* ;
+                [fnc.make_pixmap]* ;
+                [fnc.make_anim] ;
+                [fnc.vp_switch] ;
+                !fb.flush ;
+                !fb.get_csize ;
+                !fb.get_color_cap ;
+                !fb.ipc_m_share_out ;
+                [/uspace/lib/libc/fnc.devmap_device_register]* ;
+                !sys_console.sys_debug_disable_console ;
+                [fnc.gcons_redraw_console] ;
+                [fnc.set_rgb_color] ;
+                [fnc.screen_clear] ;
+                [fnc.curs_goto] ;
+                [fnc.curs_visibility]
         protocol:
-                [/uspace/lib/libc/protocol] |
-                [console_server.bp]
+                [/uspace/lib/libc/protocol]
 };
 
@@ -68 +92 @@
         
         delegate console to ui_dispatcher:console;
+        delegate kbd to kbd:kbd;
+        delegate fb to fb:fb;
         
         [/uspace/lib/libc/subsume%ui_dispatcher]
@@ -74 +100 @@
         
         subsume ui_dispatcher:ns to ns;
+        subsume ui_dispatcher:devmap_driver to devmap_driver;
         subsume ui_dispatcher:sys_console to sys_console;