diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-02 19:14:11 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-02 19:14:11 +0900 |
| commit | bc0f424faa11a2017ba725bb8c5fc481ece7b440 (patch) | |
| tree | e6272f37806941443f1ead19f965e8eeb531282c /drivers/serial/sh-sci.h | |
| parent | a2159b52219870553fd67e6456f41cd5225c46c6 (diff) | |
| parent | 225c9a8d1da274bf23efec43ec28b1c9e45e12f8 (diff) | |
| download | kernel_goldelico_gta04-bc0f424faa11a2017ba725bb8c5fc481ece7b440.zip kernel_goldelico_gta04-bc0f424faa11a2017ba725bb8c5fc481ece7b440.tar.gz kernel_goldelico_gta04-bc0f424faa11a2017ba725bb8c5fc481ece7b440.tar.bz2 | |
Merge branch 'sh/g3-prep'
Diffstat (limited to 'drivers/serial/sh-sci.h')
| -rw-r--r-- | drivers/serial/sh-sci.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h index b3d906b..511c10d 100644 --- a/drivers/serial/sh-sci.h +++ b/drivers/serial/sh-sci.h @@ -320,18 +320,16 @@ #define SCI_EVENT_WRITE_WAKEUP 0 #define SCI_IN(size, offset) \ - unsigned int addr = port->mapbase + (offset); \ if ((size) == 8) { \ - return ctrl_inb(addr); \ + return ioread8(port->membase + (offset)); \ } else { \ - return ctrl_inw(addr); \ + return ioread16(port->membase + (offset)); \ } #define SCI_OUT(size, offset, value) \ - unsigned int addr = port->mapbase + (offset); \ if ((size) == 8) { \ - ctrl_outb(value, addr); \ + iowrite8(value, port->membase + (offset)); \ } else if ((size) == 16) { \ - ctrl_outw(value, addr); \ + iowrite16(value, port->membase + (offset)); \ } #define CPU_SCIx_FNS(name, sci_offset, sci_size, scif_offset, scif_size)\ |