Changeset 95c675b in mainline for boot/arch/riscv64/include/types.h

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• boot/arch/riscv64/include/types.h (modified) (3 diffs)

boot/arch/riscv64/include/types.h

@@ -30 +30 @@
 #define BOOT_riscv64_TYPES_H_
 
+#include <arch/common.h>
+
 #define MEMMAP_MAX_RECORDS         32
 #define TASKMAP_MAX_RECORDS        32
@@ -38 +40 @@
 
 typedef int64_t ptrdiff_t;
+
+typedef struct {
+        volatile uint64_t *tohost;
+        volatile uint64_t *fromhost;
+} ucbinfo_t;
 
 typedef struct {
@@ -65 +72 @@
 
 typedef struct {
+        ucbinfo_t ucbinfo;
+        uintptr_t physmem_start;
+        uintptr_t htif_frame;
+        uintptr_t pt_frame;
         memmap_t memmap;
         taskmap_t taskmap;