Rev 3743 | Rev 3863 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 3743 | Rev 3817 | ||
|---|---|---|---|
| Line 35... | Line 35... | ||
| 35 | */ |
35 | */ |
| 36 | 36 | ||
| 37 | #include <arch/drivers/niagara.h> |
37 | #include <arch/drivers/niagara.h> |
| 38 | #include <console/chardev.h> |
38 | #include <console/chardev.h> |
| 39 | #include <console/console.h> |
39 | #include <console/console.h> |
| - | 40 | #include <arch/drivers/kbd.h> |
|
| 40 | #include <arch/sun4v/hypercall.h> |
41 | #include <arch/sun4v/hypercall.h> |
| 41 | 42 | ||
| 42 | /* functions referenced from definitions of I/O operations structures */ |
43 | /* functions referenced from definitions of I/O operations structures */ |
| 43 | static void niagara_putchar(chardev_t *, const char); |
44 | static void niagara_putchar(chardev_t *, const char); |
| - | 45 | static void niagara_noop(chardev_t *); |
|
| - | 46 | static char niagara_read(chardev_t *); |
|
| 44 | 47 | ||
| 45 | /** character device operations */ |
48 | /** character device operations */ |
| 46 | static chardev_operations_t niagara_ops = { |
49 | static chardev_operations_t niagara_ops = { |
| 47 | .write = niagara_putchar |
50 | .write = niagara_putchar, |
| - | 51 | .suspend = niagara_noop, |
|
| - | 52 | .resume = niagara_noop, |
|
| - | 53 | .read = niagara_read |
|
| 48 | }; |
54 | }; |
| 49 | 55 | ||
| 50 | /** Niagara character device */ |
56 | /** Niagara character device */ |
| 51 | chardev_t niagara_io; |
57 | chardev_t niagara_io; |
| 52 | 58 | ||
| - | 59 | /** defined in drivers/kbd.c */ |
|
| - | 60 | extern kbd_type_t kbd_type; |
|
| - | 61 | ||
| 53 | /** Writes a single character to the standard output. */ |
62 | /** Writes a single character to the standard output. */ |
| 54 | static void niagara_putchar(struct chardev * cd, const char c) |
63 | static void niagara_putchar(struct chardev * cd, const char c) |
| 55 | { |
64 | { |
| 56 | __hypercall_fast1(CONS_PUTCHAR, c); |
65 | __hypercall_fast1(CONS_PUTCHAR, c); |
| 57 | if (c == '\n') |
66 | if (c == '\n') |
| 58 | __hypercall_fast1(CONS_PUTCHAR, '\r'); |
67 | __hypercall_fast1(CONS_PUTCHAR, '\r'); |
| 59 | } |
68 | } |
| 60 | 69 | ||
| 61 | - | ||
| 62 | /** |
70 | /** |
| 63 | * Grabs the input for kernel. |
71 | * Grabs the input for kernel. |
| 64 | */ |
72 | */ |
| 65 | void niagara_grab(void) |
73 | void niagara_grab(void) |
| 66 | { |
74 | { |
| Line 72... | Line 80... | ||
| 72 | void niagara_release(void) |
80 | void niagara_release(void) |
| 73 | { |
81 | { |
| 74 | } |
82 | } |
| 75 | 83 | ||
| 76 | /** |
84 | /** |
| - | 85 | * Default suspend/resume operation for the input device. |
|
| - | 86 | */ |
|
| - | 87 | static void niagara_noop(chardev_t *d) |
|
| - | 88 | { |
|
| - | 89 | } |
|
| - | 90 | ||
| - | 91 | /** |
|
| - | 92 | * Called when actively reading the character. Not implemented yet. |
|
| - | 93 | */ |
|
| - | 94 | static char niagara_read(chardev_t *d) |
|
| - | 95 | { |
|
| - | 96 | return (char) 0; |
|
| - | 97 | } |
|
| - | 98 | ||
| - | 99 | /** |
|
| - | 100 | * Function regularly called by the keyboard polling thread. Asks the |
|
| - | 101 | * hypervisor whether there is any unread character. If so, it picks it up |
|
| - | 102 | * and sends it to the upper layers of HelenOS. |
|
| - | 103 | */ |
|
| - | 104 | void niagara_poll(void) |
|
| - | 105 | { |
|
| - | 106 | uint64_t c = 50; |
|
| - | 107 | ||
| - | 108 | if (__hypercall_fast_ret1(0, 0, 0, 0, 0, CONS_GETCHAR, &c) == EOK) { |
|
| - | 109 | chardev_push_character(&niagara_io, c); |
|
| - | 110 | if (c == '\r') |
|
| - | 111 | chardev_push_character(&niagara_io, '\n'); |
|
| - | 112 | } |
|
| - | 113 | ||
| - | 114 | } |
|
| - | 115 | ||
| - | 116 | /** |
|
| 77 | * Initializes the input/output subsystem so that the Niagara standard |
117 | * Initializes the input/output subsystem so that the Niagara standard |
| 78 | * input/output is used. |
118 | * input/output is used. |
| 79 | */ |
119 | */ |
| 80 | void niagara_init(void) |
120 | void niagara_init(void) |
| 81 | { |
121 | { |
| - | 122 | kbd_type = KBD_SUN4V; |
|
| - | 123 | ||
| 82 | chardev_initialize("niagara_io", &niagara_io, &niagara_ops); |
124 | chardev_initialize("niagara_io", &niagara_io, &niagara_ops); |
| 83 | stdin = &niagara_io; |
125 | stdin = &niagara_io; |
| 84 | stdout = &niagara_io; |
126 | stdout = &niagara_io; |
| 85 | } |
127 | } |
| 86 | 128 | ||