fix some ipc errors

misson20000 · Dec 14, 2019 · a3360d0 · a3360d0
1 parent 191c0dc
commit a3360d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/twili/ipcbind/ro/IDebugMonitorInterface.cpp b/twili/ipcbind/ro/IDebugMonitorInterface.cpp
@@ -43,7 +43,7 @@ Result<std::vector<NroInfo>> IDebugMonitorInterface::GetNroInfos(uint64_t pid) {
 		r = object.SendSyncRequest<0>( // GetNroInfos
 			trn::ipc::InRaw<uint64_t>(pid),
 			trn::ipc::OutRaw<uint32_t>(num_nro_infos),
-			trn::ipc::Buffer<NroInfo, 0xA>(nro_info.data(), nro_info.size() * sizeof(NroInfo)));
+			trn::ipc::Buffer<NroInfo, 0x6>(nro_info.data(), nro_info.size() * sizeof(NroInfo)));
 	} while(r && num_nro_infos > nro_info.size());
 	nro_info.resize(num_nro_infos);
 

diff --git a/twili/process/ShellTracker.cpp b/twili/process/ShellTracker.cpp
@@ -48,12 +48,12 @@ ShellTracker::ShellTracker(Twili &twili) :
 		[this]() {
 			std::unique_lock<thread::Mutex> lock(queue_mutex);
 			shell_event.ResetSignal();
-			uint64_t evt;
+			uint32_t evt;
 			uint64_t pid;
 			Result<std::nullopt_t> r = std::nullopt;
 			while(
 				(r = this->twili.services.ns_dev.SendSyncRequest<5>( // GetShellEventInfo
-					ipc::OutRaw<uint64_t>(evt),
+					ipc::OutRaw<uint32_t>(evt),
 					ipc::OutRaw<uint64_t>(pid)))) {
 				auto i = tracking.find(pid);
 				if(evt == 1) { // exit
@@ -76,7 +76,7 @@ ShellTracker::ShellTracker(Twili &twili) :
 					printf("Unknown ns:dev shell event for 0x%lx: %d\n", pid, evt);
 				}
 			}
-			if(r.error().code != 0x610) { // no events left
+			if(r.error().code != 0x610 && r.error().code != 0x4e4) { // no events left
 				ResultCode::AssertOk(std::move(r));
 			}
 			return true;