diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-12 01:21:19 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-03-12 01:21:19 +0100 |
| commit | 2281490485ef2c76f93bf37a5014f5e630d5a3d0 (patch) | |
| tree | ad8753cb05655d0579b42c91b1a8bdf122f08fa2 /include/ns16550.h | |
| parent | d509b81210e8126d8f953fda419f93c8065e314a (diff) | |
| download | blackbird-obmc-uboot-2281490485ef2c76f93bf37a5014f5e630d5a3d0.tar.gz blackbird-obmc-uboot-2281490485ef2c76f93bf37a5014f5e630d5a3d0.zip | |
Word alignment fixes for word aligned NS16550 UART
Patch by Jean-Paul Saman, 01 Mar 2005
Diffstat (limited to 'include/ns16550.h')
| -rw-r--r-- | include/ns16550.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/ns16550.h b/include/ns16550.h index e17a11edca..d987a8b7ed 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -45,15 +45,15 @@ struct NS16550 { } __attribute__ ((packed)); #elif (CFG_NS16550_REG_SIZE == 4) struct NS16550 { - unsigned long rbr; /* 0 */ - unsigned long ier; /* 1 */ - unsigned long fcr; /* 2 */ - unsigned long lcr; /* 3 */ - unsigned long mcr; /* 4 */ - unsigned long lsr; /* 5 */ - unsigned long msr; /* 6 */ - unsigned long scr; /* 7 */ -} __attribute__ ((packed)); + unsigned long rbr; /* 0 r */ + unsigned long ier; /* 1 rw */ + unsigned long fcr; /* 2 w */ + unsigned long lcr; /* 3 rw */ + unsigned long mcr; /* 4 rw */ + unsigned long lsr; /* 5 r */ + unsigned long msr; /* 6 r */ + unsigned long scr; /* 7 rw */ +}; /* No need to pack an already aligned struct */ #elif (CFG_NS16550_REG_SIZE == -4) struct NS16550 { unsigned char rbr; /* 0 */ @@ -102,7 +102,7 @@ typedef volatile struct NS16550 *NS16550_t; #define MCR_DMA_EN 0x04 #define MCR_TX_DFR 0x08 -#define LCR_WLS_MSK 0x03 /* character length slect mask */ +#define LCR_WLS_MSK 0x03 /* character length select mask */ #define LCR_WLS_5 0x00 /* 5 bit character length */ #define LCR_WLS_6 0x01 /* 6 bit character length */ #define LCR_WLS_7 0x02 /* 7 bit character length */ |
