Changeset c882505 in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
- Timestamp:
- 2013-03-26T17:44:16Z (11 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 44b2b78
- Parents:
- 0dfa93b0
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
r0dfa93b0 rc882505 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 … … 314 314 stdout_wire(fbdev); 315 315 #endif 316 #ifdef CONFIG_ARM926_UART 317 if (arm926_uart_init(&icp.uart, ARM926_UART0_IRQ, 318 ARM926_UART0_BASE_ADDRESS, sizeof(arm926_uart_regs_t))) 316 #ifdef CONFIG_PL011_UART 317 if (pl011_uart_init(&icp.uart, ICP_UART0_IRQ, ICP_UART)) 319 318 stdout_wire(&icp.uart.outdev); 320 319 #endif … … 350 349 ICP_KBD); 351 350 352 #ifdef CONFIG_ ARM926_UART351 #ifdef CONFIG_PL011_UART 353 352 srln_instance_t *srln_instance = srln_init(); 354 353 if (srln_instance) { 355 354 indev_t *sink = stdin_wire(); 356 355 indev_t *srln = srln_wire(srln_instance, sink); 357 arm926_uart_input_wire(&icp.uart, srln);358 icp_irqc_unmask(ARM926_UART0_IRQ);356 pl011_uart_input_wire(&icp.uart, srln); 357 icp_irqc_unmask(ICP_UART0_IRQ); 359 358 } 360 359 #endif
Note:
See TracChangeset
for help on using the changeset viewer.