Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / tos / chips / pxa27x / cif / HplPXA27XQuickCaptIntM.nc

diff --git a/tos/chips/pxa27x/cif/HplPXA27XQuickCaptIntM.nc b/tos/chips/pxa27x/cif/HplPXA27XQuickCaptIntM.nc
index 78abf87c996850b584695c22b19e2ee7acced9b1..f8ddab13948123b44743413a68aabeb027c30268 100644 (file)
--- a/tos/chips/pxa27x/cif/HplPXA27XQuickCaptIntM.nc
+++ b/tos/chips/pxa27x/cif/HplPXA27XQuickCaptIntM.nc
@@ -45,8 +45,6 @@
  * @author Brano Kusy (branislav.kusy@gmail.com)
  * @version October 25, 2007
  */
-#include "SCCB.h"
-#include "OV7649.h"
 #include "PXA27XQuickCaptInt.h"
 #include "DMA.h"
 #include "dmaArray.h"
@@ -150,7 +148,6 @@ implementation
 
     async command void HplPXA27XQuickCaptInt.disableQuick()
     {
-        led_clr();//call LED_PIN.clr();
         CICR0 &= ~(CICR0_EN);
         CISR |= CISR_CQD;
     } 
@@ -172,11 +169,8 @@ implementation
 
     command error_t HplPXA27XQuickCaptInt.setImageSize(uint16_t sizeX, uint16_t sizeY, uint8_t colorType)
     {
-        //was: if (sizeX > 2048 || sizeY > 2048)
-    if (sizeX > 320 || sizeY > 240) 
-            return FAIL;
-
-    
+    if (sizeX > 2048 || sizeY > 2048)
+      return FAIL;
 
     // (1) - Set the Quick Capture Interface Size
     //was: call HplPXA27XQuickCaptInt.disableQuick();
@@ -218,13 +212,11 @@ implementation
       
         //atomic{printfUART(">>>>>>>>>>>>>>> PPID_CIF_Irq.fired() >>>>>>>>>>>\n", "");}
         volatile uint32_t tempCISR;
-        call Leds.led0Toggle();
 
         atomic {  tempCISR = CISR; }
         // Start-Of-Frame
         if ((tempCISR & CISR_SOF) && (~(CICR0) & CICR0_SOFM)) {
             atomic CISR |= CISR_SOF;
-            led_set();//call LED_PIN.set();
             signal HplPXA27XQuickCaptInt.startOfFrame();
             // this disables CIF after the current frame capture is done 
             CICR0 |= CICR0_DIS;                
@@ -232,7 +224,6 @@ implementation
         // End-Of-Frame
         if ((tempCISR & CISR_EOF) && (~(CICR0) & CICR0_EOFM)) {
             atomic CISR |= CISR_EOF;
-            led_clr();//call LED_PIN.clr();
             signal HplPXA27XQuickCaptInt.endOfFrame();
             return;           
         }