Unverified Commit 47f0bfc8 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by GitHub
Browse files

Merge pull request #144 from daym/meminfo

meminfo: Replace sys/io.h by direct register accesses.
parents 14ff3e36 783cbd59
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <stdint.h> #include <stdint.h>
#include <errno.h> #include <errno.h>
#include <sys/io.h>
#include <stdbool.h> #include <stdbool.h>
#include "common.h" #include "common.h"
...@@ -74,24 +73,24 @@ static enum sunxi_soc_version soc_version; ...@@ -74,24 +73,24 @@ static enum sunxi_soc_version soc_version;
unsigned int unsigned int
sunxi_io_read(void *base, int offset) sunxi_io_read(void *base, int offset)
{ {
return inl((unsigned long) (base + offset)); return *(volatile unsigned int*) (base + offset);
} }
void void
sunxi_io_write(void *base, int offset, unsigned int value) sunxi_io_write(void *base, int offset, unsigned int value)
{ {
outl(value, (unsigned long) (base + offset)); *(volatile unsigned int*) (base + offset) = value;
} }
void void
sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask) 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 &= ~mask;
tmp |= value & mask; tmp |= value & mask;
outl(tmp, (unsigned long) (base + offset)); sunxi_io_write(base, offset, tmp);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment