Changes in / [b933ec2:d216142] in mainline

Files:

• HelenOS.config (modified) (3 diffs)
• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (1 diff)
• kernel/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (4 diffs)
• kernel/genarch/Makefile.inc (modified) (1 diff)
• kernel/genarch/include/drivers/am335x/irc.h (deleted)
• kernel/genarch/include/drivers/am335x/timer.h (deleted)
• kernel/genarch/include/drivers/am335x/timer_regs.h (deleted)
• kernel/genarch/include/drivers/am335x/uart.h (deleted)
• kernel/genarch/include/drivers/am335x/uart_regs.h (deleted)
• kernel/genarch/include/drivers/am335x_irc/am335x_irc.h (added)
• kernel/genarch/include/drivers/amdm37x/dispc.h (deleted)
• kernel/genarch/include/drivers/amdm37x/gpt.h (deleted)
• kernel/genarch/include/drivers/amdm37x/irc.h (deleted)
• kernel/genarch/include/drivers/amdm37x/uart.h (deleted)
• kernel/genarch/include/drivers/amdm37x/uart_regs.h (deleted)
• kernel/genarch/include/drivers/amdm37x_dispc/amdm37x_dispc.h (added)
• kernel/genarch/include/drivers/amdm37x_gpt/amdm37x_gpt.h (added)
• kernel/genarch/include/drivers/amdm37x_irc/amdm37x_irc.h (added)
• kernel/genarch/include/drivers/amdm37x_uart/amdm37x_uart.h (added)
• kernel/genarch/src/drivers/am335x/timer.c (deleted)
• kernel/genarch/src/drivers/am335x/uart.c (deleted)
• kernel/genarch/src/drivers/amdm37x/uart.c (deleted)
• kernel/genarch/src/drivers/amdm37x_uart/amdm37x_uart.c (added)

HelenOS.config

@@ -420 +420 @@
 % Output device class
 @ "generic" Monitor or serial line
-! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_HID_OUT (choice)
+! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm)] CONFIG_HID_OUT (choice)
 
 % Output device class
@@ -480 +480 @@
 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
 
-% Support for TI AM335x on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_UART (y/n)
-
-% Support for TI AM335x timers support
-! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
-
-% Support for TI AMDM37x on-chip UART
+% Support for TI AMDM37X on-chip UART
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n)
 
@@ -508 +502 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_AM335X_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_AMDM37X_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_AMDM37X_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
 
 % EGA support

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

@@ -35 +35 @@
 #include <arch/exception.h>
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
-#include <genarch/drivers/amdm37x/uart.h>
-#include <genarch/drivers/amdm37x/irc.h>
-#include <genarch/drivers/amdm37x/gpt.h>
-#include <genarch/drivers/amdm37x/dispc.h>
+#include <genarch/drivers/amdm37x_irc/amdm37x_irc.h>
+#include <genarch/drivers/amdm37x_uart/amdm37x_uart.h>
+#include <genarch/drivers/amdm37x_gpt/amdm37x_gpt.h>
+#include <genarch/drivers/amdm37x_dispc/amdm37x_dispc.h>
 #include <genarch/fb/fb.h>
 #include <genarch/srln/srln.h>

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.h>
-#include <genarch/drivers/am335x/uart.h>
-#include <genarch/drivers/am335x/timer.h>
-#include <genarch/srln/srln.h>
+#include <genarch/drivers/am335x_irc/am335x_irc.h>
 #include <interrupt.h>
 #include <ddi/ddi.h>
@@ -57 +54 @@
 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 = {
-        .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,
+        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
 };
 
@@ -83 +78 @@
 }
 
-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);
 }
 
@@ -139 +105 @@
 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 AM335x_IRC_IRQ_COUNT;
+        return 0;
 }
 

kernel/genarch/Makefile.inc

@@ -106 +106 @@
 endif
 
-ifeq ($(CONFIG_AM335X_UART),y)
-        GENARCH_SOURCES += \
-                genarch/src/drivers/am335x/uart.c
-endif
-
-ifeq ($(CONFIG_AM335X_TIMERS),y)
-        GENARCH_SOURCES += \
-                genarch/src/drivers/am335x/timer.c
-endif
-
 ifeq ($(CONFIG_AMDM37X_UART),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/amdm37x/uart.c
+                genarch/src/drivers/amdm37x_uart/amdm37x_uart.c
 endif