Changeset 4aa2a27 in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
- Timestamp:
- 2014-01-07T11:29:16Z (10 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 4edd71f6
- Parents:
- fd07e57b (diff), 226f72e (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
rfd07e57b r4aa2a27 37 37 #include <ipc/irq.h> 38 38 #include <console/chardev.h> 39 #include <genarch/drivers/pl011/pl011.h> 39 40 #include <genarch/drivers/pl050/pl050.h> 40 #include <genarch/drivers/arm926_uart/arm926_uart.h>41 41 #include <genarch/kbrd/kbrd.h> 42 42 #include <genarch/srln/srln.h> … … 61 61 icp_hw_map_t hw_map; 62 62 irq_t timer_irq; 63 arm926_uart_t uart;63 pl011_uart_t uart; 64 64 } icp; 65 65 … … 315 315 stdout_wire(fbdev); 316 316 #endif 317 #ifdef CONFIG_ARM926_UART 318 if (arm926_uart_init(&icp.uart, ARM926_UART0_IRQ, 319 ARM926_UART0_BASE_ADDRESS, sizeof(arm926_uart_regs_t))) 317 #ifdef CONFIG_PL011_UART 318 if (pl011_uart_init(&icp.uart, ICP_UART0_IRQ, ICP_UART)) 320 319 stdout_wire(&icp.uart.outdev); 321 320 #endif … … 351 350 ICP_KBD); 352 351 353 #ifdef CONFIG_ ARM926_UART352 #ifdef CONFIG_PL011_UART 354 353 srln_instance_t *srln_instance = srln_init(); 355 354 if (srln_instance) { 356 355 indev_t *sink = stdin_wire(); 357 356 indev_t *srln = srln_wire(srln_instance, sink); 358 arm926_uart_input_wire(&icp.uart, srln);359 icp_irqc_unmask(ARM926_UART0_IRQ);357 pl011_uart_input_wire(&icp.uart, srln); 358 icp_irqc_unmask(ICP_UART0_IRQ); 360 359 } 361 360 #endif
Note:
See TracChangeset
for help on using the changeset viewer.