From e5aaf80616074be7a0f447b543bf6bb27f1dd15d Mon Sep 17 00:00:00 2001
From: yutaka <yutaka@4ee2a332-4b2b-5046-8439-1ba90f034370>
Date: Thu, 23 Aug 2007 09:47:50 +0000
Subject: [PATCH] change standby/output bits order to modify support micron
 initialization file to initialize both camera at the same time

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@248 4ee2a332-4b2b-5046-8439-1ba90f034370
---
 .../libraries/camera/ARM7/camera_i2c_micron.c |  4 +-
 build/libraries/camera/ARM7/convert_micron.pl | 49 ++++++++++++++-----
 2 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/build/libraries/camera/ARM7/camera_i2c_micron.c b/build/libraries/camera/ARM7/camera_i2c_micron.c
index 79be7d0..4560952 100644
--- a/build/libraries/camera/ARM7/camera_i2c_micron.c
+++ b/build/libraries/camera/ARM7/camera_i2c_micron.c
@@ -85,8 +85,8 @@ BOOL CAMERAi_M_I2CResume(CameraSelect camera)
     {
         return FALSE;
     }
-    return CAMERAi_M_SetFlags(camera, 0x001A, 0x0200)   // enable to output
-        && CAMERAi_M_ClearFlags(camera, 0x0018, 0x0001);// resume from standby
+    return CAMERAi_M_ClearFlags(camera, 0x0018, 0x0001)  // resume from standby
+        && CAMERAi_M_SetFlags(camera, 0x001A, 0x0200);   // enable to output;
 }
 
 /*---------------------------------------------------------------------------*
diff --git a/build/libraries/camera/ARM7/convert_micron.pl b/build/libraries/camera/ARM7/convert_micron.pl
index ca2da76..d404eae 100644
--- a/build/libraries/camera/ARM7/convert_micron.pl
+++ b/build/libraries/camera/ARM7/convert_micron.pl
@@ -39,9 +39,44 @@ static inline BOOL CAMERAi_M_WriteMCU( CameraSelect camera, u16 addr, u16 value
 }
 static inline BOOL CAMERAi_M_ReadMCU( CameraSelect camera, u16 addr, u16 *pValue )
 {
+    if (camera == CAMERA_SELECT_BOTH)
+    {
+        u16 vIn;
+        u16 vOut;
+        if (CAMERAi_M_WriteRegister(camera, 0x98C, addr)
+         && CAMERAi_M_ReadRegisters(CAMERA_SELECT_IN, 0x990, &vIn, 1)
+         && CAMERAi_M_ReadRegisters(CAMERA_SELECT_OUT, 0x990, &vOut, 1))
+        {
+            if (vIn == vOut)
+            {
+                *pValue = vIn;
+                return TRUE;
+            }
+        }
+        return FALSE;
+    }
     return CAMERAi_M_WriteRegister(camera, 0x98C, addr)
         && CAMERAi_M_ReadRegisters(camera, 0x990, pValue, 1);
 }
+static inline BOOL CAMERAi_M_ReadRegEx( CameraSelect camera, u16 addr, u16 *pValue )
+{
+    if (camera == CAMERA_SELECT_BOTH)
+    {
+        u16 vIn;
+        u16 vOut;
+        if (CAMERAi_M_ReadRegisters(CAMERA_SELECT_IN, addr, &vIn, 1)
+         && CAMERAi_M_ReadRegisters(CAMERA_SELECT_OUT, addr, &vOut, 1))
+        {
+            if (vIn == vOut)
+            {
+                *pValue = vIn;
+                return TRUE;
+            }
+        }
+        return FALSE;
+    }
+    return CAMERAi_M_ReadRegisters(camera, addr, pValue, 1);
+}
 
 EOF
 
@@ -103,12 +138,7 @@ my $pollreg_format =<<'EOF';
     while (1)
     {
         u16 data;
-        if (CAMERAi_M_ReadRegisters(camera, %1$s, &data, 1) == FALSE)
-        {
-            DBG_PRINTF("Failed to read a register! (%%d)\n", __LINE__);
-            return FALSE;
-        }
-        if ((data & %2$s) %3$s)
+        if (CAMERAi_M_ReadRegEx(camera, %1$s, &data) == FALSE || (data & %2$s) %3$s)
         {
             if (--timeout)
             {
@@ -167,12 +197,7 @@ my $pollfield_format =<<'EOF';
     while (1)
     {
         u16 data;
-        if (CAMERAi_M_ReadMCU(camera, %1$s, &data) == FALSE)
-        {
-            DBG_PRINTF("Failed to read a MCU! (%%d)\n", __LINE__);
-            return FALSE;
-        }
-        if (data %2$s)
+        if (CAMERAi_M_ReadMCU(camera, %1$s, &data) == FALSE || data %2$s)
         {
             if (--timeout)
             {