X-Git-Url: https://oss.titaniummirror.com/gitweb/?a=blobdiff_plain;f=tos%2Fchips%2Fmsp430%2Fusci%2FHplMsp430UsciInt.nc;h=2c93c62ba39e7645b6c29dfa99674b260e8c082a;hb=be862ab07d080085823951d18dcb27a28a310ace;hp=6b73960ec708c493a9524f13aa27f9e9782401de;hpb=9b58ecb229fe2466638908e2e3c28f66f0439116;p=tinyos-2.x.git diff --git a/tos/chips/msp430/usci/HplMsp430UsciInt.nc b/tos/chips/msp430/usci/HplMsp430UsciInt.nc index 6b73960e..2c93c62b 100644 --- a/tos/chips/msp430/usci/HplMsp430UsciInt.nc +++ b/tos/chips/msp430/usci/HplMsp430UsciInt.nc @@ -10,7 +10,7 @@ * - Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * - Neither the name of the Technische Universität Berlin nor the names + * - Neither the name of the Titanium Mirror, Inc. nor the names * of its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -26,17 +26,17 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + /** * Interrupt interface for USCI peripherals. Although A and B devices have * different interrupt sets since B only support I2C, we use a single set for * both so that upper layers need not deal with the different sets. This is * critical in the case of SPI communications, which is supported by both A * and B devices. - * + * * @author R. Steve McKown */ - + #include "Msp430Usci.h" interface HplMsp430UsciInt { @@ -74,7 +74,7 @@ interface HplMsp430UsciInt { * I2C mode only. Indicates the device was expecting an ACK and it was not * received. */ - async event void i2cNak(); + async event void i2cNack(); /** * I2C mode only. Indicates the device has detected a start condition