Changes in kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c [69483af:a14f346] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c
r69483af ra14f346 35 35 #include <arch/exception.h> 36 36 #include <arch/mach/beagleboardxm/beagleboardxm.h> 37 #include <genarch/drivers/amdm37x /uart.h>38 #include <genarch/drivers/amdm37x /irc.h>39 #include <genarch/drivers/amdm37x /gpt.h>37 #include <genarch/drivers/amdm37x_irc/amdm37x_irc.h> 38 #include <genarch/drivers/amdm37x_uart/amdm37x_uart.h> 39 #include <genarch/drivers/amdm37x_gpt/amdm37x_gpt.h> 40 40 #include <genarch/fb/fb.h> 41 41 #include <genarch/srln/srln.h> … … 61 61 static struct beagleboard { 62 62 amdm37x_irc_regs_t *irc_addr; 63 omap_uart_t uart;63 amdm37x_uart_t uart; 64 64 amdm37x_gpt_t timer; 65 65 } beagleboard; … … 167 167 static void bbxm_output_init(void) 168 168 { 169 #ifdef CONFIG_OMAP_UART170 169 /* UART3 is wired to external RS232 connector */ 171 const bool ok = omap_uart_init(&beagleboard.uart,170 const bool ok = amdm37x_uart_init(&beagleboard.uart, 172 171 AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE); 173 172 if (ok) { 174 173 stdout_wire(&beagleboard.uart.outdev); 175 174 } 176 #endif177 175 } 178 176 179 177 static void bbxm_input_init(void) 180 178 { 181 #ifdef CONFIG_OMAP_UART182 179 srln_instance_t *srln_instance = srln_init(); 183 180 if (srln_instance) { 184 181 indev_t *sink = stdin_wire(); 185 182 indev_t *srln = srln_wire(srln_instance, sink); 186 omap_uart_input_wire(&beagleboard.uart, srln);183 amdm37x_uart_input_wire(&beagleboard.uart, srln); 187 184 amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ); 188 185 } 189 #endif190 186 } 191 187
Note:
See TracChangeset
for help on using the changeset viewer.