[Tinyos-2-commits] CVS: tinyos-2.x/tos/platforms/mica2/chips/cc1000 HplCC1000C.nc, 1.1.2.3, 1.1.2.4

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica2/chips/cc1000
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16767/chips/cc1000

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	HplCC1000C.nc 
Log Message:
head merge


Index: HplCC1000C.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/platforms/mica2/chips/cc1000/HplCC1000C.nc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** HplCC1000C.nc	27 Jan 2006 22:04:28 -0000	1.1.2.3
--- HplCC1000C.nc	22 Sep 2006 19:22:20 -0000	1.1.2.4
***************
*** 35,39 ****
  configuration HplCC1000C {
    provides {
!     interface Read<uint16_t> as RssiAdc;
      interface HplCC1000Spi;
      interface HplCC1000;
--- 35,40 ----
  configuration HplCC1000C {
    provides {
!     interface ReadNow<uint16_t> as RssiAdc;
!     interface Resource as RssiResource;
      interface HplCC1000Spi;
      interface HplCC1000;
***************
*** 42,50 ****
  implementation {
    components HplCC1000P, HplCC1000SpiP;
!   components new AdcReadClientC() as RssiChannel;
  
    HplCC1000 = HplCC1000P;
    HplCC1000Spi = HplCC1000SpiP;
    RssiAdc = RssiChannel;
  
    RssiChannel.Atm128AdcConfig -> HplCC1000P;
--- 43,52 ----
  implementation {
    components HplCC1000P, HplCC1000SpiP;
!   components new AdcReadNowClientC() as RssiChannel;
  
    HplCC1000 = HplCC1000P;
    HplCC1000Spi = HplCC1000SpiP;
    RssiAdc = RssiChannel;
+   RssiResource = RssiChannel;
  
    RssiChannel.Atm128AdcConfig -> HplCC1000P;