1.1 --- a/flexpage.cc Tue Mar 16 23:59:07 2021 +0100
1.2 +++ b/flexpage.cc Wed Mar 17 00:10:47 2021 +0100
1.3 @@ -73,7 +73,7 @@
1.4 return (base_offset <= position) && (position < (base_offset + size));
1.5 }
1.6
1.7 -void Flexpage::upgrade(unsigned long flags)
1.8 +void Flexpage::upgrade(flags_t flags)
1.9 {
1.10 if (flags && (flags != _flags))
1.11 _flags |= flags;
2.1 --- a/flexpage.h Tue Mar 16 23:59:07 2021 +0100
2.2 +++ b/flexpage.h Wed Mar 17 00:10:47 2021 +0100
2.3 @@ -12,7 +12,7 @@
2.4 {
2.5 protected:
2.6 unsigned int _counter;
2.7 - unsigned long _flags;
2.8 + flags_t _flags;
2.9
2.10 public:
2.11 Region *region;
2.12 @@ -44,7 +44,7 @@
2.13
2.14 bool supports_position(offset_t position);
2.15
2.16 - void upgrade(unsigned long flags);
2.17 + void upgrade(flags_t flags);
2.18
2.19 SendFlexpage to_send(offset_t offset, offset_t hot_spot, offset_t max_offset=0);
2.20
3.1 --- a/page_mapper.cc Tue Mar 16 23:59:07 2021 +0100
3.2 +++ b/page_mapper.cc Wed Mar 17 00:10:47 2021 +0100
3.3 @@ -53,7 +53,7 @@
3.4 This method locks the mapper to prevent concurrent queries with the same
3.5 details, with the lock held until the queue operation releases the lock. */
3.6
3.7 -Flexpage *PageMapper::get(offset_t offset, unsigned long flags)
3.8 +Flexpage *PageMapper::get(offset_t offset, flags_t flags)
3.9 {
3.10 _lock.lock();
3.11
4.1 --- a/page_mapper.h Tue Mar 16 23:59:07 2021 +0100
4.2 +++ b/page_mapper.h Wed Mar 17 00:10:47 2021 +0100
4.3 @@ -34,7 +34,7 @@
4.4
4.5 /* Interface for the pager. */
4.6
4.7 - Flexpage *get(offset_t offset, unsigned long flags);
4.8 + Flexpage *get(offset_t offset, flags_t flags);
4.9
4.10 void queue(Flexpage *flexpage);
4.11
5.1 --- a/pager.cc Tue Mar 16 23:59:07 2021 +0100
5.2 +++ b/pager.cc Wed Mar 17 00:10:47 2021 +0100
5.3 @@ -4,7 +4,7 @@
5.4
5.5
5.6
5.7 -Pager::Pager(PageMapper *mapper, unsigned long flags)
5.8 +Pager::Pager(PageMapper *mapper, flags_t flags)
5.9 : _start(0), _size(0), _mapper(mapper), _flags(flags)
5.10 {
5.11 _mapper->attach();
5.12 @@ -52,7 +52,7 @@
5.13 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
5.14 (flexpage offset). */
5.15
5.16 -long Pager::map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region)
5.17 +long Pager::map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
5.18 {
5.19 offset_t file_offset = _start + offset;
5.20 offset_t max_offset = _start + _size;
6.1 --- a/pager.h Tue Mar 16 23:59:07 2021 +0100
6.2 +++ b/pager.h Wed Mar 17 00:10:47 2021 +0100
6.3 @@ -14,16 +14,16 @@
6.4 protected:
6.5 offset_t _start, _size;
6.6 PageMapper *_mapper;
6.7 - unsigned long _flags;
6.8 + flags_t _flags;
6.9
6.10 public:
6.11 - explicit Pager(PageMapper *mapper, unsigned long flags);
6.12 + explicit Pager(PageMapper *mapper, flags_t flags);
6.13
6.14 virtual void close();
6.15
6.16 /* Paging methods. */
6.17
6.18 - virtual long map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region);
6.19 + virtual long map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
6.20
6.21 /* Limit methods. */
6.22
7.1 --- a/send_flexpage.h Tue Mar 16 23:59:07 2021 +0100
7.2 +++ b/send_flexpage.h Wed Mar 17 00:10:47 2021 +0100
7.3 @@ -9,10 +9,10 @@
7.4 public:
7.5 offset_t base_addr;
7.6 unsigned int order;
7.7 - unsigned long flags;
7.8 + flags_t flags;
7.9
7.10 explicit SendFlexpage(offset_t base_addr, unsigned int order,
7.11 - unsigned long flags)
7.12 + flags_t flags)
7.13 : base_addr(base_addr), order(order), flags(flags)
7.14 {
7.15 }
8.1 --- a/simple_pager.cc Tue Mar 16 23:59:07 2021 +0100
8.2 +++ b/simple_pager.cc Wed Mar 17 00:10:47 2021 +0100
8.3 @@ -28,7 +28,7 @@
8.4 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
8.5 (flexpage offset). */
8.6
8.7 -long SimplePager::map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region)
8.8 +long SimplePager::map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
8.9 {
8.10 Flexpage flexpage(_region);
8.11
8.12 @@ -50,7 +50,7 @@
8.13 return IPC_MESSAGE_SENT;
8.14 }
8.15
8.16 -long SimplePager::info(unsigned long *size, unsigned long *flags)
8.17 +long SimplePager::info(offset_t *size, flags_t *flags)
8.18 {
8.19 *size = _region->size();
8.20 *flags = L4_FPAGE_RW;
9.1 --- a/simple_pager.h Tue Mar 16 23:59:07 2021 +0100
9.2 +++ b/simple_pager.h Wed Mar 17 00:10:47 2021 +0100
9.3 @@ -22,9 +22,9 @@
9.4
9.5 /* Paging methods. */
9.6
9.7 - long map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region);
9.8 + long map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
9.9
9.10 - long info(unsigned long *size, unsigned long *flags);
9.11 + long info(offset_t *size, flags_t *flags);
9.12 };
9.13
9.14 // vim: tabstop=4 expandtab shiftwidth=4