Changeset 493

Show
Ignore:
Timestamp:
02/26/07 20:08:04 (2 years ago)
Author:
goodea
Message:

perfect

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/hal/lpc2106-cmucam3/cc3.c

    r468 r493  
    743743  } 
    744744 
    745   // otherwise, it has been pressed, but it's in GPIO mode 
     745  // otherwise, it has been pressed, and it's in GPIO mode 
    746746  return !(REG (GPIO_IOPIN) & _CC3_BUTTON); 
    747747} 

  • trunk/hal/lpc2106-cmucam3/mmc_hardware.c

    r372 r493  
    3535#include "cc3.h" 
    3636#include "mmc_hardware.h" 
     37 
     38#include "interrupt.h" 
    3739 
    3840#include <time.h> 
    …… 
    187189{                               // select SPI target and light the LED. 
    188190  //printf("selectMMC\r\n"); 
    189  
     191  disable_button_interrupt();      // button is multiplexed with CS 
    190192  REG (GPIO_IODIR) |= _CC3_MMC_CS;      // switch chip select to output 
    191193  REG (GPIO_IOCLR) = _CC3_MMC_CS;       // chip select (neg true) 
    …… 
    198200  REG (GPIO_IOSET) = _CC3_MMC_CS;       // chip select (neg true) 
    199201  REG (GPIO_IODIR) &= ~_CC3_MMC_CS;     // switch chip select to input 
     202  if (!_cc3_button_trigger) { 
     203    enable_button_interrupt();    // button is multiplexed with CS 
     204  } 
    200205} 
    201206