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);
 }
 
 
x-daemon?id=ea0d3215a63eabac93203ffd62b85566e6a30860'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/nix-daemon'>
<input type='hidden' name='id' value='ea0d3215a63eabac93203ffd62b85566e6a30860'/><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=ea0d3215a63eabac93203ffd62b85566e6a30860'>root</a>/<a href='/guix/log/nix?id=ea0d3215a63eabac93203ffd62b85566e6a30860'>nix</a>/<a href='/guix/log/nix/nix-daemon?id=ea0d3215a63eabac93203ffd62b85566e6a30860'>nix-daemon</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/nix/nix-daemon?id=ea0d3215a63eabac93203ffd62b85566e6a30860&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-04-14 14:48:20 +0200'>2022-04-14</span></td><td><a href='/guix/commit/nix/nix-daemon?id=5f74169e8e03e64a15499866c6a6de9f38d36f2d'>daemon: Support systemd-style socket activation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/nix-daemon/guix-daemon.cc (SD_LISTEN_FDS_START): New macro.
(systemd_activation_sockets): New function.
(main): Use it.  Remove obsolete 'printMsg' call.
* doc/guix.texi (Invoking guix-daemon): Document socket activation.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-04-03 22:08:33 +0200'>2021-04-03</span></td><td><a href='/guix/commit/nix/nix-daemon?id=222fff253c6c6a3d1def16ed90723d7f2c4f9b89'>daemon: Remove dead code.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by Noisytoot on #guix.

* nix/nix-daemon/shared.hh (showManPage): Remove.
* nix/nix-daemon/nix-daemon.cc (printHelp, programId): Remove.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-03-17 12:03:23 +0100'>2021-03-17</span></td><td><a href='/guix/commit/nix/nix-daemon?id=bc3896db25c788c181c7bcd65754e7cd378e9d9f'>daemon: Correctly handle '--discover' with no value.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, we'd get:

  $ guix-daemon --discover
  error: basic_string::_M_construct null not valid

* nix/nix-daemon/guix-daemon.cc (parse_opt): Change second argument to
'settings.set' to properly handle case where ARG is NULL.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-29 15:08:26 +0100'>2020-11-29</span></td><td><a href='/guix/commit/nix/nix-daemon?id=79f9dee3c4c0e6d21066f142116a537207ae7ba4'>Use substitute servers on the local network.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/discover.scm: New file.
* Makefile.am (MODULES): Add it.
* nix/nix-daemon/guix-daemon.cc (options): Add "discover" option,
(parse-opt): parse it,
(main): start "guix discover" process when the option is set.
* guix/scripts/substitute.scm (%local-substitute-urls): New variable,
(substitute-urls): add it.
* gnu/services/base.scm (&lt;guix-configuration&gt;): Add "discover?"
field,
(guix-shepherd-service): honor it.
* doc/guix.texi (Invoking guix-daemon): Document "discover" option,
(Base Services): ditto.
</span></span></td><td>Mathieu Othacehe</td></tr>