Changeset c2417bc in mainline for kernel/genarch/src/drivers/dsrln/dsrlnin.c

Timestamp:

2009-04-21T12:46:26Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f2d2c7ba

Parents:

44b7783

Message:

change the way how input devices are wired together according to ticket #44
(also the proposal ​http://lists.modry.cz/cgi-bin/private/helenos-devel/2009-March/002507.html)

File:

• kernel/genarch/src/drivers/dsrln/dsrlnin.c (modified) (2 diffs)

kernel/genarch/src/drivers/dsrln/dsrlnin.c

@@ -41 +41 @@
 #include <ddi/device.h>
 
-static indev_operations_t kbrdin_ops = {
-        .poll = NULL
-};
-
 static irq_ownership_t dsrlnin_claim(irq_t *irq)
 {
@@ -55 +51 @@
         dsrlnin_t *dev = instance->dsrlnin;
         
-        indev_push_character(&instance->kbrdin, pio_read_8(&dev->data));
+        indev_push_character(instance->srlnin, pio_read_8(&dev->data));
 }
 
-indev_t *dsrlnin_init(dsrlnin_t *dev, inr_t inr)
+dsrlnin_instance_t *dsrlnin_init(dsrlnin_t *dev, inr_t inr)
 {
         dsrlnin_instance_t *instance
             = malloc(sizeof(dsrlnin_instance_t), FRAME_ATOMIC);
-        if (!instance)
-                return NULL;
+        if (instance) {
+                instance->dsrlnin = dev;
+                instance->srlnin = NULL;
+                
+                irq_initialize(&instance->irq);
+                instance->irq.devno = device_assign_devno();
+                instance->irq.inr = inr;
+                instance->irq.claim = dsrlnin_claim;
+                instance->irq.handler = dsrlnin_irq_handler;
+                instance->irq.instance = instance;
+        }
         
-        indev_initialize("dsrlnin", &instance->kbrdin, &kbrdin_ops);
+        return instance;
+}
+
+void dsrlnin_wire(dsrlnin_instance_t *instance, indev_t *srlnin)
+{
+        ASSERT(instance);
+        ASSERT(srlnin);
         
-        instance->dsrlnin = dev;
-        
-        irq_initialize(&instance->irq);
-        instance->irq.devno = device_assign_devno();
-        instance->irq.inr = inr;
-        instance->irq.claim = dsrlnin_claim;
-        instance->irq.handler = dsrlnin_irq_handler;
-        instance->irq.instance = instance;
+        instance->srlnin = srlnin;
         irq_register(&instance->irq);
-        
-        return &instance->kbrdin;
 }