X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FHplMsp430UsciReg.nc;h=3f4536c81ed06622bec8964db7e0a85eda37b27e;hb=9b58ecb229fe2466638908e2e3c28f66f0439116;hp=1d3384854eca679b8f01e96db6a9dae7ca2a526d;hpb=eaf09b7f1f9b7501d842707cc3d290cdd8d3bb98;p=tinyos-2.x.git

diff --git a/tos/chips/msp430/usci/HplMsp430UsciReg.nc b/tos/chips/msp430/usci/HplMsp430UsciReg.nc
index 1d338485..3f4536c8 100644
--- a/tos/chips/msp430/usci/HplMsp430UsciReg.nc
+++ b/tos/chips/msp430/usci/HplMsp430UsciReg.nc
@@ -39,7 +39,7 @@ interface HplMsp430UsciReg {
   /**
    * Return the current mode.
    */
-  command msp430usci_mode_t getMode();
+  command msp430_usci_mode_t getMode();
 
   /**
    * Prepare to set the mode.  If the device supports the requested mode, its
@@ -57,7 +57,7 @@ interface HplMsp430UsciReg {
    *
    * @return The pointer to the device's UCxxCTL0 register.
    */
-  command uint8_t* ptrCtl0();
+  command volatile uint8_t* ptrCtl0();
 
   /**
    * Get bits from the UCxxCTL0 register associated with the USCI device.
@@ -96,7 +96,7 @@ interface HplMsp430UsciReg {
    * Manipulate bits in the UCxxCTL1 register.  See the methods that manipulate
    * UCxxCTL0 for more information.
    */
-  command uint8_t* ptrCtl1(uint8_t mask);
+  command volatile uint8_t* ptrCtl1();
   command uint8_t getCtl1(uint8_t mask);
   command void setCtl1(uint8_t mask);
   command void clrCtl1(uint8_t mask);
@@ -106,7 +106,7 @@ interface HplMsp430UsciReg {
    * Manipulate bits in the UCxxBR0 register.  See the methods that manipulate
    * UCxxCTL0 for more information.
    */
-  command uint8_t* ptrBr0(uint8_t mask);
+  command volatile uint8_t* ptrBr0();
   command uint8_t getBr0(uint8_t mask);
   command void setBr0(uint8_t mask);
   command void clrBr0(uint8_t mask);
@@ -116,7 +116,7 @@ interface HplMsp430UsciReg {
    * Manipulate bits in the UCxxBR1 register.  See the methods that manipulate
    * UCxxCTL0 for more information.
    */
-  command uint8_t* ptrBr1(uint8_t mask);
+  command volatile uint8_t* ptrBr1();
   command uint8_t getBr1(uint8_t mask);
   command void setBr1(uint8_t mask);
   command void clrBr1(uint8_t mask);
@@ -127,7 +127,7 @@ interface HplMsp430UsciReg {
    * UCxxCTL0 for more information.  These methods perform no operation on
    * providers implementing a USCI_Bx device.
    */
-  command uint8_t* ptrMctl(uint8_t mask);
+  command volatile uint8_t* ptrMctl();
   command uint8_t getMctl(uint8_t mask);
   command void setMctl(uint8_t mask);
   command void clrMctl(uint8_t mask);
@@ -138,7 +138,7 @@ interface HplMsp430UsciReg {
    * manipulate UCxxCTL0 for more information.  These methods perform no
    * operation on providers implementing a USCI_Ax device.
    */
-  command uint8_t* ptrI2Cie(uint8_t mask);
+  command volatile uint8_t* ptrI2Cie();
   command uint8_t getI2Cie(uint8_t mask);
   command void setI2Cie(uint8_t mask);
   command void clrI2Cie(uint8_t mask);
@@ -148,7 +148,7 @@ interface HplMsp430UsciReg {
    * Manipulate bits in the UCxxSTAT register.  See the methods that manipulate
    * UCxxCTL0 for more information.
    */
-  command uint8_t* ptrStat(uint8_t mask);
+  command volatile uint8_t* ptrStat();
   command uint8_t getStat(uint8_t mask);
   command void setStat(uint8_t mask);
   command void clrStat(uint8_t mask);
@@ -157,7 +157,7 @@ interface HplMsp430UsciReg {
   /**
    * Return pointer to the UCAxxRXBUF register used by the USCI device.
    */
-  command uint8_t* ptrRxbuf();
+  command volatile uint8_t* ptrRxbuf();
 
   /**
    * Read the contents of the UCAxxRXBUF register.  This register cannot be
@@ -168,7 +168,7 @@ interface HplMsp430UsciReg {
   /**
    * Return pointer to the UCAxxTXBUF register used by the USCI device.
    */
-  command uint8_t* ptrTxbuf();
+  command volatile uint8_t* ptrTxbuf();
 
   /**
    * Read the contents of the UCAxxTXBUF register.
@@ -185,7 +185,7 @@ interface HplMsp430UsciReg {
    * manipulate UCxxCTL0 for more information.  These methods perform no
    * operation on providers implementing a USCI_Bx device.
    */
-  command uint8_t* ptrAbctl(uint8_t mask);
+  command volatile uint8_t* ptrAbctl();
   command uint8_t getAbctl(uint8_t mask);
   command void setAbctl(uint8_t mask);
   command void clrAbctl(uint8_t mask);
@@ -196,7 +196,7 @@ interface HplMsp430UsciReg {
    * manipulate UCxxCTL0 for more information.  These methods perform no
    * operation on providers implementing a USCI_Bx device.
    */
-  command uint8_t* ptrIrtctl(uint8_t mask);
+  command volatile uint8_t* ptrIrtctl();
   command uint8_t getIrtctl(uint8_t mask);
   command void setIrtctl(uint8_t mask);
   command void clrIrtctl(uint8_t mask);
@@ -207,7 +207,7 @@ interface HplMsp430UsciReg {
    * manipulate UCxxCTL0 for more information.  These methods perform no
    * operation on providers implementing a USCI_Bx device.
    */
-  command uint8_t* ptrIrrctl(uint8_t mask);
+  command volatile uint8_t* ptrIrrctl();
   command uint8_t getIrrctl(uint8_t mask);
   command void setIrrctl(uint8_t mask);
   command void clrIrrctl(uint8_t mask);
@@ -218,7 +218,7 @@ interface HplMsp430UsciReg {
    * manipulate UCxxCTL0 for more information.  These methods perform no
    * operation on providers implementing a USCI_Ax device.
    */
-  command uint8_t* ptrI2Coa(uint8_t mask);
+  command volatile uint8_t* ptrI2Coa();
   command uint8_t getI2Coa(uint8_t mask);
   command void setI2Coa(uint8_t mask);
   command void clrI2Coa(uint8_t mask);
@@ -229,7 +229,7 @@ interface HplMsp430UsciReg {
    * manipulate UCxxCTL0 for more information.  These methods perform no
    * operation on providers implementing a USCI_Ax device.
    */
-  command uint8_t* ptrI2Csa(uint8_t mask);
+  command volatile uint8_t* ptrI2Csa();
   command uint8_t getI2Csa(uint8_t mask);
   command void setI2Csa(uint8_t mask);
   command void clrI2Csa(uint8_t mask);
@@ -239,19 +239,22 @@ interface HplMsp430UsciReg {
    * Manipulate bits in the UCxxIE register.  See the methods that manipulate
    * UCxxCTL0 for more information.
    */
-  command uint8_t* ptrIe(uint8_t mask);
-  command uint8_t getIe(uint8_t mask);
-  command void setIe(uint8_t mask);
-  command void clrIe(uint8_t mask);
-  command void assignIe(uint8_t mask, uint8_t value);
+  command bool getIeRx();
+  command void setIeRx();
+  command void clrIeRx();
+  command bool getIeTx();
+  command void setIeTx();
+  command void clrIeTx();
 
   /**
    * Manipulate bits in the UCxxIFG register.  See the methods that manipulate
    * UCxxCTL0 for more information.
    */
-  command uint8_t* ptrIfg(uint8_t mask);
-  command uint8_t getIfg(uint8_t mask);
-  command void setIfg(uint8_t mask);
-  command void clrIfg(uint8_t mask);
-  command void assignIfg(uint8_t mask, uint8_t value);
+  command bool getIfgRx();
+  command void setIfgRx();
+  command void clrIfgRx();
+  command bool getIfgTx();
+  command void setIfgTx();
+  command void clrIfgTx();
+
 }