Ignore:
File:
1 edited

Legend:

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

    r3c9646b r9c56996  
    6363
    6464static struct beaglebone {
    65         omap_irc_regs_t *irc_addr;
     65        am335x_irc_regs_t *irc_addr;
    6666        am335x_cm_per_regs_t *cm_per_addr;
    6767        am335x_cm_dpll_regs_t *cm_dpll_addr;
    6868        am335x_ctrl_module_t  *ctrl_module;
    6969        am335x_timer_t timer;
    70         omap_uart_t uart;
     70        am335x_uart_t uart;
    7171} bbone;
    7272
     
    104104
    105105        /* Initialize the interrupt controller */
    106         omap_irc_init(bbone.irc_addr);
     106        am335x_irc_init(bbone.irc_addr);
    107107}
    108108
     
    153153        }
    154154        /* Enable the interrupt */
    155         omap_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);
     155        am335x_irc_enable(bbone.irc_addr, AM335x_DMTIMER2_IRQ);
    156156        /* Start the timer */
    157157        am335x_timer_start(&bbone.timer);
     
    176176static void bbone_irq_exception(unsigned int exc_no, istate_t *istate)
    177177{
    178         const unsigned inum = omap_irc_inum_get(bbone.irc_addr);
     178        const unsigned inum = am335x_irc_inum_get(bbone.irc_addr);
     179        am335x_irc_irq_ack(bbone.irc_addr);
    179180
    180181        irq_t *irq = irq_dispatch_and_lock(inum);
     
    186187                printf("Spurious interrupt\n");
    187188        }
    188 
    189         omap_irc_irq_ack(bbone.irc_addr);
    190189}
    191190
     
    196195static void bbone_output_init(void)
    197196{
    198 #ifdef CONFIG_OMAP_UART
    199         const bool ok = omap_uart_init(&bbone.uart,
     197        const bool ok = am335x_uart_init(&bbone.uart,
    200198            AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
    201199            AM335x_UART0_SIZE);
     
    203201        if (ok)
    204202                stdout_wire(&bbone.uart.outdev);
    205 #endif
    206203}
    207204
    208205static void bbone_input_init(void)
    209206{
    210 #ifdef CONFIG_OMAP_UART
    211207        srln_instance_t *srln_instance = srln_init();
    212208        if (srln_instance) {
    213209                indev_t *sink = stdin_wire();
    214210                indev_t *srln = srln_wire(srln_instance, sink);
    215                 omap_uart_input_wire(&bbone.uart, srln);
    216                 omap_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
     211                am335x_uart_input_wire(&bbone.uart, srln);
     212                am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
    217213        }
    218 #endif
    219214}
    220215
Note: See TracChangeset for help on using the changeset viewer.