Changes in kernel/arch/arm32/src/mach/beaglebone/beaglebone.c [a829a5b:6f07226] in mainline

File:

• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (4 diffs)

kernel/arch/arm32/src/mach/beaglebone/beaglebone.c

@@ -35 +35 @@
 #include <arch/exception.h>
 #include <arch/mach/beaglebone/beaglebone.h>
-#include <genarch/drivers/am335x_irc/am335x_irc.h>
+#include <genarch/drivers/am335x/irc.h>
+#include <genarch/drivers/am335x/uart.h>
+#include <genarch/drivers/am335x/timer.h>
+#include <genarch/srln/srln.h>
 #include <interrupt.h>
 #include <ddi/ddi.h>
@@ -54 +57 @@
 static struct beaglebone {
         am335x_irc_regs_t *irc_addr;
+        am335x_timer_t timer;
+        am335x_uart_t uart;
 } bbone;
 
 struct arm_machine_ops bbone_machine_ops = {
-        bbone_init,
-        bbone_timer_irq_start,
-        bbone_cpu_halt,
-        bbone_get_memory_extents,
-        bbone_irq_exception,
-        bbone_frame_init,
-        bbone_output_init,
-        bbone_input_init,
-        bbone_get_irq_count,
-        bbone_get_platform_name
+        .machine_init = bbone_init,
+        .machine_timer_irq_start = bbone_timer_irq_start,
+        .machine_cpu_halt = bbone_cpu_halt,
+        .machine_get_memory_extents = bbone_get_memory_extents,
+        .machine_irq_exception = bbone_irq_exception,
+        .machine_frame_init = bbone_frame_init,
+        .machine_output_init = bbone_output_init,
+        .machine_input_init = bbone_input_init,
+        .machine_get_irq_count = bbone_get_irq_count,
+        .machine_get_platform_name = bbone_get_platform_name,
 };
 
@@ -78 +83 @@
 }
 
+static irq_ownership_t bbone_timer_irq_claim(irq_t *irq)
+{
+        return IRQ_ACCEPT;
+}
+
+static void bbone_timer_irq_handler(irq_t *irq)
+{
+        am335x_timer_intr_ack(&bbone.timer);
+        spinlock_unlock(&irq->lock);
+        clock();
+        spinlock_lock(&irq->lock);
+}
+
 static void bbone_timer_irq_start(void)
 {
+        /* Initialize the IRQ */
+        static irq_t timer_irq;
+        irq_initialize(&timer_irq);
+        timer_irq.devno = device_assign_devno();
+        timer_irq.inr = AM335x_DMTIMER0_IRQ;
+        timer_irq.claim = bbone_timer_irq_claim;
+        timer_irq.handler = bbone_timer_irq_handler;
+        irq_register(&timer_irq);
+
+        /* Initialize the DMTIMER0 */
+        am335x_timer_init(&bbone.timer, DMTIMER0, HZ);
+        /* Enable the interrupt */
+        am335x_irc_enable(bbone.irc_addr, AM335x_DMTIMER0_IRQ);
+        /* Start the timer */
+        am335x_timer_start(&bbone.timer);
 }
 
 static void bbone_cpu_halt(void)
 {
+        while (1);
 }
 
@@ -105 +139 @@
 static void bbone_output_init(void)
 {
+        const bool ok = am335x_uart_init(&bbone.uart,
+            AM335x_UART0_IRQ, AM335x_UART0_BASE_ADDRESS,
+            AM335x_UART0_SIZE);
+
+        if (ok)
+                stdout_wire(&bbone.uart.outdev);
 }
 
 static void bbone_input_init(void)
 {
+        srln_instance_t *srln_instance = srln_init();
+        if (srln_instance) {
+                indev_t *sink = stdin_wire();
+                indev_t *srln = srln_wire(srln_instance, sink);
+                am335x_uart_input_wire(&bbone.uart, srln);
+                am335x_irc_enable(bbone.irc_addr, AM335x_UART0_IRQ);
+        }
 }
 
 size_t bbone_get_irq_count(void)
 {
-        return 0;
+        return AM335x_IRC_IRQ_COUNT;
 }