1 files changed, 6 insertions, 6 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c
index 7e4e608e15..c5d23a3673 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/i2c-meg-fx.c
@@ -41,7 +41,7 @@ void i2c_write(int addr, const unsigned char *buf, int count)
     mutex_lock(&i2c_mtx);
 
     /* Turn on I2C clock */
-    CLKCON |= (1 << 16);
+    s3c_regset(&CLKCON, 1 << 16);
 
     /* Set mode to master transmitter and enable lines */
     IICSTAT = I2C_MODE_MASTER | I2C_MODE_TX | I2C_RXTX_ENB;
@@ -74,7 +74,7 @@ void i2c_write(int addr, const unsigned char *buf, int count)
     IICSTAT = 0;
 
     /* Turn off I2C clock */
-    CLKCON &= ~(1 << 16);
+    s3c_regclr(&CLKCON, 1 << 16);
 
     mutex_unlock(&i2c_mtx);
 }
@@ -90,11 +90,11 @@ void i2c_init(void)
     INTPND = IIC_MASK;
 
     /* Enable i2c interrupt in controller */
-    INTMOD &= ~IIC_MASK;
-    INTMSK &= ~IIC_MASK;
+    s3c_regclr(&INTMOD, IIC_MASK);
+    s3c_regclr(&INTMSK, IIC_MASK);
 
     /* Turn on I2C clock */
-    CLKCON |= (1 << 16);
+    s3c_regset(&CLKCON, 1 << 16);
 
     /* Set GPE15 (IICSDA) and GPE14 (IICSCL) to IIC */
     GPECON = (GPECON & ~((3 << 30) | (3 << 28))) |
@@ -108,7 +108,7 @@ void i2c_init(void)
     IICLC = (0 << 0);
 
     /* Turn off I2C clock */
-    CLKCON &= ~(1 << 16);
+    s3c_regclr(&CLKCON, 1 << 16);
 }
 
 void IIC(void)