Changeset dc22844 in mainline

Timestamp:

2009-02-20T16:44:32Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5c06c1c

Parents:

7aef7ee

Message:

Embed the ns16550 irq structure into the ns16550 instance structure.

Location:

kernel/genarch

Files:

• include/kbd/ns16550.h (modified) (1 diff)
• src/kbd/ns16550.c (modified) (2 diffs)

kernel/genarch/include/kbd/ns16550.h

@@ -66 +66 @@
         devno_t devno;
         ns16550_t *ns16550;
-        irq_t *irq;
+        irq_t irq;
 } ns16550_instance_t;
 

kernel/genarch/src/kbd/ns16550.c

@@ -105 +105 @@
 {
         ns16550_instance_t *instance;
-        irq_t *irq;
 
         chardev_initialize("ns16550_kbd", &kbrd, &ops);
@@ -114 +113 @@
                 return false;
 
-        irq = malloc(sizeof(irq_t), FRAME_ATOMIC);
-        if (!irq) {
-                free(instance);
-                return false;
-        }
-
         instance->devno = devno;
         instance->ns16550 = dev;
-        instance->irq = irq;
         
-        irq_initialize(irq);
-        irq->devno = devno;
-        irq->inr = inr;
-        irq->claim = ns16550_claim;
-        irq->handler = ns16550_irq_handler;
-        irq->instance = instance;
-        irq->cir = cir;
-        irq->cir_arg = cir_arg;
-        irq_register(irq);
+        irq_initialize(&instance->irq);
+        instance->irq.devno = devno;
+        instance->irq.inr = inr;
+        instance->irq.claim = ns16550_claim;
+        instance->irq.handler = ns16550_irq_handler;
+        instance->irq.instance = instance;
+        instance->irq.cir = cir;
+        instance->irq.cir_arg = cir_arg;
+        irq_register(&instance->irq);
 
-        ns16550_irq = irq;      /* TODO: remove me soon */
+        ns16550_irq = &instance->irq;   /* TODO: remove me soon */
         
-        while ((pio_read_8(&dev->lsr) & LSR_DATA_READY)) 
+        while ((pio_read_8(&dev->lsr) & LSR_DATA_READY))
                 (void) pio_read_8(&dev->rbr);