Changeset de88998 in mainline for kernel/arch/sparc64/src/drivers/sgcn.c

Timestamp:

2009-03-11T19:46:35Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

05915ba4

Parents:

63b1537

Message:

Some additional fixes to the sgcn driver.

File:

• kernel/arch/sparc64/src/drivers/sgcn.c (modified) (12 diffs)

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

@@ -74 +74 @@
  * 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.
@@ -97 +97 @@
  */
 #define SGCN_BUFFER(type, offset) \
-                                ((type *) (sgcn_buffer_begin + (offset)))
+        ((type *) (sgcn_buffer_begin + (offset)))
 
 /** Returns a pointer to the console buffer header. */
@@ -146 +146 @@
 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).
@@ -153 +156 @@
         sysinfo_set_item_val("sram.area.size", NULL, MAPPED_AREA_SIZE);
         sysinfo_set_item_val("sram.address.physical", NULL,
-                sram_begin_physical);
+            sram_begin_physical);
 }
 
@@ -164 +167 @@
  * 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)
@@ -185 +185 @@
 
         sram_begin_physical = SBBC_START + SBBC_SRAM_OFFSET
-                + *((uint32_t *) iosram_toc->value);
+            + *((uint32_t *) iosram_toc->value);
         sram_begin = hw_map(sram_begin_physical, MAPPED_AREA_SIZE);
         
@@ -219 +219 @@
         
         sysinfo_set_item_val("sram.buffer.offset", NULL,
-                SRAM_TOC->keys[i].offset);
+            SRAM_TOC->keys[i].offset);
 }
 
@@ -242 +242 @@
         /* we need pointers to volatile variables */
         volatile char *buf_ptr = (volatile char *)
-                SGCN_BUFFER(char, SGCN_BUFFER_HEADER->out_wrptr);
+            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);
@@ -320 +320 @@
         uint32_t size = end - begin;
 
+        if (kbd_disabled)
+                return;
+
         spinlock_lock(&sgcn_input_lock);
-        
-        ipl_t ipl = interrupts_disable();
-
-        if (kbd_disabled) {
-                interrupts_restore(ipl);
-                return;
-        }
         
         /* we need pointers to volatile variables */
         volatile char *buf_ptr = (volatile char *)
-                SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
+            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);
@@ -338 +334 @@
                 
                 buf_ptr = (volatile char *)
-                        SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
+                    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') {
-                        c = '\n';
-                }
-                chardev_push_character(&sgcn_io, c);    
+                if (sgcnout)
+                        chardev_push_character(sgcnout, c);     
         }       
 
-        interrupts_restore(ipl);        
         spinlock_unlock(&sgcn_input_lock);
 }
@@ -368 +361 @@
  * and sets it as a default input/output. 
  */
-void sgcn_init(void)
+void sgcn_init(chardev_t *devout)
 {
         sgcn_buffer_begin_init();
@@ -384 +377 @@
         
         chardev_initialize("sgcn_io", &sgcn_io, &sgcn_ops);
-        stdin = &sgcn_io;
         stdout = &sgcn_io;
+
+        sgcnout = devout;
 }