Rev 1831 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1831 | Rev 1832 | ||
---|---|---|---|
Line 37... | Line 37... | ||
37 | #include <arch/drivers/xconsole.h> |
37 | #include <arch/drivers/xconsole.h> |
38 | #include <putchar.h> |
38 | #include <putchar.h> |
39 | #include <console/chardev.h> |
39 | #include <console/chardev.h> |
40 | #include <console/console.h> |
40 | #include <console/console.h> |
41 | #include <arch/hypercall.h> |
41 | #include <arch/hypercall.h> |
42 | #include <mm/frame.h> |
- | |
43 | 42 | ||
44 | #define MASK_INDEX(index, ring) ((index) & (sizeof(ring) - 1)) |
43 | #define MASK_INDEX(index, ring) ((index) & (sizeof(ring) - 1)) |
45 | 44 | ||
46 | typedef struct { |
- | |
47 | char in[1024]; |
- | |
48 | char out[2048]; |
- | |
49 | uint32_t in_cons; |
- | |
50 | uint32_t in_prod; |
- | |
51 | uint32_t out_cons; |
- | |
52 | uint32_t out_prod; |
- | |
53 | } xencons_t; |
- | |
54 | - | ||
55 | static bool asynchronous = false; |
45 | static bool asynchronous = false; |
56 | static void xen_putchar(chardev_t *d, const char ch); |
46 | static void xen_putchar(chardev_t *d, const char ch); |
57 | 47 | ||
58 | chardev_t xen_console; |
48 | chardev_t xen_console; |
59 | static chardev_operations_t xen_ops = { |
49 | static chardev_operations_t xen_ops = { |
Line 69... | Line 59... | ||
69 | } |
59 | } |
70 | 60 | ||
71 | void xen_putchar(chardev_t *d, const char ch) |
61 | void xen_putchar(chardev_t *d, const char ch) |
72 | { |
62 | { |
73 | if (asynchronous) { |
63 | if (asynchronous) { |
74 | xencons_t *console = (xencons_t *) PA2KA(MA2PA(PFN2ADDR(start_info.console_mfn))); |
- | |
75 | uint32_t cons = console->out_cons; |
64 | uint32_t cons = console_page.out_cons; |
76 | uint32_t prod = console->out_prod; |
65 | uint32_t prod = console_page.out_prod; |
77 | 66 | ||
78 | memory_barrier(); |
67 | memory_barrier(); |
79 | 68 | ||
80 | if ((prod - cons) > sizeof(console->out)) |
69 | if ((prod - cons) > sizeof(console_page.out)) |
81 | return; |
70 | return; |
82 | 71 | ||
83 | if (ch == '\n') |
72 | if (ch == '\n') |
84 | console->out[MASK_INDEX(prod++, console->out)] = '\r'; |
73 | console_page.out[MASK_INDEX(prod++, console_page.out)] = '\r'; |
85 | console->out[MASK_INDEX(prod++, console->out)] = ch; |
74 | console_page.out[MASK_INDEX(prod++, console_page.out)] = ch; |
86 | 75 | ||
87 | write_barrier(); |
76 | write_barrier(); |
88 | 77 | ||
89 | console->out_prod = prod; |
78 | console_page.out_prod = prod; |
90 | 79 | ||
91 | xen_notify_remote(start_info.console_evtchn); |
80 | xen_notify_remote(start_info.console_evtchn); |
92 | } else |
81 | } else |
93 | xen_console_io(CONSOLE_IO_WRITE, 1, &ch); |
82 | xen_console_io(CONSOLE_IO_WRITE, 1, &ch); |
94 | } |
83 | } |