Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / include / serial.h

diff --git a/include/serial.h b/include/serial.h
index 47332c53406eb16b2226d1792c463ab6066fd396..d87f01082a056f07a05a3161785fc4231318b157 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -26,12 +26,8 @@ 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_405EP) || defined(CONFIG_405EZ) || \
-       defined(CONFIG_405EX) || defined(CONFIG_440) || \
-       defined(CONFIG_MPC5xxx) || \
-       defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
-       defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) || \
+#if    defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \
+       defined(CONFIG_MPC86xx) || \
        defined(CONFIG_TEGRA) || defined(CONFIG_SYS_COREBOOT) || \
        defined(CONFIG_MICROBLAZE)
 extern struct serial_device serial0_device;
@@ -69,13 +65,6 @@ 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
-
 struct udevice;
 
 /**
@@ -159,10 +148,18 @@ struct dm_serial_ops {
 /**
  * struct serial_dev_priv - information about a device used by the uclass
  *
- * @sdev: stdio device attached to this uart
+ * @sdev:      stdio device attached to this uart
+ *
+ * @buf:       Pointer to the RX buffer
+ * @rd_ptr:    Read pointer in the RX buffer
+ * @wr_ptr:    Write pointer in the RX buffer
  */
 struct serial_dev_priv {
        struct stdio_dev *sdev;
+
+       char *buf;
+       int rd_ptr;
+       int wr_ptr;
 };
 
 /* Access the serial operations for a device */
@@ -192,10 +189,6 @@ void marvell_serial_initialize(void);
 void max3100_serial_initialize(void);
 void mcf_serial_initialize(void);
 void ml2_serial_initialize(void);
-void mpc512x_serial_initialize(void);
-void mpc5xx_serial_initialize(void);
-void mpc8260_scc_serial_initialize(void);
-void mpc8260_smc_serial_initialize(void);
 void mpc85xx_serial_initialize(void);
 void mpc8xx_serial_initialize(void);
 void mxc_serial_initialize(void);