mtd/dataflash.c: fix a problem with the last partition

[oweals/u-boot.git] / include / ns16550.h

diff --git a/include/ns16550.h b/include/ns16550.h
index d987a8b7edb21ab66142f35c70e8f07a250b6d0e..e6ade61a226beab883488376c53ae513c599785f 100644 (file)
--- a/include/ns16550.h
+++ b/include/ns16550.h
@@ -2,14 +2,17 @@
  * NS16550 Serial Port
  * originally from linux source (arch/ppc/boot/ns16550.h)
  * modified slightly to
- * have addresses as offsets from CFG_ISA_BASE
+ * have addresses as offsets from CONFIG_SYS_ISA_BASE
  * added a few more definitions
  * added prototypes for ns16550.c
  * reduced no of com ports to 2
  * modifications (c) Rob Taylor, Flying Pig Systems. 2000.
+ *
+ * added support for port on 64-bit bus
+ * by Richard Danter (richard.danter@windriver.com), (C) 2005 Wind River Systems
  */
 
-#if (CFG_NS16550_REG_SIZE == 1)
+#if (CONFIG_SYS_NS16550_REG_SIZE == 1)
 struct NS16550 {
        unsigned char rbr;              /* 0 */
        unsigned char ier;              /* 1 */
@@ -32,7 +35,7 @@ struct NS16550 {
        unsigned char ssr;              /* 11*/
 #endif
 } __attribute__ ((packed));
-#elif (CFG_NS16550_REG_SIZE == 2)
+#elif (CONFIG_SYS_NS16550_REG_SIZE == 2)
 struct NS16550 {
        unsigned short rbr;             /* 0 */
        unsigned short ier;             /* 1 */
@@ -43,7 +46,7 @@ struct NS16550 {
        unsigned short msr;             /* 6 */
        unsigned short scr;             /* 7 */
 } __attribute__ ((packed));
-#elif (CFG_NS16550_REG_SIZE == 4)
+#elif (CONFIG_SYS_NS16550_REG_SIZE == 4)
 struct NS16550 {
        unsigned long rbr;              /* 0 r  */
        unsigned long ier;              /* 1 rw */
@@ -54,7 +57,7 @@ struct NS16550 {
        unsigned long msr;              /* 6 r  */
        unsigned long scr;              /* 7 rw */
 }; /* No need to pack an already aligned struct */
-#elif (CFG_NS16550_REG_SIZE == -4)
+#elif (CONFIG_SYS_NS16550_REG_SIZE == -4)
 struct NS16550 {
        unsigned char rbr;              /* 0 */
        int pad1:24;
@@ -82,6 +85,25 @@ struct NS16550 {
        int pad10:24;
 #endif
 } __attribute__ ((packed));
+#elif (CONFIG_SYS_NS16550_REG_SIZE == -8)
+struct NS16550 {
+       unsigned char rbr;              /* 0 */
+       unsigned char pad0[7];
+       unsigned char ier;              /* 1 */
+       unsigned char pad1[7];
+       unsigned char fcr;              /* 2 */
+       unsigned char pad2[7];
+       unsigned char lcr;              /* 3 */
+       unsigned char pad3[7];
+       unsigned char mcr;              /* 4 */
+       unsigned char pad4[7];
+       unsigned char lsr;              /* 5 */
+       unsigned char pad5[7];
+       unsigned char msr;              /* 6 */
+       unsigned char pad6[7];
+       unsigned char scr;              /* 7 */
+       unsigned char pad7[7];
+} __attribute__ ((packed));
 #else
 #error "Please define NS16550 registers size."
 #endif