1.1 --- a/libexec/include/exec/segment.h Fri Mar 08 00:26:16 2024 +0100
1.2 +++ b/libexec/include/exec/segment.h Fri Mar 08 00:26:54 2024 +0100
1.3 @@ -1,7 +1,7 @@
1.4 /*
1.5 * Program memory segment support.
1.6 *
1.7 - * Copyright (C) 2022, 2023 Paul Boddie <paul@boddie.org.uk>
1.8 + * Copyright (C) 2022, 2023, 2024 Paul Boddie <paul@boddie.org.uk>
1.9 *
1.10 * This program is free software; you can redistribute it and/or
1.11 * modify it under the terms of the GNU General Public License as
1.12 @@ -21,13 +21,10 @@
1.13
1.14 #pragma once
1.15
1.16 -#include <l4/re/c/dataspace.h>
1.17 -#include <l4/re/c/rm.h>
1.18 -
1.19 -#include <fsclient/client.h>
1.20 -
1.21 #include <exec/common.h>
1.22 #include <exec/mapped_region.h>
1.23 +#include <fsclient/client.h>
1.24 +#include <systypes/base.h>
1.25
1.26
1.27
1.28 @@ -42,7 +39,7 @@
1.29 /* Allocated memory. */
1.30
1.31 char *_buf;
1.32 - l4re_ds_t _ds;
1.33 + l4_cap_idx_t _ds;
1.34 file_t *_file = NULL;
1.35 bool _allocated = false, _attached = false;
1.36
1.37 @@ -94,7 +91,7 @@
1.38 virtual offset_t file_offset() = 0;
1.39 virtual l4_addr_t region_address() = 0;
1.40 virtual offset_t region_size() = 0;
1.41 - virtual l4re_rm_flags_t region_flags() = 0;
1.42 + virtual rm_flags_t region_flags() = 0;
1.43 };
1.44
1.45
1.46 @@ -114,14 +111,14 @@
1.47
1.48 /* Access flags. */
1.49
1.50 - l4re_rm_flags_t _flags;
1.51 + rm_flags_t _flags;
1.52
1.53 /* File access details. */
1.54
1.55 offset_t _file_offset, _file_contents;
1.56
1.57 public:
1.58 - explicit ExplicitSegment(l4_addr_t base, offset_t size, l4re_rm_flags_t flags,
1.59 + explicit ExplicitSegment(l4_addr_t base, offset_t size, rm_flags_t flags,
1.60 offset_t file_offset = 0, offset_t file_contents = 0);
1.61
1.62 /* Generic property access. */
1.63 @@ -131,7 +128,7 @@
1.64 offset_t file_offset();
1.65 l4_addr_t region_address();
1.66 offset_t region_size();
1.67 - l4re_rm_flags_t region_flags();
1.68 + rm_flags_t region_flags();
1.69 };
1.70
1.71 /* vim: tabstop=2 expandtab shiftwidth=2