sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

FirmIO: Use uintptr_t for 64-bit compatibility

Browse Source
This commit is contained in:
Paul Hollinsky
2022-04-15 21:35:40 -04:00
parent 2e3b738e76
commit 91abf378f8
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/platform/posix/firmio.h
+8 -6
View File
@@ -48,6 +48,7 @@ private:
};
struct Msg {
using Ref = uintptr_t;
enum class Command : uint32_t {
ComData = 0xAA000000,
ComFree = 0xAA000001,
@@ -56,15 +57,15 @@ private:
struct Data {
uint32_t addr;
uint32_t len;
uint32_t ref;
Ref ref;
uint32_t addr1;
uint32_t len1;
uint32_t ref1;
Ref ref1;
uint32_t reserved;
};
struct Free {
uint32_t refCount;
uint32_t ref[6];
Ref ref[6];
};
union Payload {
Data data;
@@ -97,12 +98,13 @@ private:
class Mempool {
public:
using PhysicalAddress = uintptr_t;
static constexpr const size_t BlockSize = 4096;
Mempool(uint8_t* start, uint32_t size, uint8_t* virt, uint32_t phys);
Mempool(uint8_t* start, uint32_t size, uint8_t* virt, PhysicalAddress phys);
uint8_t* alloc(uint32_t size);
bool free(uint8_t* addr);
uint32_t translate(uint8_t* addr) const;
PhysicalAddress translate(uint8_t* addr) const;
private:
struct BlockInfo {
@@ -118,7 +120,7 @@ private:
std::atomic<uint32_t> usedBlocks;
uint8_t* const virtualAddress;
const uint32_t physicalAddress;
const PhysicalAddress physicalAddress;
};
int fd = -1;