diff options
| author | jchandra <jchandra@FreeBSD.org> | 2011-01-20 08:08:19 +0000 |
|---|---|---|
| committer | jchandra <jchandra@FreeBSD.org> | 2011-01-20 08:08:19 +0000 |
| commit | b2750647b417022b5ccef907fc4511ec5f502802 (patch) | |
| tree | f271fd133fa17a39680d677fc2cf0b10aad0ac1b /sys/mips | |
| parent | 0779b4e7dcc4918effdaef380edfb4b027b29053 (diff) | |
| download | FreeBSD-src-b2750647b417022b5ccef907fc4511ec5f502802.zip FreeBSD-src-b2750647b417022b5ccef907fc4511ec5f502802.tar.gz | |
Fixes in the XLR platform code
- Fix bug in pic.h, assign reg variable, before return.
- In xlr_pci.c, need to ignore the result of mmio read.
Diffstat (limited to 'sys/mips')
| -rw-r--r-- | sys/mips/rmi/pic.h | 4 | ||||
| -rw-r--r-- | sys/mips/rmi/xlr_pci.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/mips/rmi/pic.h b/sys/mips/rmi/pic.h index 543369c..7b90eb9 100644 --- a/sys/mips/rmi/pic.h +++ b/sys/mips/rmi/pic.h @@ -163,7 +163,7 @@ pic_read_control(void) uint32_t reg; mtx_lock_spin(&xlr_pic_lock); - xlr_read_reg(mmio, PIC_CTRL); + reg = xlr_read_reg(mmio, PIC_CTRL); mtx_unlock_spin(&xlr_pic_lock); return (reg); } @@ -179,7 +179,7 @@ pic_write_control(uint32_t control) } static __inline void -pic_update_control(__uint32_t control) +pic_update_control(uint32_t control) { xlr_reg_t *mmio = xlr_io_mmio(XLR_IO_PIC_OFFSET); diff --git a/sys/mips/rmi/xlr_pci.c b/sys/mips/rmi/xlr_pci.c index 8cdaede..7532816 100644 --- a/sys/mips/rmi/xlr_pci.c +++ b/sys/mips/rmi/xlr_pci.c @@ -426,7 +426,7 @@ static void bridge_pcix_ack(int irq) { - xlr_read_reg(xlr_io_mmio(XLR_IO_PCIX_OFFSET), 0x140 >> 2); + (void)xlr_read_reg(xlr_io_mmio(XLR_IO_PCIX_OFFSET), 0x140 >> 2); } static void |
