diff options
| author | Frans Kaashoek <[email protected]> | 2020-08-10 13:05:17 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-10 13:05:17 -0400 |
| commit | c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9 (patch) | |
| tree | a6c903e1c61c08f4cb87700c320752a737081dcb /kernel/defs.h | |
| parent | 90eb90b5e203299427c3fde8c996a48835fc93cf (diff) | |
| parent | d8fe1773b26758c7c7b8f36724cd822555b33612 (diff) | |
| download | xv6-labs-c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9.tar.gz xv6-labs-c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9.tar.bz2 xv6-labs-c31d35d8031c88b7e1ea8657cc9806dfdd4c3ef9.zip | |
Merge branch 'riscv' into riscv
Diffstat (limited to 'kernel/defs.h')
| -rw-r--r-- | kernel/defs.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/defs.h b/kernel/defs.h index f893d28..4eedd89 100644 --- a/kernel/defs.h +++ b/kernel/defs.h @@ -52,6 +52,7 @@ struct inode* nameiparent(char*, char*); int readi(struct inode*, int, uint64, uint, uint); void stati(struct inode*, struct stat*); int writei(struct inode*, int, uint64, uint, uint); +void itrunc(struct inode*); // ramdisk.c void ramdiskinit(void); @@ -149,6 +150,7 @@ void usertrapret(void); void uartinit(void); void uartintr(void); void uartputc(int); +void uartputc_sync(int); int uartgetc(void); // vm.c @@ -173,7 +175,6 @@ int copyinstr(pagetable_t, char *, uint64, uint64); // plic.c void plicinit(void); void plicinithart(void); -uint64 plic_pending(void); int plic_claim(void); void plic_complete(int); |