Changeset 82cf692 in mainline

Timestamp:

2009-09-17T21:22:36Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

69dc065

Parents:

3037384

Message:

protocol closure
(now all bindings are satisfied and the whole architecture can be verified, but this doesn't mean that the protocols are correct)

Location:

contrib/arch

Files:

• HelenOS.adl (modified) (1 diff)
• uspace/lib/libc/bind (modified) (1 diff)
• uspace/lib/libc/requires (modified) (1 diff)
• uspace/lib/libc/subsume (modified) (1 diff)
• uspace/srv/console/console.adl (modified) (2 diffs)
• uspace/srv/console/console.bp (modified) (1 diff)
• uspace/srv/console/console_server.bp (modified) (1 diff)
• uspace/srv/fs/fat/fat.bp (modified) (1 diff)
• uspace/srv/kbd/event.bp (modified) (1 diff)

contrib/arch/HelenOS.adl

@@ -45 +45 @@
         
         bind console:ns to ns:ns;
+        bind console:sys_console to kernel:sys_console;
         
         bind klog:ns to ns:ns;

contrib/arch/uspace/lib/libc/bind

@@ -1 +1 @@
 /* Bind %% to kernel interfaces */
 bind %%:sys_klog to kernel:sys_klog;
-bind %%:sys_console to kernel:sys_console;
 bind %%:sys_tls to kernel:sys_tls;
 bind %%:sys_thread to kernel:sys_thread;

contrib/arch/uspace/lib/libc/requires

@@ -1 +1 @@
 /* Kernel interfaces required by libc */
 sys_klog sys_klog;
-sys_console sys_console;
 sys_tls sys_tls;
 sys_thread sys_thread;

contrib/arch/uspace/lib/libc/subsume

@@ -1 +1 @@
 /* Subsume %% to kernel interfaces */
 subsume %%:sys_klog to sys_klog;
-subsume %%:sys_console to sys_console;
 subsume %%:sys_tls to sys_tls;
 subsume %%:sys_thread to sys_thread;

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

@@ -51 +51 @@
                 fb fb;
                 ns ns;
+                sys_console sys_console;
         protocol:
                 [/uspace/lib/libc/protocol] |
@@ -73 +74 @@
         
         subsume ui_dispatcher:ns to ns;
+        subsume ui_dispatcher:sys_console to sys_console;
+        
         subsume kbd:ns to ns;
         subsume fb:ns to ns;

contrib/arch/uspace/srv/console/console.bp

@@ -58 +58 @@
         } +
         
+        ?kcon_enable {
+                !sys_console.sys_enable_console
+        } +
+        
         ?get_event +
         ?get_size +
-        ?get_color_cap +
-        ?kcon_enable
+        ?get_color_cap
 )* ;
 ?ipc_m_phone_hungup {

contrib/arch/uspace/srv/console/console_server.bp

@@ -17 +17 @@
         !fb.ipc_m_share_out ;
         [/uspace/lib/libc/fnc.devmap_device_register]* ;
+        !sys_console.sys_disable_console ;
         [fnc.gcons_redraw_console] ;
         [fnc.set_rgb_color] ;

contrib/arch/uspace/srv/fs/fat/fat.bp

@@ -5 +5 @@
         (
                 ?mounted {
-                        ?ipc_m_data_write /* mount options */
+                        ?ipc_m_data_write /* mount options */ ;
+                        tentative {
+                                [/uspace/lib/libblock/fnc.block_init%rd]
+                        }
                 } +
                 

contrib/arch/uspace/srv/kbd/event.bp

@@ -1 +1 @@
 ?ipc_m_connect_me_to ;
-?event* ;
+?event {
+        tentative {
+                !sys_console.sys_enable_console
+        }
+}* ;
 ?ipc_m_phone_hungup