Changeset 84176f3 in mainline for kernel/genarch/src/drivers/pl011/pl011.c
- Timestamp:
- 2019-04-10T15:04:17Z (5 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 8df0306
- Parents:
- b58728f
- git-author:
- Petr Pavlu <setup@…> (2019-03-31 14:09:57)
- git-committer:
- Jakub Jermář <jakub@…> (2019-04-10 15:04:17)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/genarch/src/drivers/pl011/pl011.c
rb58728f r84176f3 60 60 pl011_uart_t *uart = dev->data; 61 61 62 if (!ascii_check(ch)) { 62 /* If the userspace owns the console, do not output anything. */ 63 if (uart->parea.mapped && !console_override) 64 return; 65 66 if (!ascii_check(ch)) 63 67 pl011_uart_sendb(uart, U_SPECIAL); 64 }else {68 else { 65 69 if (ch == '\n') 66 70 pl011_uart_sendb(uart, (uint8_t) '\r'); … … 100 104 assert(uart); 101 105 uart->regs = (void *)km_map(addr, sizeof(pl011_uart_regs_t), 102 KM_NATURAL_ALIGNMENT, PAGE_ NOT_CACHEABLE);106 KM_NATURAL_ALIGNMENT, PAGE_WRITE | PAGE_NOT_CACHEABLE); 103 107 assert(uart->regs); 104 108 … … 131 135 uart->irq.instance = uart; 132 136 137 ddi_parea_init(&uart->parea); 138 uart->parea.pbase = addr; 139 uart->parea.frames = 1; 140 uart->parea.unpriv = false; 141 uart->parea.mapped = false; 142 ddi_parea_register(&uart->parea); 143 133 144 return true; 134 145 }
Note:
See TracChangeset
for help on using the changeset viewer.