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);
 }
 
 
guix/commit/gnu/packages/configuration-management.scm?id=ca307517b692c3f071258c5a014006c4d04194d6'>commit</a><a href='/guix/diff/gnu/packages/configuration-management.scm?id=ca307517b692c3f071258c5a014006c4d04194d6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/configuration-management.scm'>
<input type='hidden' name='id' value='ca307517b692c3f071258c5a014006c4d04194d6'/><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=ca307517b692c3f071258c5a014006c4d04194d6'>root</a>/<a href='/guix/log/gnu?id=ca307517b692c3f071258c5a014006c4d04194d6'>gnu</a>/<a href='/guix/log/gnu/packages?id=ca307517b692c3f071258c5a014006c4d04194d6'>packages</a>/<a href='/guix/log/gnu/packages/configuration-management.scm?id=ca307517b692c3f071258c5a014006c4d04194d6'>configuration-management.scm</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/gnu/packages/configuration-management.scm?id=ca307517b692c3f071258c5a014006c4d04194d6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-12-13 17:48:25 +0100'>2021-12-13</span></td><td><a href='/guix/commit/gnu/packages/configuration-management.scm?id=8394619baceb118df92e355377fd543bb1aa501a'>gnu: Simplify package inputs.</a><span class='msg-avail'>...<span class='msg-tooltip'>This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-08-09 17:22:26 +0300'>2020-08-09</span></td><td><a href='/guix/commit/gnu/packages/configuration-management.scm?id=fdb77b3625effd8f7647f7545cd0030650b027bc'>gnu: Add chezmoi.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/configuration-management.scm (chezmoi): New variable.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add this.
</span></span></td><td>Oleg Pykhalov</td></tr>