[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/handhelds/tos/platform/shimmer SDC.nc, 1.2, 1.3 hardware.h, 1.9, 1.10

[steve ayer]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/platform/shimmer
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28605

Modified Files:
	SDC.nc hardware.h 
Log Message:

changes necessary to support updates to SD module; SD now handles
features found on shimmer, but pins are dummies here and won't affect
application code.


Index: SDC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/platform/shimmer/SDC.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SDC.nc	15 Feb 2007 17:05:20 -0000	1.2
--- SDC.nc	22 Jan 2008 20:14:27 -0000	1.3
***************
*** 42,51 ****
  }
  implementation {
!   components SD_M, HPLUSART0M, TimerC, LedsC;
  
    StdControl = SD_M;
    SD = SD_M;
    SD_M.USARTControl  -> HPLUSART0M;
!   SD_M.Timer           -> TimerC.Timer[unique("Timer")];
    SD_M.Leds           -> LedsC;
  }
--- 42,51 ----
  }
  implementation {
!   components SD_M, HPLUSART0M, TimerC, MSP430InterruptC, LedsC;
  
    StdControl = SD_M;
    SD = SD_M;
    SD_M.USARTControl  -> HPLUSART0M;
!   SD_M.DockInterrupt   -> MSP430InterruptC.Port25;
    SD_M.Leds           -> LedsC;
  }

Index: hardware.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/handhelds/tos/platform/shimmer/hardware.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** hardware.h	21 Aug 2007 18:00:09 -0000	1.9
--- hardware.h	22 Jan 2008 20:14:27 -0000	1.10
***************
*** 60,64 ****
  TOSH_ASSIGN_PIN(RADIO_VREF,      5, 6);    // unused in shimmer
  TOSH_ASSIGN_PIN(SW_BT_PWR_N,     5, 6);    //   "    "    "
! TOSH_ASSIGN_PIN(SW_SD_PWR_N,    5, 6);    //   "    "    "
  
  TOSH_ASSIGN_PIN(RADIO_SFD,       5, 0);
--- 60,65 ----
  TOSH_ASSIGN_PIN(RADIO_VREF,      5, 6);    // unused in shimmer
  TOSH_ASSIGN_PIN(SW_BT_PWR_N,     5, 6);    //   "    "    "
! TOSH_ASSIGN_PIN(SW_SD_PWR_N,     5, 6);    //   "    "    "
! TOSH_ASSIGN_PIN(DOCK_N,          2, 5);    // not used, but has to be a pull-up for sd card to work
  
  TOSH_ASSIGN_PIN(RADIO_SFD,       5, 0);
***************
*** 97,100 ****
--- 98,104 ----
  TOSH_ASSIGN_PIN(DAC1_AN, 6, 7);
  
+ #define OSRAM
+ #ifdef OSRAM
+ 
  // OSRAM OLED Calgary
  TOSH_ASSIGN_PIN(LCD_RESET_L, 6, 1);   //  aka adc_1
***************
*** 103,106 ****
--- 107,119 ----
  TOSH_ASSIGN_PIN(LCD_CMD_L,   1, 1);   //  aka bsl_tx (prog_out)
  
+ #else
+ 
+ // Kent ChLCD
+ TOSH_ASSIGN_PIN(LCD_RESET_L, 1, 1);   //  aka bsl_tx
+ TOSH_ASSIGN_PIN(LCD_CS_N,  1, 3);   //  aka ser0_rts
+ TOSH_ASSIGN_PIN(LCD_REG_ENABLE,  6, 6);   //  aka adc_2
+ TOSH_ASSIGN_PIN(LCD_BUSY, 2, 0);   //  aka gpio_external
+ 
+ #endif
  
  // UART pins
***************
*** 269,273 ****
    TOSH_CLR_ACCEL_SLEEP_N_PIN();
  
- 
    // idle expansion header pins
    TOSH_MAKE_SER0_CTS_OUTPUT();
--- 282,285 ----
***************
*** 285,289 ****
    TOSH_MAKE_RADIO_VREF_OUTPUT();
    TOSH_SEL_RADIO_VREF_IOFUNC();
- 
  }
  
--- 297,300 ----