Changeset b077886e in mainline for contrib/arch/uspace/srv

Timestamp:

2009-09-13T23:41:37Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99e5526, c35aabe

Parents:

3052ff4 (diff), 2ac62cf (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.

Location:

contrib/arch/uspace/srv

Files:

• bd/block_device.adl (added)
• bd/block_device.bp (added)
• bd/rd/rd.adl (added)
• bd/rd/rd.bp (added)
• console/cell_mark_changed (added)
• console/clear (added)
• console/cons_read (added)
• console/cons_write (added)
• console/console.bp (added)
• console/curs_goto (added)
• console/curs_visibility (added)
• console/draw_pixmap (added)
• console/fb_pending_flush (added)
• console/gcons_notify_connect (added)
• console/gcons_notify_disconnect (added)
• console/gcons_redraw_console (added)
• console/make_anim (added)
• console/make_pixmap (added)
• console/redraw_state (added)
• console/screen_clear (added)
• console/set_color (added)
• console/set_rgb_color (added)
• console/set_style (added)
• console/vp_create (added)
• console/vp_switch (added)
• console/write_char (added)
• devmap/device_mapper_client.bp (added)
• devmap/device_mapper_driver.bp (added)
• devmap/devmap.adl (added)
• devmap/devmap.bp (added)
• fb/fb.bp (added)
• fs/devfs/devfs.bp (moved) (moved from contrib/bp/srv/fs/devfs/devfs.bp ) (4 diffs)
• fs/fat/fat.bp (added)
• fs/tmpfs/tmpfs.bp (added)
• kbd/kbd.bp (moved) (moved from contrib/bp/srv/kbd/kbd.bp ) (1 diff)
• loader/loader.bp (added)
• ns/naming_service.bp (added)
• ns/ns.adl (added)
• ns/service.adl (added)
• pci/pci.bp (added)
• vfs/vfs.bp (moved) (moved from contrib/bp/srv/vfs/vfs.bp ) (11 diffs)
• vfs/vfs_grab_phone (moved) (moved from contrib/bp/srv/vfs/vfs_grab_phone )
• vfs/vfs_lookup_internal (moved) (moved from contrib/bp/srv/vfs/vfs_lookup_internal )
• vfs/vfs_release_phone (moved) (moved from contrib/bp/srv/vfs/vfs_release_phone )

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

@@ -3 +3 @@
 [../../../lib/libfs/fs_register] ;
 (
-        ?IPC_M_CONNECT_ME_TO ;
+        ?fs.IPC_M_CONNECT_ME_TO ;
         (
-                ?VFS_OUT_MOUNTED {
-                        ?IPC_M_DATA_WRITE /* mount options */
+                ?fs.VFS_OUT_MOUNTED {
+                        ?fs.IPC_M_DATA_WRITE /* mount options */
                 } +
                 
-                ?VFS_OUT_MOUNT +
+                ?fs.VFS_OUT_MOUNT +
                 
-                ?VFS_OUT_LOOKUP {
+                ?fs.VFS_OUT_LOOKUP {
                         (
                                 [../../../lib/libc/devmap_device_get_handle] ;
@@ -19 +19 @@
                 } +
                 
-                ?VFS_OUT_READ {
-                        ?IPC_M_DATA_READ /* payload */ {
+                ?fs.VFS_OUT_READ {
+                        ?fs.IPC_M_DATA_READ /* payload */ {
                                 (
                                         !dev.VFS_OUT_READ ;
@@ -32 +32 @@
                 } +
                 
-                ?VFS_OUT_WRITE {
-                        ?IPC_M_DATA_WRITE /* payload */ {
+                ?fs.VFS_OUT_WRITE {
+                        ?fs.IPC_M_DATA_WRITE /* payload */ {
                                 (
                                         !dev.VFS_OUT_WRITE ;
@@ -42 +42 @@
                 } +
                 
-                ?VFS_OUT_TRUNCATE +
+                ?fs.VFS_OUT_TRUNCATE +
                 
-                ?VFS_OUT_CLOSE {
+                ?fs.VFS_OUT_CLOSE {
                         !dev.IPC_M_PHONE_HUNGUP
                 } +
                 
-                ?VFS_OUT_DESTROY +
+                ?fs.VFS_OUT_DESTROY +
                 
-                ?VFS_OUT_OPEN_NODE {
+                ?fs.VFS_OUT_OPEN_NODE {
                         [../../../lib/libc/devmap_device_connect] +
                         NULL
                 } +
                 
-                ?VFS_OUT_STAT {
+                ?fs.VFS_OUT_STAT {
                         ?IPC_M_DATA_READ /* struct stat */
                 } +
                 
-                ?VFS_OUT_SYNC
+                ?fs.VFS_OUT_SYNC
                 
         )* ;
-        ?IPC_M_PHONE_HUNGUP
+        ?fs.IPC_M_PHONE_HUNGUP
 )* ;
 !vfs.IPC_M_PHONE_HUNGUP

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

@@ -5 +5 @@
 !ns.IPC_M_CONNECT_TO_ME ;
 (
-        ?IPC_M_CONNECT_ME_TO ;
+        ?kbd.IPC_M_CONNECT_ME_TO ;
         (
                 (
-                        ?KBD_YIELD +
-                        ?KBD_RECLAIM +
+                        ?kbd.KBD_YIELD +
+                        ?kbd.KBD_RECLAIM +
                 ) |
                 !console.KBD_EVENT
         )* ;
-        ?IPC_M_PHONE_HUNGUP
+        ?kbd.IPC_M_PHONE_HUNGUP
 )* ;
 (

contrib/arch/uspace/srv/vfs/vfs.bp

@@ -1 +1 @@
 !ns.IPC_M_CONNECT_TO_ME ;
 (
-        ?IPC_M_CONNECT_ME_TO ;
+        ?vfs.IPC_M_CONNECT_ME_TO ;
         (
-                ?VFS_IN_REGISTER {
-                        ?IPC_M_DATA_WRITE ;
-                        ?IPC_M_CONNECT_TO_ME ;
-                        ?IPC_M_SHARE_IN
+                ?vfs.VFS_IN_REGISTER {
+                        ?vfs.IPC_M_DATA_WRITE ;
+                        ?vfs.IPC_M_CONNECT_TO_ME ;
+                        ?vfs.IPC_M_SHARE_IN
                 } +
                 
-                ?VFS_IN_MOUNT {
-                        ?IPC_M_DATA_WRITE /* mount point */ ;
-                        ?IPC_M_DATA_WRITE /* mount options */ ;
-                        ?IPC_M_DATA_WRITE /* fs name */ ;
-                        ?IPC_M_PING ;
+                ?vfs.VFS_IN_MOUNT {
+                        ?vfs.IPC_M_DATA_WRITE /* mount point */ ;
+                        ?vfs.IPC_M_DATA_WRITE /* mount options */ ;
+                        ?vfs.IPC_M_DATA_WRITE /* fs name */ ;
+                        ?vfs.IPC_M_PING ;
                         (
                                 
@@ -26 +26 @@
                 } +
                 
-                ?VFS_IN_OPEN {
-                        ?IPC_M_DATA_WRITE /* path */ ;
+                ?vfs.VFS_IN_OPEN {
+                        ?vfs.IPC_M_DATA_WRITE /* path */ ;
                         [vfs_lookup_internal] ;
                         (
@@ -39 +39 @@
                 } +
                 
-                ?VFS_IN_OPEN_NODE {
+                ?vfs.VFS_IN_OPEN_NODE {
                         [vfs_grab_phone] ;
                         !fs.VFS_OUT_OPEN_NODE ;
@@ -50 +50 @@
                                 ) +
                                 NULL
-                                NULL
                         )
                 } +
                 
-                ?VFS_IN_CLOSE {
+                ?vfs.VFS_IN_CLOSE {
                         [vfs_grab_phone] ;
                         !fs.VFS_OUT_CLOSE ;
@@ -60 +59 @@
                 } +
                 
-                ?VFS_IN_READ {
-                        ?IPC_M_DATA_READ {
+                ?vfs.VFS_IN_READ {
+                        ?vfs.IPC_M_DATA_READ {
                                 [vfs_grab_phone] ;
                                 !fs.VFS_OUT_READ /* payload */ ;
@@ -69 +68 @@
                 } +
                 
-                ?VFS_IN_WRITE {
-                        ?IPC_M_DATA_WRITE {
+                ?vfs.VFS_IN_WRITE {
+                        ?vfs.IPC_M_DATA_WRITE {
                                 [vfs_grab_phone] ;
                                 !fs.VFS_OUT_WRITE /* payload */ ;
@@ -78 +77 @@
                 } +
                 
-                ?VFS_IN_SEEK +
+                ?vfs.VFS_IN_SEEK +
                 
-                ?VFS_IN_TRUNCATE {
+                ?vfs.VFS_IN_TRUNCATE {
                         [vfs_grab_phone] ;
                         !fs.VFS_OUT_TRUNCATE ;
@@ -86 +85 @@
                 } +
                 
-                ?VFS_IN_FSTAT {
-                        ?IPC_M_DATA_READ /* struct stat */ {
+                ?vfs.VFS_IN_FSTAT {
+                        ?vfs.IPC_M_DATA_READ /* struct stat */ {
                                 [vfs_grab_phone] ;
                                 !fs.VFS_OUT_STAT ;
@@ -95 +94 @@
                 } +
                 
-                ?VFS_IN_STAT {
-                        ?IPC_M_DATA_WRITE /* path */ ;
-                        ?IPC_M_DATA_READ /* struct stat */ {
+                ?vfs.VFS_IN_STAT {
+                        ?vfs.IPC_M_DATA_WRITE /* path */ ;
+                        ?vfs.IPC_M_DATA_READ /* struct stat */ {
                                 [vfs_lookup_internal] ;
                                 !fs.VFS_OUT_STAT ;
@@ -104 +103 @@
                 } +
                 
-                ?VFS_IN_MKDIR {
-                        ?IPC_M_DATA_WRITE /* path */ ;
+                ?vfs.VFS_IN_MKDIR {
+                        ?vfs.IPC_M_DATA_WRITE /* path */ ;
                         [vfs_lookup_internal]
                 } +
                 
-                ?VFS_IN_UNLINK {
-                        ?IPC_M_DATA_WRITE /* path */ ;
+                ?vfs.VFS_IN_UNLINK {
+                        ?vfs.IPC_M_DATA_WRITE /* path */ ;
                         [vfs_lookup_internal]
                 } +
                 
-                ?VFS_IN_RENAME {
-                        ?IPC_M_DATA_WRITE /* old path */ ;
-                        ?IPC_M_DATE_WRITE /* new path */ ;
+                ?vfs.VFS_IN_RENAME {
+                        ?vfs.IPC_M_DATA_WRITE /* old path */ ;
+                        ?vfs.IPC_M_DATE_WRITE /* new path */ ;
                         [vfs_lookup_internal] /* lookup old path */ ;
                         [vfs_lookup_internal] /* lookup parent of new path */ ;
@@ -124 +123 @@
                 } +
                 
-                ?VFS_IN_SYNC {
+                ?vfs.VFS_IN_SYNC {
                         !fs.VFS_OUT_SYNC
                 }
                 
         )* ;
-        ?IPC_M_PHONE_HUNGUP
+        ?vfs.IPC_M_PHONE_HUNGUP
 )*