Fix: stale dnode caching instance cause locked-up upon accessing (#52)

[lunaix-os.git] / lunaix-os / includes / hal / term.h

diff --git a/lunaix-os/includes/hal/term.h b/lunaix-os/includes/hal/term.h
index 00fe32b04a074ebd40a236a11ee26367b3fcd913..be7abd0fdcda89163fb59139079e4b0299d2231f 100644 (file)
--- a/lunaix-os/includes/hal/term.h
+++ b/lunaix-os/includes/hal/term.h
@@ -3,6 +3,7 @@
 
 #include <lunaix/device.h>
 #include <lunaix/ds/rbuffer.h>
+#include <lunaix/ds/waitq.h>
 #include <lunaix/signal_defs.h>
 
 #include <usr/lunaix/term.h>
@@ -11,66 +12,73 @@ struct term;
 
 struct linebuffer
 {
-    struct rbuffer *next;
-    struct rbuffer *current;
+    struct rbuffer* next;
+    struct rbuffer* current;
     short sflags;
     short sz_hlf;
 };
-#define LSTATE_EOL (1)
-#define LSTATE_EOF (1 << 1)
-#define LSTATE_SIGRAISE (1 << 2)
+#define LEVT_EOL (1)
+#define LEVT_EOF (1 << 1)
+#define LEVT_SIGRAISE (1 << 2)
 
 typedef struct rbuffer** lbuf_ref_t;
 #define ref_current(lbuf) (&(lbuf)->current)
 #define ref_next(lbuf) (&(lbuf)->next)
 #define deref(bref) (*(bref))
 
-struct term_lcntl
+struct term;
+
+struct termport_pot_ops
+{
+    void (*set_speed)(struct device*, speed_t);
+    void (*set_clkbase)(struct device*, unsigned int);
+    void (*set_cntrl_mode)(struct device*, tcflag_t);
+};
+
+struct termport_potens
 {
-    struct llist_header lcntls;
+    POTENS_META;
+    struct termport_pot_ops* ops;
     struct term* term;
-    size_t (*process_and_put)(struct term*, struct linebuffer*, char);
 };
 
 struct term
 {
     struct device* dev;
     struct device* chdev;
-    struct llist_header lcntl_stack;
     struct linebuffer line_out;
     struct linebuffer line_in;
+    char* scratch_pad;
     pid_t fggrp;
 
-    struct
-    {
-        int (*set_speed)(struct device*, speed_t);
-    } chdev_ops;
+    struct termport_potens* tp_cap;
+    waitq_t line_in_event;
 
     /* -- POSIX.1-2008 compliant fields -- */
     tcflag_t iflags;
     tcflag_t oflags;
     tcflag_t lflags;
+    tcflag_t cflags;
     cc_t cc[_NCCS];
+
+    /* -- END POSIX.1-2008 compliant fields -- */
     speed_t iospeed;
+    speed_t clkbase;
+    tcflag_t tflags;    // temp flags
 };
 
-struct term*
-term_create(struct device* chardev, char* suffix);
+extern struct device* sysconsole;
 
-int
-term_bind(struct term* tdev, struct device* chdev);
+struct termport_potens*
+term_attach_potens(struct device* chardev, 
+                   struct termport_pot_ops* ops, char* suffix);
 
 int
-term_push_lcntl(struct term* tdev, struct term_lcntl* lcntl);
-
-int
-term_pop_lcntl(struct term* tdev);
-
-struct term_lcntl*
-term_get_lcntl(u32_t lcntl_index);
+term_bind(struct term* tdev, struct device* chdev);
 
 static inline void
-line_flip(struct linebuffer* lbf) {
+line_flip(struct linebuffer* lbf)
+{
     struct rbuffer* tmp = lbf->current;
     lbf->current = lbf->next;
     lbf->next = tmp;
@@ -97,4 +105,7 @@ lcntl_transform_inseq(struct term* tdev);
 int
 lcntl_transform_outseq(struct term* tdev);
 
+void
+term_notify_data_avaliable(struct termport_potens* cap);
+
 #endif /* __LUNAIX_TERM_H */