Changeset 7eaeec1 in mainline for uspace/srv/hid/output/proto/vt100.h

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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/srv/hid/output/proto/vt100.h (moved) (moved from uspace/srv/hid/fb/proto/vt100.h ) (1 diff)

uspace/srv/hid/output/proto/vt100.h

@@ -30 +30 @@
  */
 
-#ifndef FB_PROTO_VT100_H_
-#define FB_PROTO_VT100_H_
+#ifndef OUTPUT_PROTO_VT100_H_
+#define OUTPUT_PROTO_VT100_H_
 
 #include <sys/types.h>
-#include <screenbuffer.h>
+#include <io/charfield.h>
 
 typedef void (* vt100_putchar_t)(wchar_t ch);
 typedef void (* vt100_control_puts_t)(const char *str);
 
-/** Forward declaration */
-struct vt100_state;
-typedef struct vt100_state vt100_state_t;
+typedef struct {
+        sysarg_t cols;
+        sysarg_t rows;
+        
+        sysarg_t cur_col;
+        sysarg_t cur_row;
+        char_attrs_t cur_attrs;
+        
+        vt100_putchar_t putchar;
+        vt100_control_puts_t control_puts;
+} vt100_state_t;
 
 extern vt100_state_t *vt100_state_create(sysarg_t, sysarg_t, vt100_putchar_t,
     vt100_control_puts_t);
-extern void vt100_get_resolution(vt100_state_t *, sysarg_t *, sysarg_t *);
+extern void vt100_state_destroy(vt100_state_t *);
+
 extern int vt100_yield(vt100_state_t *);
 extern int vt100_claim(vt100_state_t *);
+extern void vt100_get_dimensions(vt100_state_t *, sysarg_t *, sysarg_t *);
 
+extern void vt100_goto(vt100_state_t *, sysarg_t, sysarg_t);
+extern void vt100_set_attr(vt100_state_t *, char_attrs_t);
+extern void vt100_cursor_visibility(vt100_state_t *, bool);
 extern void vt100_putchar(vt100_state_t *, wchar_t);
-
-extern void vt100_set_attr(vt100_state_t *, char_attrs_t);
-extern void vt100_goto(vt100_state_t *, sysarg_t, sysarg_t);
-extern void vt100_cursor_visibility(vt100_state_t *, bool);
 
 #endif