# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1615936247 -3600
# Node ID 108c08c35100d171114ae0260d28ebb531bb8f54
# Parent  862b530319c48116785c9ae25b5689d7a907e1c9
Really switched to using the flags type, and also the offset type.

diff -r 862b530319c4 -r 108c08c35100 flexpage.cc
--- a/flexpage.cc	Tue Mar 16 23:59:07 2021 +0100
+++ b/flexpage.cc	Wed Mar 17 00:10:47 2021 +0100
@@ -73,7 +73,7 @@
     return (base_offset <= position) && (position < (base_offset + size));
 }
 
-void Flexpage::upgrade(unsigned long flags)
+void Flexpage::upgrade(flags_t flags)
 {
     if (flags && (flags != _flags))
         _flags |= flags;
diff -r 862b530319c4 -r 108c08c35100 flexpage.h
--- a/flexpage.h	Tue Mar 16 23:59:07 2021 +0100
+++ b/flexpage.h	Wed Mar 17 00:10:47 2021 +0100
@@ -12,7 +12,7 @@
 {
 protected:
     unsigned int _counter;
-    unsigned long _flags;
+    flags_t _flags;
 
 public:
     Region *region;
@@ -44,7 +44,7 @@
 
     bool supports_position(offset_t position);
 
-    void upgrade(unsigned long flags);
+    void upgrade(flags_t flags);
 
     SendFlexpage to_send(offset_t offset, offset_t hot_spot, offset_t max_offset=0);
 
diff -r 862b530319c4 -r 108c08c35100 page_mapper.cc
--- a/page_mapper.cc	Tue Mar 16 23:59:07 2021 +0100
+++ b/page_mapper.cc	Wed Mar 17 00:10:47 2021 +0100
@@ -53,7 +53,7 @@
    This method locks the mapper to prevent concurrent queries with the same
    details, with the lock held until the queue operation releases the lock. */
 
-Flexpage *PageMapper::get(offset_t offset, unsigned long flags)
+Flexpage *PageMapper::get(offset_t offset, flags_t flags)
 {
     _lock.lock();
 
diff -r 862b530319c4 -r 108c08c35100 page_mapper.h
--- a/page_mapper.h	Tue Mar 16 23:59:07 2021 +0100
+++ b/page_mapper.h	Wed Mar 17 00:10:47 2021 +0100
@@ -34,7 +34,7 @@
 
     /* Interface for the pager. */
 
-    Flexpage *get(offset_t offset, unsigned long flags);
+    Flexpage *get(offset_t offset, flags_t flags);
 
     void queue(Flexpage *flexpage);
 
diff -r 862b530319c4 -r 108c08c35100 pager.cc
--- a/pager.cc	Tue Mar 16 23:59:07 2021 +0100
+++ b/pager.cc	Wed Mar 17 00:10:47 2021 +0100
@@ -4,7 +4,7 @@
 
 
 
-Pager::Pager(PageMapper *mapper, unsigned long flags)
+Pager::Pager(PageMapper *mapper, flags_t flags)
 : _start(0), _size(0), _mapper(mapper), _flags(flags)
 {
     _mapper->attach();
@@ -52,7 +52,7 @@
 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
    (flexpage offset). */
 
-long Pager::map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region)
+long Pager::map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
 {
     offset_t file_offset = _start + offset;
     offset_t max_offset = _start + _size;
diff -r 862b530319c4 -r 108c08c35100 pager.h
--- a/pager.h	Tue Mar 16 23:59:07 2021 +0100
+++ b/pager.h	Wed Mar 17 00:10:47 2021 +0100
@@ -14,16 +14,16 @@
 protected:
     offset_t _start, _size;
     PageMapper *_mapper;
-    unsigned long _flags;
+    flags_t _flags;
 
 public:
-    explicit Pager(PageMapper *mapper, unsigned long flags);
+    explicit Pager(PageMapper *mapper, flags_t flags);
 
     virtual void close();
 
     /* Paging methods. */
 
-    virtual long map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region);
+    virtual long map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
 
     /* Limit methods. */
 
diff -r 862b530319c4 -r 108c08c35100 send_flexpage.h
--- a/send_flexpage.h	Tue Mar 16 23:59:07 2021 +0100
+++ b/send_flexpage.h	Wed Mar 17 00:10:47 2021 +0100
@@ -9,10 +9,10 @@
 public:
     offset_t base_addr;
     unsigned int order;
-    unsigned long flags;
+    flags_t flags;
 
     explicit SendFlexpage(offset_t base_addr, unsigned int order,
-                          unsigned long flags)
+                          flags_t flags)
     : base_addr(base_addr), order(order), flags(flags)
     {
     }
diff -r 862b530319c4 -r 108c08c35100 simple_pager.cc
--- a/simple_pager.cc	Tue Mar 16 23:59:07 2021 +0100
+++ b/simple_pager.cc	Wed Mar 17 00:10:47 2021 +0100
@@ -28,7 +28,7 @@
 /* Map a flexpage corresponding to the dataspace 'offset' involving a 'hot_spot'
    (flexpage offset). */
 
-long SimplePager::map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region)
+long SimplePager::map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
 {
     Flexpage flexpage(_region);
 
@@ -50,7 +50,7 @@
     return IPC_MESSAGE_SENT;
 }
 
-long SimplePager::info(unsigned long *size, unsigned long *flags)
+long SimplePager::info(offset_t *size, flags_t *flags)
 {
     *size = _region->size();
     *flags = L4_FPAGE_RW;
diff -r 862b530319c4 -r 108c08c35100 simple_pager.h
--- a/simple_pager.h	Tue Mar 16 23:59:07 2021 +0100
+++ b/simple_pager.h	Wed Mar 17 00:10:47 2021 +0100
@@ -22,9 +22,9 @@
 
     /* Paging methods. */
 
-    long map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region);
+    long map(offset_t offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
 
-    long info(unsigned long *size, unsigned long *flags);
+    long info(offset_t *size, flags_t *flags);
 };
 
 // vim: tabstop=4 expandtab shiftwidth=4