@@ -121,7 +121,10 @@ void ATAProcess() { syscall_puts("ATA driver entering loop\n"); while (true) { - + u32 msgId = syscall_readQueue("command"); + syscall_puts("ATA got msg: "); + syscall_putl(msgId, 16); + syscall_putc('\n'); } } TmpATA.cpp @@ -74,6 +74,8 @@ void ShellProcess() { syscall_putl(s, 10); syscall_puts("\n"); syscall_free(l); + + syscall_sendQueue("system.io.ata", "command", 0, 0x0); } syscall_exit(); TmpShell.cpp @@ -64,9 +64,9 @@ namespace IPC { return target->registerListener(); } - class ReadCall : public BlockingCall { + class ReadStreamCall : public BlockingCall { public: - ReadCall(const char *name, const char *node, u32 listener, char *buffer, u32 n): + ReadStreamCall(const char *name, const char *node, u32 listener, char *buffer, u32 n): _listener(&getStream(name, node)->getListener(listener)), _buffer(buffer), _n(n) { } @@ -104,7 +104,7 @@ namespace IPC { // Keeping in mind that `buffer''s data probably isn't asciz. u32 readStream_impl(const char *name, const char *node, u32 listener, char *buffer, u32 n, bool block) { - ReadCall c(name, node, listener, buffer, n); + ReadStreamCall c(name, node, listener, buffer, n); u32 r = c(); if (!block || !c.shallBlock()) return r; @@ -114,7 +114,7 @@ namespace IPC { Tasks::Task::Stream::Listener *l = c.getListener(); Akari->tasks->current->userWaiting = true; - Akari->tasks->current->userCall = new ReadCall(c); + Akari->tasks->current->userCall = new ReadStreamCall(c); l->hook(Akari->tasks->current); Akari->syscall->returnToNextTask(); return 0; @@ -152,5 +152,27 @@ namespace IPC { (*Akari->tasks->current->queuesByName)[sNode] = target; return true; } + + class ReadQueueCall : public BlockingCall { + public: + // TODO: need to know the current task! + ReadQueueCall(const char *node) { } + }; + + u32 readQueue(const char *node) { + ReadQueueCall c(node); + u32 r = c(); + if (!block || !c.shallBlock()) + return r; + + Akari->tasks->current->userWaiting = true; + Akari->tasks->current->userCall = new ReadQueueCall(c); + Akari->syscall->returnToNextTask(); + return 0; + } + + void sendQueue(const char *name, const char *node, u32 reply_to, u32 value) { + // TODO: a u32 value is pretty limited. We'll need to specify a buffer and a length soon. + } } } UserIPC.cpp @@ -91,7 +91,7 @@ static void AkariEntryCont() { // can exit, with an exit syscall. We can't actually call syscall_exit(), since // the function call would try to push to our stack, and we can't do that now // since we're in ring 3 and we have no write access! - asm volatile("int $0x80" : : "a" (9)); + asm volatile("int $0x80" : : "a" (7)); } void IdleProcess() { entry.cpp f1431c27f62bd35caee306d3c13c7aeae272d93c Arlen Cuss celtic@sairyx.org http://github.com/celtic/akari/commit/c0b6b1c61527f90dc50a98d210ebba695b0899a3 c0b6b1c61527f90dc50a98d210ebba695b0899a3 2009-11-06T23:15:59-08:00 2009-11-06T23:15:59-08:00 Whoops, exit is 7 now, not 9. Getting ready for queue stuff! Doesn't compile. 418ca0a518366153351f28c20fb9decf16644235 Arlen Cuss celtic@sairyx.org