Skip to content

Commit

Permalink
Merge pull request #144 from daym/meminfo
Browse files Browse the repository at this point in the history
meminfo: Replace sys/io.h by direct register accesses.
  • Loading branch information
wens committed Nov 10, 2020
2 parents 14ff3e3 + 783cbd5 commit 47f0bfc
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions meminfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <sys/mman.h>
#include <stdint.h>
#include <errno.h>
#include <sys/io.h>
#include <stdbool.h>

#include "common.h"
Expand Down Expand Up @@ -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);
}


Expand Down

0 comments on commit 47f0bfc

Please sign in to comment.