From 783cbd59fcf086a9aaf603271823fb4ca71f0c55 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Thu, 8 Oct 2020 23:01:05 +0200
Subject: [PATCH] meminfo: Replace sys/io.h by direct register accesses.
See: https://github.com/linux-sunxi/sunxi-tools/pull/144

Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
 meminfo.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/meminfo.c b/meminfo.c
index 0b0ff23..3b3a5df 100644
--- a/meminfo.c
+++ b/meminfo.c
@@ -22,7 +22,6 @@
 #include <sys/mman.h>
 #include <stdint.h>
 #include <errno.h>
-#include <sys/io.h>
 #include <stdbool.h>
 
 #include "common.h"
@@ -74,24 +73,24 @@ static enum sunxi_soc_version soc_version;
 unsigned int
 sunxi_io_read(void *base, int offset)
 {
-	return inl((unsigned long) (base + offset));
+	return *(volatile unsigned int*) (base + offset);
 }
 
 void
 sunxi_io_write(void *base, int offset, unsigned int value)
 {
-	outl(value, (unsigned long) (base + offset));
+	*(volatile unsigned int*) (base + offset) = value;
 }
 
 void
 sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask)
 {
-	unsigned int tmp = inl((unsigned long) (base + offset));
+	unsigned int tmp = sunxi_io_read(base, offset);
 
 	tmp &= ~mask;
 	tmp |= value & mask;
 
-	outl(tmp, (unsigned long) (base + offset));
+	sunxi_io_write(base, offset, tmp);
 }
 
 
doc/images/gcc-core-mesboot0-graph.dot?id=7432b922efa0e9b633a05bd52644ee00ebd58d9f'>commit</a><a href='/guix/diff/doc/images/gcc-core-mesboot0-graph.dot?id=7432b922efa0e9b633a05bd52644ee00ebd58d9f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/images/gcc-core-mesboot0-graph.dot'>
<input type='hidden' name='id' value='7432b922efa0e9b633a05bd52644ee00ebd58d9f'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=7432b922efa0e9b633a05bd52644ee00ebd58d9f'>root</a>/<a href='/guix/log/doc?id=7432b922efa0e9b633a05bd52644ee00ebd58d9f'>doc</a>/<a href='/guix/log/doc/images?id=7432b922efa0e9b633a05bd52644ee00ebd58d9f'>images</a>/<a href='/guix/log/doc/images/gcc-core-mesboot0-graph.dot?id=7432b922efa0e9b633a05bd52644ee00ebd58d9f'>gcc-core-mesboot0-graph.dot</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/doc/images/gcc-core-mesboot0-graph.dot?id=7432b922efa0e9b633a05bd52644ee00ebd58d9f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-22 16:11:52 +0200'>2020-05-22</span></td><td><a href='/guix/commit/doc/images/gcc-core-mesboot0-graph.dot?id=cd5d5f53228fd5bf96d9f790aa2606ae71fa68d7'>doc: Update 'Bootstrapping' for further binary seed reduction.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/images/gcc-core-mesboot0-graph.dot: New image, replacing
* doc/images/gcc-mesboot0-bag-graph.dot: ... remove file.
* doc/local.mk (DOT_FILES): Update for new image file.
* doc/guix.texi (Reduced Binary Seed Bootstrap): Use it in updated description
of further reduction of the trusted computing base.
</span></span></td><td>Jan Nieuwenhuizen</td></tr>
 tests/cran.scm ("description-&gt;package"): Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-01-16 23:14:05 +0100'>2020-01-16</span></td><td><a href='/guix/commit/tests/cran.scm?id=cfd1ed84013df85f0e473884ef4038b4bd7120d4'>import: cran: Avoid uses of '@@' in the tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/cran.scm (description-&gt;alist, description-&gt;package): Export.
&lt;top level&gt;: Set! 'listify'.
* tests/cran.scm (description-alist, "description-&gt;package"): Remove use
of '@@' to access the relevant bindings.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-13 12:40:20 +0200'>2017-05-13</span></td><td><a href='/guix/commit/tests/cran.scm?id=db427602d8f993ee0025fa68d1af274aa8d69ab9'>import: cran: Robustify cran-package?.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/cran.scm (package-&gt;upstream-name): Return #f if url
  start and end index could not be determined.
  (cran-package?): Check if the upstream-name can be extracted from
  given package.
* tests/cran.scm: Add "r-minimal is not a cran package" to make sure that
  r-minimal is not detected as a cran package.

This fixes a failure of guix refresh on r-minimal because no
upsteam-name can be determined from ".../R-version.tar.gz" uri.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2017-03-08 23:42:52 +0100'>2017-03-08</span></td><td><a href='/guix/commit/tests/cran.scm?id=dd420bf3430eb644b93ca224da4c0a3f5db7a42f'>tests: Avoid zero-expression 'begin' form.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/cran.scm ("description-&gt;package"): Add body after the expected
pattern in 'match'.
</span></span></td><td>Ludovic Courtès</td></tr>