Changeset 21b6307 in mainline

Timestamp:

2012-10-31T18:26:45Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3da166f0

Parents:

6bbe470

Message:

Merge ns16550_output into ns16550_init.

Location:

kernel

Files:

• arch/amd64/src/amd64.c (modified) (2 diffs)
• arch/ia32/src/ia32.c (modified) (2 diffs)
• arch/ia64/src/ia64.c (modified) (1 diff)
• arch/sparc64/src/drivers/kbd.c (modified) (1 diff)
• genarch/include/drivers/ns16550/ns16550.h (modified) (1 diff)
• genarch/src/drivers/ns16550/ns16550.c (modified) (3 diffs)

kernel/arch/amd64/src/amd64.c

@@ -222 +222 @@
          * Initialize the ns16550 controller.
          */
+#ifdef CONFIG_NS16550_OUT
+        outdev_t *ns16550_out;
+        outdev_t **ns16550_out_ptr = &ns16550_out;
+#else
+        outdev_t **ns16550_out_ptr = NULL;
+#endif
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL);
+            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL,
+            ns16550_out_ptr);
         if (ns16550_instance) {
 #ifdef CONFIG_NS16550
@@ -235 +242 @@
 #endif
 #ifdef CONFIG_NS16550_OUT
-                outdev_t *ns16550_out = ns16550_output(ns16550_instance);
                 if (ns16550_out) {
                         stdout_wire(ns16550_out);

kernel/arch/ia32/src/ia32.c

@@ -176 +176 @@
          * Initialize the ns16550 controller.
          */
+#ifdef CONFIG_NS16550_OUT
+        outdev_t *ns16550_out;
+        outdev_t **ns16550_out_ptr = &ns16550_out;
+#else
+        outdev_t **ns16550_out_ptr = NULL;
+#endif
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL);
+            = ns16550_init((ns16550_t *) NS16550_BASE, IRQ_NS16550, NULL, NULL,
+            ns16550_out_ptr);
         if (ns16550_instance) {
 #ifdef CONFIG_NS16550
@@ -189 +196 @@
 #endif
 #ifdef CONFIG_NS16550_OUT
-                outdev_t *ns16550_out = ns16550_output(ns16550_instance);
                 if (ns16550_out) {
                         stdout_wire(ns16550_out);

kernel/arch/ia64/src/ia64.c

@@ -173 +173 @@
 #ifdef CONFIG_NS16550
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL);
+            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL,
+            NULL);
         if (ns16550_instance) {
                 srln_instance_t *srln_instance = srln_init();

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

@@ -117 +117 @@
             PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
         
-        ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir, cir_arg);
+        ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir,
+            cir_arg, NULL);
         if (ns16550_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();

kernel/genarch/include/drivers/ns16550/ns16550.h

@@ -74 +74 @@
 } ns16550_instance_t;
 
-extern ns16550_instance_t *ns16550_init(ns16550_t *, inr_t, cir_t, void *);
+extern ns16550_instance_t *ns16550_init(ns16550_t *, inr_t, cir_t, void *,
+    outdev_t **);
 extern void ns16550_wire(ns16550_instance_t *, indev_t *);
-extern outdev_t *ns16550_output(ns16550_instance_t *);
 
 #endif

kernel/genarch/src/drivers/ns16550/ns16550.c

@@ -102 +102 @@
  *
  * @param dev      Addrress of the beginning of the device in I/O space.
- * @param devno    Device number.
  * @param inr      Interrupt number.
  * @param cir      Clear interrupt function.
  * @param cir_arg  First argument to cir.
+ * @param output   Where to store pointer to the output device
+ *                 or NULL if the caller is not interested in
+ *                 writing to the serial port.
  *
  * @return Keyboard instance or NULL on failure.
  *
  */
-ns16550_instance_t *ns16550_init(ns16550_t *dev, inr_t inr, cir_t cir, void *cir_arg)
+ns16550_instance_t *ns16550_init(ns16550_t *dev, inr_t inr, cir_t cir,
+    void *cir_arg, outdev_t **output)
 {
         ns16550_instance_t *instance
@@ -118 +121 @@
                 instance->input = NULL;
                 instance->output = NULL;
+                
+                if (output) {
+                        instance->output = malloc(sizeof(outdev_t),
+                            FRAME_ATOMIC);
+                        if (!instance->output) {
+                                free(instance);
+                                return NULL;
+                        }
+                        
+                        outdev_initialize("ns16550", instance->output,
+                            &ns16550_ops);
+                        instance->output->data = instance;
+                        *output = instance->output;
+                }
                 
                 irq_initialize(&instance->irq);
@@ -153 +170 @@
 }
 
-outdev_t *ns16550_output(ns16550_instance_t *instance)
-{
-        ASSERT(instance);
-        
-        if (instance->output == NULL) {
-                instance->output = malloc(sizeof(outdev_t),
-                    FRAME_ATOMIC);
-                if (instance->output) {
-                        outdev_initialize("ns16550", instance->output,
-                            &ns16550_ops);
-                        instance->output->data = instance;
-                }
-        }
-        
-        return instance->output;
-}
-
 /** @}
  */