Mercurial > hg > Members > menikon > CbC_xv6
changeset 140:f49d1bb1b947
tweak
author | anatofuz |
---|---|
date | Thu, 12 Dec 2019 14:25:06 +0900 |
parents | 7f9dac064c5f |
children | bb1b0676e27b |
files | src/interface/SysRead.h |
diffstat | 1 files changed, 4 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/interface/SysRead.h Thu Dec 12 14:01:06 2019 +0900 +++ b/src/interface/SysRead.h Thu Dec 12 14:25:06 2019 +0900 @@ -1,23 +1,9 @@ typedef struct SysRead<Type, Impl>{ - union Data* sys_read; + union Data* sys_read; union Data* impl; - int num; char* addr; - struct file* file; - int r; - struct pipe* pipe; - __code read(Impl* sys_read, union Data* impl, char* addr, int n, __code (*next)(int ret)); - //__code ret(Impl* cbc_sys_file, UInteger* num); + int n; + + __code read(Impl* sys_read, union Data* impl, char* addr, int n, __code next(int ret,...)); __code next(...); - //__code cbc_fileread1(Impl* sys_read, int r); - __code cbc_fileread(Impl* sys_read, struct file* file, char* addr, int n, __code (*next)(int ret)); - __code cbc_piperead(Impl* sys_read, struct pipe *p, char *addr, int n, __code (*next)(int ret)); - //__code cbc_piperead1(Impl* sys_read, struct pipe* p); - //__code cbc_piperead2(Impl* sys_read, int i, int n,struct pipe* p); - //__code cbc_piperead3(Impl* sys_read, struct pipe* p, int i); } SysRead; - -/* - * cbc_piperead cbc_filereのAPIは微妙な違いしかない - * union Dataから実装の型を見てキャストすると良さそう - */