Changeset 8565a42 in mainline for kernel/genarch/src/drivers/dsrln
- Timestamp:
- 2018-03-02T20:34:50Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a1a81f69, d5e5fd1
- Parents:
- 3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)links above to see all the changes relative to each parent. - git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
- git-committer:
- GitHub <noreply@…> (2018-03-02 20:34:50)
- Location:
- kernel/genarch/src/drivers/dsrln
- Files:
-
- 2 edited
-
dsrlnin.c (modified) (4 diffs)
-
dsrlnout.c (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
kernel/genarch/src/drivers/dsrln/dsrlnin.c
r3061bc1 r8565a42 50 50 dsrlnin_instance_t *instance = irq->instance; 51 51 dsrlnin_t *dev = instance->dsrlnin; 52 52 53 53 indev_push_character(instance->srlnin, pio_read_8(&dev->data)); 54 54 } … … 61 61 instance->dsrlnin = dev; 62 62 instance->srlnin = NULL; 63 63 64 64 irq_initialize(&instance->irq); 65 65 instance->irq.inr = inr; … … 68 68 instance->irq.instance = instance; 69 69 } 70 70 71 71 return instance; 72 72 } … … 76 76 assert(instance); 77 77 assert(srlnin); 78 78 79 79 instance->srlnin = srlnin; 80 80 irq_register(&instance->irq); -
kernel/genarch/src/drivers/dsrln/dsrlnout.c
r3061bc1 r8565a42 52 52 { 53 53 dsrlnout_instance_t *instance = (dsrlnout_instance_t *) dev->data; 54 54 55 55 if ((!instance->parea.mapped) || (console_override)) { 56 56 if (ascii_check(ch)) … … 73 73 if (!dsrlndev) 74 74 return NULL; 75 75 76 76 dsrlnout_instance_t *instance = malloc(sizeof(dsrlnout_instance_t), 77 77 FRAME_ATOMIC); … … 80 80 return NULL; 81 81 } 82 82 83 83 outdev_initialize("dsrlndev", dsrlndev, &dsrlndev_ops); 84 84 dsrlndev->data = instance; 85 85 86 86 instance->base = base; 87 87 link_initialize(&instance->parea.link); … … 91 91 instance->parea.mapped = false; 92 92 ddi_parea_register(&instance->parea); 93 93 94 94 if (!fb_exported) { 95 95 /* … … 101 101 sysinfo_set_item_val("fb.kind", NULL, 3); 102 102 sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(base)); 103 103 104 104 fb_exported = true; 105 105 } 106 106 107 107 return dsrlndev; 108 108 }
Note:
See TracChangeset
for help on using the changeset viewer.
