[Tinyos-beta-commits] CVS: tinyos-1.x/beta/platform/pxa27x PXA27XHPLDMAM.nc, 1.1, 1.2 PXA27XHPLDMA.nc, 1.1, 1.2 PXA27XDMAM.nc, 1.2, 1.3 PXA27XDMAChannel.nc, 1.2, 1.3

Robbie Adler radler at users.sourceforge.net
Tue Sep 6 10:49:11 PDT 2005 

Update of /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19520

Modified Files:
	PXA27XHPLDMAM.nc PXA27XHPLDMA.nc PXA27XDMAM.nc 
	PXA27XDMAChannel.nc 
Log Message:
parameterized high-level run command and added async declarations to HPL functions

Index: PXA27XHPLDMAM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x/PXA27XHPLDMAM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PXA27XHPLDMAM.nc	18 Aug 2005 23:07:13 -0000	1.1
--- PXA27XHPLDMAM.nc	6 Sep 2005 17:49:09 -0000	1.2
***************
*** 55,59 ****
  {
  
!   command void PXA27XHPLDMA.setByteAlignment(uint32_t channel, bool enable) 
    {
      if (channel < 32) {
--- 55,59 ----
  {
  
!   async command void PXA27XHPLDMA.setByteAlignment(uint32_t channel, bool enable) 
    {
      if (channel < 32) {
***************
*** 68,72 ****
    }
  
!   command void PXA27XHPLDMA.mapChannel(uint32_t channel,uint16_t peripheralID){
      if(channel < 32){
        DRCMR(peripheralID) = DRCMR_CHLNUM(channel) | DRCMR_MAPVLD;
--- 68,72 ----
    }
  
!   async command void PXA27XHPLDMA.mapChannel(uint32_t channel,uint16_t peripheralID){
      if(channel < 32){
        DRCMR(peripheralID) = DRCMR_CHLNUM(channel) | DRCMR_MAPVLD;
***************
*** 74,78 ****
      return;
    }
!   command void PXA27XHPLDMA.unmapChannel(uint32_t channel){
      if(channel < 32){
        DRCMR(channel) = 0;
--- 74,78 ----
      return;
    }
!   async command void PXA27XHPLDMA.unmapChannel(uint32_t channel){
      if(channel < 32){
        DRCMR(channel) = 0;
***************
*** 80,84 ****
    }
    
!   command void PXA27XHPLDMA.setDCSR(uint32_t channel,uint32_t val) {
      if (channel < 32) {
        DCSR(channel) = val;
--- 80,84 ----
    }
    
!   async command void PXA27XHPLDMA.setDCSR(uint32_t channel,uint32_t val) {
      if (channel < 32) {
        DCSR(channel) = val;
***************
*** 87,91 ****
    }
  
!   command uint32_t PXA27XHPLDMA.getDCSR(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
--- 87,91 ----
    }
  
!   async command uint32_t PXA27XHPLDMA.getDCSR(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
***************
*** 95,99 ****
    }
  
!   command void PXA27XHPLDMA.setDCMD(uint32_t channel, uint32_t val) {
      if (channel < 32) {
        DCMD(channel) = val;
--- 95,99 ----
    }
  
!   async command void PXA27XHPLDMA.setDCMD(uint32_t channel, uint32_t val) {
      if (channel < 32) {
        DCMD(channel) = val;
***************
*** 102,106 ****
    }
  
!   command uint32_t PXA27XHPLDMA.getDCMD(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
--- 102,106 ----
    }
  
!   async command uint32_t PXA27XHPLDMA.getDCMD(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
***************
*** 110,114 ****
    }
  
!   command void PXA27XHPLDMA.setDDADR(uint32_t channel ,uint32_t val) {
      if (channel < 32) {
        DDADR(channel) = val;
--- 110,114 ----
    }
  
!   async command void PXA27XHPLDMA.setDDADR(uint32_t channel ,uint32_t val) {
      if (channel < 32) {
        DDADR(channel) = val;
***************
*** 117,121 ****
    }
  
!   command uint32_t PXA27XHPLDMA.getDDADR(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
--- 117,121 ----
    }
  
!   async command uint32_t PXA27XHPLDMA.getDDADR(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
***************
*** 125,129 ****
    }
  
!   command void PXA27XHPLDMA.setDSADR(uint32_t channel, uint32_t val){
      if (channel < 32) {
        DSADR(channel) = val;
--- 125,129 ----
    }
  
!   async command void PXA27XHPLDMA.setDSADR(uint32_t channel, uint32_t val){
      if (channel < 32) {
        DSADR(channel) = val;
***************
*** 132,136 ****
    }
  
!   command uint32_t PXA27XHPLDMA.getDSADR(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
--- 132,136 ----
    }
  
!   async command uint32_t PXA27XHPLDMA.getDSADR(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
***************
*** 140,144 ****
    }
  
!   command void PXA27XHPLDMA.setDTADR(uint32_t channel, uint32_t val) {
      if (channel < 32) {
        DTADR(channel) = val;
--- 140,144 ----
    }
  
!   async command void PXA27XHPLDMA.setDTADR(uint32_t channel, uint32_t val) {
      if (channel < 32) {
        DTADR(channel) = val;
***************
*** 147,151 ****
    }
  
!   command uint32_t PXA27XHPLDMA.getDTADR(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
--- 147,151 ----
    }
  
!   async command uint32_t PXA27XHPLDMA.getDTADR(uint32_t channel) {
      uint32_t val;
      if (channel < 32) {
***************
*** 157,161 ****
  #if 0
    //we don't expose any of the external DMA pins, so no sense in exposing this.  However, there's also no sense in deleting it...
!   command uint8_t PXA27XDMAExtReq.getDREQPend[uint8_t pin]() 
    {
      uint8_t val;
--- 157,161 ----
  #if 0
    //we don't expose any of the external DMA pins, so no sense in exposing this.  However, there's also no sense in deleting it...
!   async command uint8_t PXA27XDMAExtReq.getDREQPend[uint8_t pin]() 
    {
      uint8_t val;
***************
*** 166,170 ****
    }
  
!   command void PXA27XDMAExtReq.clearDREQPend[uint8_t pin]()
    {
      if (pin < 3) {
--- 166,170 ----
    }
  
!   async command void PXA27XDMAExtReq.clearDREQPend[uint8_t pin]()
    {
      if (pin < 3) {
***************
*** 175,184 ****
  #endif
  
!   command uint32_t PXA27XHPLDMA.getDPCSR()
    {
      return DPCSR;
    }
  
!   command void PXA27XHPLDMA.setDPCSR(uint32_t val)
    {
      DPCSR = val;
--- 175,184 ----
  #endif
  
!   async command uint32_t PXA27XHPLDMA.getDPCSR()
    {
      return DPCSR;
    }
  
!   async command void PXA27XHPLDMA.setDPCSR(uint32_t val)
    {
      DPCSR = val;

Index: PXA27XHPLDMA.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x/PXA27XHPLDMA.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PXA27XHPLDMA.nc	18 Aug 2005 23:07:13 -0000	1.1
--- PXA27XHPLDMA.nc	6 Sep 2005 17:49:09 -0000	1.2
***************
*** 48,66 ****
  interface PXA27XHPLDMA
  {
!   command void setByteAlignment(uint32_t channel,bool enable);
!   command void mapChannel(uint32_t channel,uint16_t peripheralID);
!   command void unmapChannel(uint32_t channel);
!   command void setDCSR(uint32_t channel, uint32_t val);
!   command uint32_t getDCSR(uint32_t channel);
!   command void setDCMD(uint32_t channel, uint32_t val);
!   command uint32_t getDCMD(uint32_t channel);
!   command void setDDADR(uint32_t channel, uint32_t val);
!   command uint32_t getDDADR(uint32_t channel);
!   command void setDSADR(uint32_t channel, uint32_t val);
!   command uint32_t getDSADR(uint32_t channel);
!   command void setDTADR(uint32_t channel, uint32_t val);
!   command uint32_t getDTADR(uint32_t channel);
!   command void setDPCSR(uint32_t val);
!   command uint32_t getDPCSR();
    
  }
--- 48,66 ----
  interface PXA27XHPLDMA
  {
!   async command void setByteAlignment(uint32_t channel,bool enable);
!   async command void mapChannel(uint32_t channel,uint16_t peripheralID);
!   async command void unmapChannel(uint32_t channel);
!   async command void setDCSR(uint32_t channel, uint32_t val);
!   async command uint32_t getDCSR(uint32_t channel);
!   async command void setDCMD(uint32_t channel, uint32_t val);
!   async command uint32_t getDCMD(uint32_t channel);
!   async command void setDDADR(uint32_t channel, uint32_t val);
!   async command uint32_t getDDADR(uint32_t channel);
!   async command void setDSADR(uint32_t channel, uint32_t val);
!   async command uint32_t getDSADR(uint32_t channel);
!   async command void setDTADR(uint32_t channel, uint32_t val);
!   async command uint32_t getDTADR(uint32_t channel);
!   async command void setDPCSR(uint32_t val);
!   async command uint32_t getDPCSR();
    
  }

Index: PXA27XDMAM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x/PXA27XDMAM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PXA27XDMAM.nc	18 Aug 2005 23:07:13 -0000	1.2
--- PXA27XDMAM.nc	6 Sep 2005 17:49:09 -0000	1.3
***************
*** 314,318 ****
      return FAIL;
    }
!   command result_t PXA27XDMAChannel.run[uint8_t channel](){
      uint8_t realChannel;
      uint32_t width;
--- 314,318 ----
      return FAIL;
    }
!   command result_t PXA27XDMAChannel.run[uint8_t channel](bool InterruptEn){
      uint8_t realChannel;
      uint32_t width;
***************
*** 328,332 ****
--- 328,343 ----
        
        call PXA27XHPLDMA.setDCSR(realChannel, DCSR_NODESCFETCH);
+       
+ #if 0
+       if(InterruptEn){
+ 	call PXA27XHPLDMA.setDCMD(realChannel, mDescriptorArray[channel].DCMD | DCMD_ENDIRQEN);
+       }
+       else{
+ 	call PXA27XHPLDMA.setDCMD(realChannel, mDescriptorArray[channel].DCMD);
+       }
+ #else
        call PXA27XHPLDMA.setDCMD(realChannel, mDescriptorArray[channel].DCMD | DCMD_ENDIRQEN);
+ #endif
+       
        call PXA27XHPLDMA.setDSADR(realChannel, mDescriptorArray[channel].DSADR);
        call PXA27XHPLDMA.setDTADR(realChannel, mDescriptorArray[channel].DTADR);

Index: PXA27XDMAChannel.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/platform/pxa27x/PXA27XDMAChannel.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PXA27XDMAChannel.nc	18 Aug 2005 23:07:13 -0000	1.2
--- PXA27XDMAChannel.nc	6 Sep 2005 17:49:09 -0000	1.3
***************
*** 69,73 ****
    command result_t setTransferLength(uint16_t length);
    command result_t setTransferWidth(DMATransferWidth_t width);
!   command result_t run();
    command result_t stop();
    async event void Interrupt();
--- 69,73 ----
    command result_t setTransferLength(uint16_t length);
    command result_t setTransferWidth(DMATransferWidth_t width);
!   command result_t run(bool InterruptEn);
    command result_t stop();
    async event void Interrupt();

More information about the Tinyos-beta-commits mailing list