Changeset 1993f9a in mainline for contrib/arch/uspace/srv
- Timestamp:
- 2009-09-15T13:45:23Z (16 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- ea5f46d
- Parents:
- ec8bab59
- Location:
- contrib/arch/uspace/srv
- Files:
-
- 28 added
- 24 deleted
- 8 edited
-
bd/rd/rd.adl (modified) (1 diff)
-
bd/rd/rd.bp (modified) (1 diff)
-
console/cell_mark_changed (deleted)
-
console/clear (deleted)
-
console/cons_read (deleted)
-
console/cons_write (deleted)
-
console/console.bp (modified) (6 diffs)
-
console/curs_goto (deleted)
-
console/curs_visibility (deleted)
-
console/draw_pixmap (deleted)
-
console/fb_pending_flush (deleted)
-
console/fnc.cell_mark_changed (added)
-
console/fnc.clear (added)
-
console/fnc.cons_read (added)
-
console/fnc.cons_write (added)
-
console/fnc.curs_goto (added)
-
console/fnc.curs_visibility (added)
-
console/fnc.draw_pixmap (added)
-
console/fnc.fb_pending_flush (added)
-
console/fnc.gcons_notify_char (added)
-
console/fnc.gcons_notify_connect (added)
-
console/fnc.gcons_notify_disconnect (added)
-
console/fnc.gcons_redraw_console (added)
-
console/fnc.make_anim (added)
-
console/fnc.make_pixmap (added)
-
console/fnc.redraw_state (added)
-
console/fnc.screen_clear (added)
-
console/fnc.set_color (added)
-
console/fnc.set_rgb_color (added)
-
console/fnc.set_style (added)
-
console/fnc.vp_create (added)
-
console/fnc.vp_switch (added)
-
console/fnc.write_char (added)
-
console/gcons_notify_connect (deleted)
-
console/gcons_notify_disconnect (deleted)
-
console/gcons_redraw_console (deleted)
-
console/make_anim (deleted)
-
console/make_pixmap (deleted)
-
console/redraw_state (deleted)
-
console/screen_clear (deleted)
-
console/set_color (deleted)
-
console/set_rgb_color (deleted)
-
console/set_style (deleted)
-
console/vp_create (deleted)
-
console/vp_switch (deleted)
-
console/write_char (deleted)
-
devmap/devmap.adl (modified) (6 diffs)
-
fs/devfs/devfs.bp (modified) (4 diffs)
-
fs/fat/fat.bp (modified) (3 diffs)
-
fs/tmpfs/tmpfs.bp (modified) (3 diffs)
-
vfs/fnc.vfs_grab_phone (added)
-
vfs/fnc.vfs_lookup_internal (added)
-
vfs/fnc.vfs_open_node_internal (added)
-
vfs/fnc.vfs_release_phone (added)
-
vfs/vfs.adl (added)
-
vfs/vfs.bp (modified) (1 diff)
-
vfs/vfs_grab_phone (deleted)
-
vfs/vfs_lookup_internal (deleted)
-
vfs/vfs_release_phone (deleted)
-
vfs/virtual_fs.bp (added)
Legend:
- Unmodified
- Added
- Removed
-
contrib/arch/uspace/srv/bd/rd/rd.adl
rec8bab59 r1993f9a 3 3 block_device bd; 4 4 requires: 5 [/uspace/lib/libc/requires%] 5 6 naming_service ns; 6 7 device_mapper_driver dm_driver; 7 [/uspace/lib/libc/requires]8 8 protocol: 9 9 [/uspace/lib/libc/protocol] + -
contrib/arch/uspace/srv/bd/rd/rd.bp
rec8bab59 r1993f9a 1 [/ lib/libc/fnc.devmap_driver_register] ;2 [/ lib/libc/fnc.devmap_device_register]1 [/uspace/lib/libc/fnc.devmap_driver_register] ; 2 [/uspace/lib/libc/fnc.devmap_device_register] -
contrib/arch/uspace/srv/console/console.bp
rec8bab59 r1993f9a 2 2 !kbd.IPC_CONNECT_TO_ME ; 3 3 !ns.IPC_CONNECT_ME_TO /* fb */ ; 4 [ devmap_driver_register] ;4 [/uspace/lib/libc/fnc.devmap_driver_register] ; 5 5 !fb.FB_GET_RESOLUTION ; 6 6 ( 7 [ vp_create] +8 [ vp_switch]7 [fnc.vp_create] + 8 [fnc.vp_switch] 9 9 )* ; 10 [ make_pixmap]* ;11 [ make_anim] ;12 [ vp_switch] ;10 [fnc.make_pixmap]* ; 11 [fnc.make_anim] ; 12 [fnc.vp_switch] ; 13 13 !fb.FB_FLUSH ; 14 14 !fb.FB_GET_CSIZE ; 15 15 !fb.FB_GET_COLOR_CAP ; 16 16 !fb.IPC_M_SHARE_OUT ; 17 [ devmap_device_register]* ;18 [ gcons_redraw_console] ;19 [ set_rgb_color] ;20 [ screen_clear] ;21 [ curs_goto] ;22 [ curs_visibility] ;17 [/uspace/lib/libc/fnc.devmap_device_register]* ; 18 [fnc.gcons_redraw_console] ; 19 [fnc.set_rgb_color] ; 20 [fnc.screen_clear] ; 21 [fnc.curs_goto] ; 22 [fnc.curs_visibility] ; 23 23 ( 24 24 ?console.IPC_M_CONNECT_ME_TO ; 25 [ gcons_notify_connect] ;25 [fnc.gcons_notify_connect] ; 26 26 ( 27 27 ?console.VFS_OUT_READ { 28 [ cons_read]28 [fnc.cons_read] 29 29 } + 30 30 31 31 ?console.VFS_OUT_WRITE { 32 [ cons_write]32 [fnc.cons_write] 33 33 } + 34 34 35 35 ?console.VFS_OUT_SYNC { 36 [f b_pending_flush] ;36 [fnc.fb_pending_flush] ; 37 37 ( 38 38 ( 39 39 !fb.FB_FLUSH ; 40 [ curs_goto]40 [fnc.curs_goto] 41 41 ) + 42 42 NULL … … 59 59 60 60 ?console.CONSOLE_SET_STYLE { 61 [f b_pending_flush] ;61 [fnc.fb_pending_flush] ; 62 62 ( 63 [ set_style] +63 [fnc.set_style] + 64 64 NULL 65 65 ) … … 67 67 68 68 ?console.CONSOLE_SET_COLOR { 69 [f b_pending_flush] ;69 [fnc.fb_pending_flush] ; 70 70 ( 71 [ set_color] +71 [fnc.set_color] + 72 72 NULL 73 73 ) … … 75 75 76 76 ?console.CONSOLE_SET_RGB_COLOR { 77 [f b_pending_flush] ;77 [fnc.fb_pending_flush] ; 78 78 ( 79 [ set_rgb_color] +79 [fnc.set_rgb_color] + 80 80 NULL 81 81 ) … … 83 83 84 84 ?console.CONSOLE_CURSOR_VISIBILITY { 85 [f b_pending_flush] ;85 [fnc.fb_pending_flush] ; 86 86 ( 87 [ curs_visibility] +87 [fnc.curs_visibility] + 88 88 NULL 89 89 ) … … 97 97 98 98 ?console.IPC_M_PHONE_HUNGUP { 99 [ gcons_notify_disconnect]99 [fnc.gcons_notify_disconnect] 100 100 } 101 101 )* -
contrib/arch/uspace/srv/devmap/devmap.adl
rec8bab59 r1993f9a 4 4 5 5 /* Register as a new driver */ 6 ipcarg_t driver_register( void);6 ipcarg_t driver_register(in_copy string name); 7 7 8 8 /* Unregister all devices and the driver itself */ … … 10 10 11 11 /* Register new device and return handle */ 12 ipcarg_t device_register( out ipcarg_t handle);12 ipcarg_t device_register(in_copy string name, out ipcarg_t handle); 13 13 14 14 /* Unregister device */ … … 16 16 17 17 /* Resolve device name to handle */ 18 ipcarg_t device_get_handle(in ipcarg_t flags );18 ipcarg_t device_get_handle(in ipcarg_t flags, in_copy string name); 19 19 20 20 /* Get device name for a given handle */ 21 21 ipcarg_t device_get_name(in ipcarg_t handle); 22 23 /* Transfer driver or device name */24 ipcarg_t ipc_m_data_write(in ipcarg_t src_addr, in ipcarg_t src_size, out ipcarg_t dst_addr, out ipcarg_t dst_size);25 22 26 23 /* Close connection */ … … 35 32 36 33 /* Resolve device name to handle */ 37 ipcarg_t device_get_handle(in ipcarg_t flags );34 ipcarg_t device_get_handle(in ipcarg_t flags, in_copy string name); 38 35 39 36 /* Get device name for a given handle */ … … 50 47 51 48 /* Get an array of (device_name, handle) pairs */ 52 ipcarg_t device_get_devices(void) 53 54 /* Transfer device name from client */ 55 ipcarg_t ipc_m_data_write(in ipcarg_t src_addr, in ipcarg_t src_size, out ipcarg_t dst_addr, out ipcarg_t dst_size); 56 57 /* Transfer (device_name, handle) pairs to client */ 58 ipcarg_t ipc_m_data_read(in ipcarg_t src_addr, in ipcarg_t src_size, out ipcarg_t dst_addr, out ipcarg_t dst_size); 49 ipcarg_t device_get_devices(out_copy stream data) 59 50 60 51 /* Close connection */ … … 70 61 device_mapper_client dm_client; 71 62 requires: 72 [/ lib/libc/iface.requires]63 [/uspace/lib/libc/requires%] 73 64 protocol: 74 65 [devmap.bp] -
contrib/arch/uspace/srv/fs/devfs/devfs.bp
rec8bab59 r1993f9a 1 [ ../../../lib/libc/devmap_get_phone] ;1 [/uspace/lib/libc/fnc.devmap_get_phone] ; 2 2 !ns.IPC_M_CONNECT_ME_TO /* vfs */ ; 3 [ ../../../lib/libfs/fs_register] ;3 [/uspace/lib/libfs/fnc.fs_register] ; 4 4 ( 5 5 ?fs.IPC_M_CONNECT_ME_TO ; … … 13 13 ?fs.VFS_OUT_LOOKUP { 14 14 ( 15 [ ../../../lib/libc/devmap_device_get_handle] ;16 [ ../../../lib/libc/devmap_device_connect]15 [/uspace/lib/libc/fnc.devmap_device_get_handle] ; 16 [/uspace/lib/libc/fnc.devmap_device_connect] 17 17 ) + 18 18 NULL … … 26 26 ) + 27 27 ( 28 [ ../../../lib/libc/devmap_device_get_count] ;29 [ ../../../lib/libc/devmap_device_get_devices]28 [/uspace/lib/libc/fnc.devmap_device_get_count] ; 29 [/uspace/lib/libc/fnc.devmap_device_get_devices] 30 30 ) 31 31 } … … 51 51 52 52 ?fs.VFS_OUT_OPEN_NODE { 53 [ ../../../lib/libc/devmap_device_connect] +53 [/uspace/lib/libc/fnc.devmap_device_connect] + 54 54 NULL 55 55 } + -
contrib/arch/uspace/srv/fs/fat/fat.bp
rec8bab59 r1993f9a 1 1 !ns.IPC_M_CONNECT_ME_TO /* vfs */ ; 2 [ ../../../lib/libfs/fs_register] ;2 [/uspace/lib/libfs/fnc.fs_register] ; 3 3 ( 4 4 ?fs.IPC_M_CONNECT_ME_TO ; … … 9 9 10 10 ?fs.VFS_OUT_MOUNT { 11 [ ../../../lib/libfs/libfs_mount]11 [/uspace/lib/libfs/fnc.libfs_mount] 12 12 } + 13 13 14 14 ?fs.VFS_OUT_LOOKUP { 15 [ ../../../lib/libfs/libfs_lookup]15 [/uspace/lib/libfs/fnc.libfs_lookup] 16 16 } + 17 17 … … 31 31 32 32 ?fs.VFS_OUT_OPEN_NODE { 33 [ ../../../lib/libfs/libfs_open_node]33 [/uspace/lib/libfs/fnc.libfs_open_node] 34 34 } + 35 35 36 36 ?fs.VFS_OUT_STAT { 37 [ ../../../lib/libfs/libfs_stat]37 [/uspace/lib/libfs/fnc.libfs_stat] 38 38 } + 39 39 -
contrib/arch/uspace/srv/fs/tmpfs/tmpfs.bp
rec8bab59 r1993f9a 1 1 !ns.IPC_M_CONNECT_ME_TO /* vfs */ ; 2 [ ../../../lib/libfs/fs_register] ;2 [/uspace/lib/libfs/fnc.fs_register] ; 3 3 ( 4 4 ?fs.IPC_M_CONNECT_ME_TO ; … … 9 9 10 10 ?fs.VFS_OUT_MOUNT { 11 [ ../../../lib/libfs/libfs_mount]11 [/uspace/lib/libfs/fnc.libfs_mount] 12 12 } + 13 13 14 14 ?fs.VFS_OUT_LOOKUP { 15 [ ../../../lib/libfs/libfs_lookup]15 [/uspace/lib/libfs/fnc.libfs_lookup] 16 16 } + 17 17 … … 31 31 32 32 ?fs.VFS_OUT_OPEN_NODE { 33 [ ../../../lib/libfs/libfs_open_node]33 [/uspace/lib/libfs/fnc.libfs_open_node] 34 34 } + 35 35 36 36 ?fs.VFS_OUT_STAT { 37 [ ../../../lib/libfs/libfs_stat]37 [/uspace/lib/libfs/fnc.libfs_stat] 38 38 } + 39 39 -
contrib/arch/uspace/srv/vfs/vfs.bp
rec8bab59 r1993f9a 1 !ns.IPC_M_CONNECT_TO_ME ; 2 ( 3 ?vfs.IPC_M_CONNECT_ME_TO ; 4 ( 5 ?vfs.VFS_IN_REGISTER { 6 ?vfs.IPC_M_DATA_WRITE ; 7 ?vfs.IPC_M_CONNECT_TO_ME ; 8 ?vfs.IPC_M_SHARE_IN 9 } + 10 11 ?vfs.VFS_IN_MOUNT { 12 ?vfs.IPC_M_DATA_WRITE /* mount point */ ; 13 ?vfs.IPC_M_DATA_WRITE /* mount options */ ; 14 ?vfs.IPC_M_DATA_WRITE /* fs name */ ; 15 ?vfs.IPC_M_PING ; 16 ( 17 18 !fs.VFS_OUT_MOUNTED ; 19 !fs.IPC_M_DATA_WRITE /* mount options */ 20 ) /* root fs */ + 21 ( 22 !fs.VFS_OUT_MOUNT ; 23 !fs.IPC_M_CONNECTION_CLONE ; 24 !fs.VFS_M_DATA_WRITE /* mount options */ 25 ) /* non-root fs */ 26 } + 27 28 ?vfs.VFS_IN_OPEN { 29 ?vfs.IPC_M_DATA_WRITE /* path */ ; 30 [vfs_lookup_internal] ; 31 ( 32 ( 33 [vfs_grab_phone] ; 34 !fs.VFS_OUT_TRUNCATE ; 35 [vfs_release_phone] 36 ) + 37 NULL 38 ) 39 } + 40 41 ?vfs.VFS_IN_OPEN_NODE { 42 [vfs_grab_phone] ; 43 !fs.VFS_OUT_OPEN_NODE ; 44 [vfs_release_phone] ; 45 ( 46 ( 47 [vfs_grab_phone] ; 48 !fs.VFS_OUT_TRUNCATE ; 49 [vfs_release_phone] 50 ) + 51 NULL 52 ) 53 } + 54 55 ?vfs.VFS_IN_CLOSE { 56 [vfs_grab_phone] ; 57 !fs.VFS_OUT_CLOSE ; 58 [vfs_release_phone] 59 } + 60 61 ?vfs.VFS_IN_READ { 62 ?vfs.IPC_M_DATA_READ { 63 [vfs_grab_phone] ; 64 !fs.VFS_OUT_READ /* payload */ ; 65 !fs.IPC_M_DATA_READ /* forwarded */ ; 66 [vfs_release_phone] 67 } 68 } + 69 70 ?vfs.VFS_IN_WRITE { 71 ?vfs.IPC_M_DATA_WRITE { 72 [vfs_grab_phone] ; 73 !fs.VFS_OUT_WRITE /* payload */ ; 74 !fs.IPC_M_DATA_WRITE /* forwarded */ ; 75 [vfs_release_phone] 76 } 77 } + 78 79 ?vfs.VFS_IN_SEEK + 80 81 ?vfs.VFS_IN_TRUNCATE { 82 [vfs_grab_phone] ; 83 !fs.VFS_OUT_TRUNCATE ; 84 [vfs_release_phone] 85 } + 86 87 ?vfs.VFS_IN_FSTAT { 88 ?vfs.IPC_M_DATA_READ /* struct stat */ { 89 [vfs_grab_phone] ; 90 !fs.VFS_OUT_STAT ; 91 !fs.IPC_M_DATA_READ /* forwarded */ ; 92 [vfs_release_phone] 93 } 94 } + 95 96 ?vfs.VFS_IN_STAT { 97 ?vfs.IPC_M_DATA_WRITE /* path */ ; 98 ?vfs.IPC_M_DATA_READ /* struct stat */ { 99 [vfs_lookup_internal] ; 100 !fs.VFS_OUT_STAT ; 101 !fs.IPC_M_DATA_READ /* forwarded */ 102 } 103 } + 104 105 ?vfs.VFS_IN_MKDIR { 106 ?vfs.IPC_M_DATA_WRITE /* path */ ; 107 [vfs_lookup_internal] 108 } + 109 110 ?vfs.VFS_IN_UNLINK { 111 ?vfs.IPC_M_DATA_WRITE /* path */ ; 112 [vfs_lookup_internal] 113 } + 114 115 ?vfs.VFS_IN_RENAME { 116 ?vfs.IPC_M_DATA_WRITE /* old path */ ; 117 ?vfs.IPC_M_DATE_WRITE /* new path */ ; 118 [vfs_lookup_internal] /* lookup old path */ ; 119 [vfs_lookup_internal] /* lookup parent of new path */ ; 120 [vfs_lookup_internal] /* destroy old link for the new path */ ; 121 [vfs_lookup_internal] /* create new link for the new path */ ; 122 [vfs_lookup_internal] /* destroy link for the old path */ 123 } + 124 125 ?vfs.VFS_IN_SYNC { 126 !fs.VFS_OUT_SYNC 127 } 128 129 )* ; 130 ?vfs.IPC_M_PHONE_HUNGUP 131 )* 1 !ns.ipc_m_connect_to_me
Note:
See TracChangeset
for help on using the changeset viewer.
