WebSVN – HelenOS – Diff – //trunk/kernel/arch/sparc64/src/drivers/sgcn.c

  * Key into the SRAM table of contents which identifies the entry
  * describing the OBP console buffer. It is worth mentioning
  * that the OBP console buffer is not the only console buffer
  * which can be used. It is, however, used because when the kernel
  * is running, the OBP buffer is not used by OBP any more but OBP
- * has already made neccessary arangements so that the output will
+ * has already made necessary arrangements so that the output will
  * be read from the OBP buffer and input will go to the OBP buffer.
  * Therefore HelenOS needs to make no such arrangements any more.
  */
 #define CONSOLE_KEY     "OBPCONS"
 /*
  * Returns a pointer to the object of a given type which is placed at the given
  * offset from the console buffer beginning.
  */
 #define SGCN_BUFFER(type, offset) \
-                ((type *) (sgcn_buffer_begin + (offset)))
+    ((type *) (sgcn_buffer_begin + (offset)))
 /** Returns a pointer to the console buffer header. */
 #define SGCN_BUFFER_HEADER  (SGCN_BUFFER(sgcn_buffer_header_t, 0))
 /** defined in drivers/kbd.c */
 };
 /** SGCN character device */
 chardev_t sgcn_io;
+/** Address of the chardev, which is connected to SGCN. */
+static chardev_t *sgcnout;
 /**
  * Set some sysinfo values (SRAM address and SRAM size).
  */
 static void register_sram(uintptr_t sram_begin_physical)
+{
     sysinfo_set_item_val("sram.area.size", NULL, MAPPED_AREA_SIZE);
     sysinfo_set_item_val("sram.address.physical", NULL,
         sram_begin_physical);
+}
 /**
  * Initializes the starting address of SRAM.
+ *
  * The SRAM starts 0x900000 + C bytes behind the SBBC start in the
  * physical memory, where C is the value read from the "iosram-toc"
  * property of the "/chosen" OBP node. The sram_begin variable will
  * be set to the virtual address which maps to the SRAM physical
  * address.
- *
- * It also registers the physical area of SRAM and sets some sysinfo
- * values (SRAM address and SRAM size).
  */
 static void init_sram_begin(void)
+{
     ofw_tree_node_t *chosen;
     ofw_tree_property_t *iosram_toc;
         panic("Cannot find property 'iosram-toc'.");
     if (!iosram_toc->value)
         panic("Cannot find SRAM TOC.");
     sram_begin_physical = SBBC_START + SBBC_SRAM_OFFSET
         + *((uint32_t *) iosram_toc->value);
     sram_begin = hw_map(sram_begin_physical, MAPPED_AREA_SIZE);
     register_sram(sram_begin_physical);
+}
     ASSERT(i < MAX_TOC_ENTRIES);
     sgcn_buffer_begin = sram_begin + SRAM_TOC->keys[i].offset;
     sysinfo_set_item_val("sram.buffer.offset", NULL,
         SRAM_TOC->keys[i].offset);
+}
 /**
  * Default suspend/resume operation for the input device.
  */
     uint32_t end = SGCN_BUFFER_HEADER->out_end;
     uint32_t size = end - begin;
     /* we need pointers to volatile variables */
     volatile char *buf_ptr = (volatile char *)
         SGCN_BUFFER(char, SGCN_BUFFER_HEADER->out_wrptr);
     volatile uint32_t *out_wrptr_ptr = &(SGCN_BUFFER_HEADER->out_wrptr);
     volatile uint32_t *out_rdptr_ptr = &(SGCN_BUFFER_HEADER->out_rdptr);
     /*
      * Write the character and increment the write pointer modulo the
+{
     uint32_t begin = SGCN_BUFFER_HEADER->in_begin;
     uint32_t end = SGCN_BUFFER_HEADER->in_end;
     uint32_t size = end - begin;
-    spinlock_lock(&sgcn_input_lock);
-    ipl_t ipl = interrupts_disable();
-    if (kbd_disabled) {
+    if (kbd_disabled)
-        interrupts_restore(ipl);
         return;
-    }
+    spinlock_lock(&sgcn_input_lock);
     /* we need pointers to volatile variables */
     volatile char *buf_ptr = (volatile char *)
         SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
     volatile uint32_t *in_wrptr_ptr = &(SGCN_BUFFER_HEADER->in_wrptr);
     volatile uint32_t *in_rdptr_ptr = &(SGCN_BUFFER_HEADER->in_rdptr);
     while (*in_rdptr_ptr != *in_wrptr_ptr) {
         buf_ptr = (volatile char *)
             SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
         char c = *buf_ptr;
         *in_rdptr_ptr = (((*in_rdptr_ptr) - begin + 1) % size) + begin;
-        if (c == '\r') {
+        if (sgcnout)
-            c = '\n';
-        }
-        chardev_push_character(&sgcn_io, c);
+            chardev_push_character(sgcnout, c);
+    }
-    interrupts_restore(ipl);
     spinlock_unlock(&sgcn_input_lock);
+}
 /**
  * Polling thread function.
 /**
  * A public function which initializes I/O from/to Serengeti console
  * and sets it as a default input/output.
  */
-void sgcn_init(void)
+void sgcn_init(chardev_t *devout)
+{
     sgcn_buffer_begin_init();
     kbd_type = KBD_SGCN;
     if (!t)
         panic("Cannot create kkbdpoll.");
     thread_ready(t);
     chardev_initialize("sgcn_io", &sgcn_io, &sgcn_ops);
-    stdin = &sgcn_io;
     stdout = &sgcn_io;
+    sgcnout = devout;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)//trunk/kernel/arch/sparc64/src/drivers/sgcn.c – Rev 4070 → 4071