Changeset 79ae36dd in mainline for uspace/srv/hid/fb

Timestamp:

2011-06-08T19:01:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eff68e

Parents:

764d71e

Message:

new async framework with integrated exchange tracking

• strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
  • each IPC connection is represented by an async_sess_t structure
  • each IPC exchange is represented by an async_exch_t structure
  • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
• async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
• IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
• IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
• IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
• console routines in libc have been rewritten for better abstraction
• additional use for libc-private header files (FILE structure opaque to the client)
• various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)

Location:

uspace/srv/hid/fb

Files:

• ega.c (modified) (3 diffs)
• fb.c (modified) (3 diffs)
• main.c (modified) (1 diff)
• serial_console.c (modified) (3 diffs)

uspace/srv/hid/fb/ega.c

@@ -52 +52 @@
 #include <io/screenbuffer.h>
 #include <sys/types.h>
-
 #include "ega.h"
 #include "main.h"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define MAX_SAVED_SCREENS  256
@@ -291 +293 @@
                 int retval;
                 
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                if (!IPC_GET_IMETHOD(call)) {
                         client_connected = 0;
                         async_answer_0(callid, EOK);
@@ -298 +299 @@
                         /* Exit thread */
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_SHARE_OUT:
                         /* We accept one area for data interchange */

uspace/srv/hid/fb/fb.c

@@ -59 +59 @@
 #include <byteorder.h>
 #include <io/screenbuffer.h>
-
 #include "font-8x16.h"
 #include "fb.h"
 #include "main.h"
 #include "ppm.h"
-
 #include "pointer.xbm"
 #include "pointer_mask.xbm"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define DEFAULT_BGCOLOR  0xf0f0f0
@@ -1620 +1621 @@
                         continue;
                 
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                if (!IPC_GET_IMETHOD(call)) {
                         client_connected = false;
                         
@@ -1630 +1630 @@
                         /* Exit thread */
                         return;
+                }
                 
+                switch (IPC_GET_IMETHOD(call)) {
                 case FB_PUTCHAR:
                         ch = IPC_GET_ARG1(call);

uspace/srv/hid/fb/main.c

@@ -28 +28 @@
 
 #include <ipc/services.h>
-#include <ipc/ns.h>
+#include <ns.h>
 #include <sysinfo.h>
 #include <async.h>

uspace/srv/hid/fb/serial_console.c

@@ -52 +52 @@
 #include "serial_console.h"
 
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
+
 #define MAX_CONTROL 20
 
@@ -344 +347 @@
                 int retval;
                 
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                if (!IPC_GET_IMETHOD(call)) {
                         client_connected = 0;
                         async_answer_0(callid, EOK);
@@ -351 +353 @@
                         /* Exit thread */
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_SHARE_OUT:
                         /* We accept one area for data interchange */