Author: jchandra
Date: Thu Jan 20 08:08:19 2011
New Revision: 217625
URL: http://svn.freebsd.org/changeset/base/217625
Log:
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.
Modified:
head/sys/mips/rmi/pic.h
head/sys/mips/rmi/xlr_pci.c
Modified: head/sys/mips/rmi/pic.h
==============================================================================
--- head/sys/mips/rmi/pic.h Thu Jan 20 07:56:09 2011 (r217624)
+++ head/sys/mips/rmi/pic.h Thu Jan 20 08:08:19 2011 (r217625)
@@ -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);
Modified: head/sys/mips/rmi/xlr_pci.c
==============================================================================
--- head/sys/mips/rmi/xlr_pci.c Thu Jan 20 07:56:09 2011 (r217624)
+++ head/sys/mips/rmi/xlr_pci.c Thu Jan 20 08:08:19 2011 (r217625)
@@ -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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
