Changeset 4c53333 in mainline for uspace/lib/c/include/io/con_srv.h

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

File:

• uspace/lib/c/include/io/con_srv.h (moved) (moved from uspace/lib/c/include/adt/hash_set.h ) (2 diffs)

uspace/lib/c/include/io/con_srv.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Jakub Jermar
- * Copyright (c) 2011 Radim Vansa
+ * Copyright (c) 2012 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +33 @@
  */
 
-#ifndef LIBC_HASH_SET_H_
-#define LIBC_HASH_SET_H_
+#ifndef LIBC_CON_SRV_H_
+#define LIBC_CON_SRV_H_
 
 #include <adt/list.h>
-#include <unistd.h>
+#include <async.h>
+#include <fibril_synch.h>
+#include <io/color.h>
+#include <io/concaps.h>
+#include <io/cons_event.h>
+#include <io/pixel.h>
+#include <io/style.h>
+#include <stdbool.h>
+#include <sys/time.h>
+#include <sys/types.h>
 
-#define HASH_SET_MIN_SIZE  8
+typedef struct con_ops con_ops_t;
 
-typedef unsigned long (*hash_set_hash)(const link_t *);
-typedef int (*hash_set_equals)(const link_t *, const link_t *);
+/** Service setup (per sevice) */
+typedef struct {
+        con_ops_t *ops;
+        void *sarg;
+        /** Period to check for abort */
+        suseconds_t abort_timeout;
+        bool aborted;
+} con_srvs_t;
 
-/** Hash table structure. */
+/** Server structure (per client session) */
 typedef struct {
-        list_t *table;
-        
-        /** Current table size */
-        size_t size;
-        
-        /**
-         * Current number of entries. If count > size,
-         * the table is rehashed into table with double
-         * size. If (4 * count < size) && (size > min_size),
-         * the table is rehashed into table with half the size.
-         */
-        size_t count;
-        
-        /** Hash function */
-        hash_set_hash hash;
-        
-        /** Hash table item equals function */
-        hash_set_equals equals;
-} hash_set_t;
+        con_srvs_t *srvs;
+        async_sess_t *client_sess;
+        void *carg;
+} con_srv_t;
 
-extern int hash_set_init(hash_set_t *, hash_set_hash, hash_set_equals, size_t);
-extern int hash_set_insert(hash_set_t *, link_t *);
-extern link_t *hash_set_find(hash_set_t *, const link_t *);
-extern int hash_set_contains(const hash_set_t *, const link_t *);
-extern size_t hash_set_count(const hash_set_t *);
-extern link_t *hash_set_remove(hash_set_t *, const link_t *);
-extern void hash_set_remove_selected(hash_set_t *,
-    int (*)(link_t *, void *), void *);
-extern void hash_set_destroy(hash_set_t *);
-extern void hash_set_apply(hash_set_t *, void (*)(link_t *, void *), void *);
-extern void hash_set_clear(hash_set_t *, void (*)(link_t *, void *), void *);
+struct con_ops {
+        int (*open)(con_srvs_t *, con_srv_t *);
+        int (*close)(con_srv_t *);
+        int (*read)(con_srv_t *, void *, size_t);
+        int (*write)(con_srv_t *, void *, size_t);
+        void (*sync)(con_srv_t *);
+        void (*clear)(con_srv_t *);
+        void (*set_pos)(con_srv_t *, sysarg_t col, sysarg_t row);
+        int (*get_pos)(con_srv_t *, sysarg_t *, sysarg_t *);
+        int (*get_size)(con_srv_t *, sysarg_t *, sysarg_t *);
+        int (*get_color_cap)(con_srv_t *, console_caps_t *);
+        void (*set_style)(con_srv_t *, console_style_t);
+        void (*set_color)(con_srv_t *, console_color_t, console_color_t,
+            console_color_attr_t);
+        void (*set_rgb_color)(con_srv_t *, pixel_t, pixel_t);
+        void (*set_cursor_visibility)(con_srv_t *, bool);
+        int (*get_event)(con_srv_t *, cons_event_t *);
+};
+
+extern void con_srvs_init(con_srvs_t *);
+
+extern int con_conn(ipc_callid_t, ipc_call_t *, con_srvs_t *);
 
 #endif