at91sam9260ek: move board id setup to config header

[karo-tx-uboot.git] / include / serial.h

diff --git a/include/serial.h b/include/serial.h
index fbf101bd7f706888f7958199321751c32147cb62..f6bb2b90a1ee196c4a353ab0708e1146c2c139a0 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -1,70 +1,50 @@
 #ifndef __SERIAL_H__
 #define __SERIAL_H__
 
-#define NAMESIZE 16
-#define CTLRSIZE 8
+#include <post.h>
 
 struct serial_device {
-       char name[NAMESIZE];
-       char ctlr[CTLRSIZE];
-
-       int  (*init) (void);
-       int  (*uninit) (void);
-       void (*setbrg) (void);
-       int (*getc) (void);
-       int (*tstc) (void);
-       void (*putc) (const char c);
-       void (*puts) (const char *s);
-
-       struct serial_device *next;
+       /* enough bytes to match alignment of following func pointer */
+       char    name[16];
+
+       int     (*start)(void);
+       int     (*stop)(void);
+       void    (*setbrg)(void);
+       int     (*getc)(void);
+       int     (*tstc)(void);
+       void    (*putc)(const char c);
+       void    (*puts)(const char *s);
+#if CONFIG_POST & CONFIG_SYS_POST_UART
+       void    (*loop)(int);
+#endif
+       struct serial_device    *next;
 };
 
+void default_serial_puts(const char *s);
+
 extern struct serial_device serial_smc_device;
 extern struct serial_device serial_scc_device;
-extern struct serial_device * default_serial_console (void);
-
-#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) || \
-    defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) || \
-    defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC83xx) || \
-    defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)
+extern struct serial_device *default_serial_console(void);
+
+#if    defined(CONFIG_405GP) || defined(CONFIG_405CR) || \
+       defined(CONFIG_405EP) || defined(CONFIG_405EZ) || \
+       defined(CONFIG_405EX) || defined(CONFIG_440) || \
+       defined(CONFIG_MB86R0x) || defined(CONFIG_MPC5xxx) || \
+       defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
+       defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) || \
+       defined(CONFIG_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
+       defined(CONFIG_MICROBLAZE)
 extern struct serial_device serial0_device;
 extern struct serial_device serial1_device;
-#if defined(CONFIG_SYS_NS16550_SERIAL)
-extern struct serial_device eserial1_device;
-extern struct serial_device eserial2_device;
-extern struct serial_device eserial3_device;
-extern struct serial_device eserial4_device;
-#endif /* CONFIG_SYS_NS16550_SERIAL */
-
-#endif
-
-#if defined(CONFIG_S3C2410)
-extern struct serial_device s3c24xx_serial0_device;
-extern struct serial_device s3c24xx_serial1_device;
-extern struct serial_device s3c24xx_serial2_device;
-#endif
-
-#if defined(CONFIG_S5PC1XX)
-extern struct serial_device s5pc1xx_serial0_device;
-extern struct serial_device s5pc1xx_serial1_device;
-extern struct serial_device s5pc1xx_serial2_device;
-extern struct serial_device s5pc1xx_serial3_device;
-#endif
-
-#if defined(CONFIG_OMAP3_ZOOM2)
-extern struct serial_device zoom2_serial_device0;
-extern struct serial_device zoom2_serial_device1;
-extern struct serial_device zoom2_serial_device2;
-extern struct serial_device zoom2_serial_device3;
 #endif
 
-extern struct serial_device serial_ffuart_device;
-extern struct serial_device serial_btuart_device;
-extern struct serial_device serial_stuart_device;
+extern struct serial_device eserial1_device;
+extern struct serial_device eserial2_device;
 
+extern void serial_register(struct serial_device *);
 extern void serial_initialize(void);
 extern void serial_stdio_init(void);
-extern int serial_assign(char * name);
+extern int serial_assign(const char *name);
 extern void serial_reinit_all(void);
 
 /* For usbtty */
@@ -85,4 +65,11 @@ extern int usbtty_tstc(void);
 
 #endif /* CONFIG_USB_TTY */
 
+#if defined(CONFIG_MPC512X)
+extern struct stdio_dev *open_port(int num, int baudrate);
+extern int close_port(int num);
+extern int write_port(struct stdio_dev *port, char *buf);
+extern int read_port(struct stdio_dev *port, char *buf, int size);
+#endif
+
 #endif