Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c

    r69483af ra14f346  
    3535#include <arch/exception.h>
    3636#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>
    4040#include <genarch/fb/fb.h>
    4141#include <genarch/srln/srln.h>
     
    6161static struct beagleboard {
    6262        amdm37x_irc_regs_t *irc_addr;
    63         omap_uart_t uart;
     63        amdm37x_uart_t uart;
    6464        amdm37x_gpt_t timer;
    6565} beagleboard;
     
    167167static void bbxm_output_init(void)
    168168{
    169 #ifdef CONFIG_OMAP_UART
    170169        /* 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,
    172171            AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE);
    173172        if (ok) {
    174173                stdout_wire(&beagleboard.uart.outdev);
    175174        }
    176 #endif
    177175}
    178176
    179177static void bbxm_input_init(void)
    180178{
    181 #ifdef CONFIG_OMAP_UART
    182179        srln_instance_t *srln_instance = srln_init();
    183180        if (srln_instance) {
    184181                indev_t *sink = stdin_wire();
    185182                indev_t *srln = srln_wire(srln_instance, sink);
    186                 omap_uart_input_wire(&beagleboard.uart, srln);
     183                amdm37x_uart_input_wire(&beagleboard.uart, srln);
    187184                amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
    188185        }
    189 #endif
    190186}
    191187
Note: See TracChangeset for help on using the changeset viewer.