Changeset 8e33e1d in mainline for kernel/arch/sparc64/src/drivers/niagara.c

Timestamp:

2010-01-29T17:15:32Z (14 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

b86d436

Parents:

86018c1

Message:

Cleanup.

File:

• kernel/arch/sparc64/src/drivers/niagara.c (modified) (6 diffs)

kernel/arch/sparc64/src/drivers/niagara.c

@@ -52 +52 @@
 #include <genarch/srln/srln.h>
 
+/* polling interval in miliseconds */
 #define POLL_INTERVAL  10000
 
+/* device instance */
 static niagara_instance_t *instance = NULL;
 
@@ -124 +126 @@
 static void niagara_poll(niagara_instance_t *instance)
 {
+        /* print any pending characters from the shared buffer to the console */
         while (output_buffer.read_ptr != output_buffer.write_ptr) {
                 do_putchar(output_buffer.data[output_buffer.read_ptr]);
@@ -132 +135 @@
         uint64_t c;
 
+        /* read character from keyboard, send it to upper layers of HelenOS */
         if (__hypercall_fast_ret1(0, 0, 0, 0, 0, CONS_GETCHAR, &c) == EOK) {
                 if (!silent) {
+                        /* kconsole active, send the character to kernel */
                         indev_push_character(instance->srlnin, c);
                 } else {
+                        /* kconsole inactive, send the character to uspace driver */
                         input_buffer.data[input_buffer.write_ptr] = (char) c;
                         input_buffer.write_ptr =
@@ -141 +147 @@
                 }
         }
-
 }
 
@@ -177 +182 @@
 
         instance->srlnin = NULL;
-        sysinfo_set_item_val("fb.kind", NULL, 5);
+
+        output_buffer.read_ptr = 0;
+        output_buffer.write_ptr = 0;
+        input_buffer.write_ptr = 0;
+        input_buffer.read_ptr = 0;
 
         /*
@@ -184 +193 @@
          * buffers.
          */
-        output_buffer.read_ptr = 0;
-        output_buffer.write_ptr = 0;
-        input_buffer.write_ptr = 0;
-        input_buffer.read_ptr = 0;
+
+        sysinfo_set_item_val("fb.kind", NULL, 5);
 
         sysinfo_set_item_val("niagara.outbuf.address", NULL,