1.1 --- a/include/device.h Wed Apr 08 23:38:17 2020 +0200
1.2 +++ b/include/device.h Thu Apr 30 22:51:33 2020 +0200
1.3 @@ -43,8 +43,8 @@
1.4 {
1.5 }
1.6
1.7 - /* A mechanism for obtaining servers for filesystem objects. */
1.8 + /* A mechanism for obtaining resources for filesystem objects. */
1.9
1.10 - virtual long open_object_server(fs_object_t *fsobj, int flags,
1.11 - ResourceServer **server);
1.12 + virtual long open_object_resource(fs_object_t *fsobj, int flags,
1.13 + Resource **resource);
1.14 };
2.1 --- a/server/src/device.cc Wed Apr 08 23:38:17 2020 +0200
2.2 +++ b/server/src/device.cc Thu Apr 30 22:51:33 2020 +0200
2.3 @@ -19,24 +19,23 @@
2.4 * Boston, MA 02110-1301, USA
2.5 */
2.6
2.7 -#include <fsserver/file_resource_server.h>
2.8 #include "device.h"
2.9 #include "region.h"
2.10 #include "region_accessor.h"
2.11
2.12
2.13
2.14 -long Block_device::open_object_server(fs_object_t *fsobj, int flags,
2.15 - ResourceServer **server)
2.16 +long Block_device::open_object_resource(fs_object_t *fsobj, int flags,
2.17 + Resource **resource)
2.18 {
2.19 + (void) flags;
2.20 +
2.21 fsobj->size = _size;
2.22 PagingAccessor *region = new Block_region_accessor(_paging, _block, _size);
2.23
2.24 - /* Create a new object and register it for IPC. */
2.25 + /* Create and return a new resource object. */
2.26
2.27 - Block_region *resource = new Block_region(region, *fsobj);
2.28 -
2.29 - *server = new MappedFileServer(resource);
2.30 + *resource = new Block_region(region, *fsobj);
2.31
2.32 return L4_EOK;
2.33 }
3.1 --- a/server/src/main.cc Wed Apr 08 23:38:17 2020 +0200
3.2 +++ b/server/src/main.cc Thu Apr 30 22:51:33 2020 +0200
3.3 @@ -22,7 +22,7 @@
3.4 #include <stdlib.h>
3.5 #include <sys/stat.h>
3.6
3.7 -#include <fsserver/file_resource_server.h>
3.8 +#include <fsserver/resource_server.h>
3.9 #include "device.h"
3.10
3.11
3.12 @@ -78,7 +78,7 @@
3.13 /* Initialise and register a new server object. */
3.14
3.15 Block_device resource(paging, buffer, size);
3.16 - UserFilesystemServer server(&resource);
3.17 + ResourceServer server(&resource);
3.18
3.19 if (server.bind("block"))
3.20 {