Changeset 533e2d7 in mainline for kernel/genarch/include/genarch/drivers/amdm37x/uart.h

Timestamp:

2013-06-03T07:55:35Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

797d4d19

Parents:

ea15a89a (diff), 6db5d4b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/genarch/include/genarch/drivers/amdm37x/uart.h (modified) (2 diffs)

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