summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2010-12-23 12:50:55 +0000
committerSebastian Huber <sebastian.huber@embedded-brains.de>2010-12-23 12:50:55 +0000
commit6d9059f6e8737b33c71c2396bdbf6519006518c2 (patch)
treeea883d5f3e6a3cb7f10efc3fecbe20d6f775daf5 /c
parent2010-12-22 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff)
downloadrtems-6d9059f6e8737b33c71c2396bdbf6519006518c2.tar.bz2
2010-12-23 Sebastian Huber <sebastian.huber@embedded-brains.de>
* mpc83xx/i2c/mpc83xx_i2cdrv.c: Fixed interrupt flag clearing for MPC55XX family.
Diffstat (limited to 'c')
-rw-r--r--c/src/lib/libcpu/powerpc/ChangeLog7
-rw-r--r--c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog
index 8e327d4022..42c58d5e26 100644
--- a/c/src/lib/libcpu/powerpc/ChangeLog
+++ b/c/src/lib/libcpu/powerpc/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-23 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * mpc83xx/i2c/mpc83xx_i2cdrv.c: Fixed interrupt flag clearing for
+ MPC55XX family.
+
2010-12-22 Sebastian Huber <sebastian.huber@embedded-brains.de>
* new-exceptions/bspsupport/ppc_exc.S: Comment.
@@ -14,7 +19,7 @@
* mpc55xx/include/irq.h: Include missing <bspopts.h>. Format.
* mpc83xx/include/mpc83xx.h, mpc83xx/i2c/mpc83xx_i2cdrv.h,
mpc83xx/i2c/mpc83xx_i2cdrv.c: Changes to use this driver for the
- MPC55XX familiy.
+ MPC55XX family.
2010-08-15 Joel Sherrill <joel.sherrilL@OARcorp.com>
diff --git a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c
index 79919cc8dc..97396434a3 100644
--- a/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c
+++ b/c/src/lib/libcpu/powerpc/mpc83xx/i2c/mpc83xx_i2cdrv.c
@@ -203,7 +203,11 @@ static void mpc83xx_i2c_irq_handler
/*
* clear IRQ flag
*/
- softc_ptr->reg_ptr->i2csr &= ~I2CSR_MIF;
+ #if defined(__GEN83xx_BSP_h)
+ softc_ptr->reg_ptr->i2csr &= ~I2CSR_MIF;
+ #elif defined(LIBBSP_POWERPC_MPC55XXEVB_BSP_H)
+ softc_ptr->reg_ptr->i2csr = I2CSR_MIF;
+ #endif
/*
* disable interrupt mask