Changeset 7ca8422b in mainline

Timestamp:

2013-05-01T00:33:39Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9d504072

Parents:

b38c079

Message:

remove the amdm37x ad-hoc uart driver and make use of the generic omap uart.

Files:

• HelenOS.config (modified) (2 diffs)
• kernel/arch/arm32/src/mach/beagleboardxm/beagleboardxm.c (modified) (3 diffs)
• kernel/genarch/Makefile.inc (modified) (1 diff)
• kernel/genarch/include/genarch/drivers/amdm37x/uart.h (modified) (2 diffs)
• kernel/genarch/include/genarch/drivers/amdm37x/uart_regs.h (deleted)
• kernel/genarch/src/drivers/amdm37x/uart.c (deleted)

HelenOS.config

@@ -487 +487 @@
 ! [PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_IRQC (y)
 
-% Support for OMAP on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beaglebone] CONFIG_OMAP_UART (y/n)
-
 % Support for TI AM335x timers support
 ! [PLATFORM=arm32&MACHINE=beaglebone] CONFIG_AM335X_TIMERS (y)
 
-% Support for TI AMDM37x on-chip UART
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=beagleboardxm] CONFIG_AMDM37X_UART (y/n)
+% Support for OMAP on-chip UART
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
 
 % Support for i8042 controller
@@ -515 +512 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_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=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_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

@@ -61 +61 @@
 static struct beagleboard {
         amdm37x_irc_regs_t *irc_addr;
-        amdm37x_uart_t uart;
+        omap_uart_t uart;
         amdm37x_gpt_t timer;
 } beagleboard;
@@ -168 +168 @@
 {
         /* UART3 is wired to external RS232 connector */
-        const bool ok = amdm37x_uart_init(&beagleboard.uart,
+        const bool ok = omap_uart_init(&beagleboard.uart,
             AMDM37x_UART3_IRQ, AMDM37x_UART3_BASE_ADDRESS, AMDM37x_UART3_SIZE);
         if (ok) {
@@ -181 +181 @@
                 indev_t *sink = stdin_wire();
                 indev_t *srln = srln_wire(srln_instance, sink);
-                amdm37x_uart_input_wire(&beagleboard.uart, srln);
+                omap_uart_input_wire(&beagleboard.uart, srln);
                 amdm37x_irc_enable(beagleboard.irc_addr, AMDM37x_UART3_IRQ);
         }

kernel/genarch/Makefile.inc

@@ -115 +115 @@
 endif
 
-ifeq ($(CONFIG_AMDM37X_UART),y)
-        GENARCH_SOURCES += \
-                genarch/src/drivers/amdm37x/uart.c
-endif
-
 ifeq ($(CONFIG_VIA_CUDA),y)
         GENARCH_SOURCES += \

kernel/genarch/include/genarch/drivers/amdm37x/uart.h

@@ -37 +37 @@
 #define _AMDM37x_UART_H_
 
-#include "uart_regs.h"
+#include <genarch/drivers/omap/uart.h>
 
 /* AMDM37x TRM p. 2950 */
@@ -56 +56 @@
 #define AMDM37x_UART4_IRQ   80 /* AMDM37x TRM p. 2418 */
 
-typedef struct {
-        amdm37x_uart_regs_t *regs;
-        indev_t *indev;
-        outdev_t outdev;
-        irq_t irq;
-} amdm37x_uart_t;
-
-
-bool amdm37x_uart_init(amdm37x_uart_t *, inr_t, uintptr_t, size_t);
-void amdm37x_uart_input_wire(amdm37x_uart_t *, indev_t *);
-
 #endif