From 136500fa756cec47339eb13963d429c7b4350146 Mon Sep 17 00:00:00 2001 From: smckown Date: Mon, 2 Nov 2009 20:43:20 +0000 Subject: [PATCH] Sync tmicore MotePlatformC with that of tmirws, and do some comment formatting. --- tos/platforms/tmicore/MotePlatformC.nc | 29 ++++++++++++++++++-------- tos/platforms/tmirws/MotePlatformC.nc | 18 +++++++++------- 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/tos/platforms/tmicore/MotePlatformC.nc b/tos/platforms/tmicore/MotePlatformC.nc index e32b255e..c298d760 100644 --- a/tos/platforms/tmicore/MotePlatformC.nc +++ b/tos/platforms/tmicore/MotePlatformC.nc @@ -44,43 +44,54 @@ implementation { WDTCTL = WDTPW + WDTHOLD; #endif - /* Port 1: 7:BQSTAT2, 6:BQSTAT1, 5:-, 4:-, 3:CP_CTS, 2:CP_RTS, 1:BSL_TX, 0:- */ + /* Port 1: 7:BQSTAT2, 6:BQSTAT1, 5:-, 4:-, 3:CP_CTS, 2:CP_RTS, + * 1:BSL_TX, 0:- + */ P1SEL = 0; /* 0 0 0 0 0 0 0 0 */ - P1OUT = 0x39; /* 0 0 1 1 1 0 0 1 */ + P1OUT = 0x31; /* 0 0 1 1 0 0 0 1 */ P1DIR = 0x08; /* 0 0 0 0 1 0 0 0 */ P1REN = 0x31; /* 0 0 1 1 0 0 0 1 */ /* Port 2: - * 7:-, 6:-, 5:BUTTONn, 4:USB_SUSPENDn, 3:-, 2:BSL_RX, 1:USBPGn, 0:SOLARPGn + * 7:-, 6:-, 5:BUTTONn, 4:USB_SUSPENDn, 3:-, 2:BSL_RX, 1:USBPGn, + * 0:SOLARPGn */ P2SEL = 0; /* 0 0 0 0 0 0 0 0 */ P2OUT = 0xc8; /* 1 1 0 0 1 0 0 0 */ P2DIR = 0x00; /* 0 0 0 0 0 0 0 0 */ P2REN = 0xc8; /* 1 1 0 0 1 0 0 0 */ - /* Port 3: 7:UC_RX, 6:UC_TX, 5:-, 4:-, 3:UC_SCK, 2:UC_SOMI, 1:UC_SIMO, 0:- */ + /* Port 3: + * 7:UC_RX, 6:UC_TX, 5:-, 4:-, 3:UC_SCK, 2:UC_SOMI, 1:UC_SIMO, 0:- + */ P3SEL = 0; /* 0 0 0 0 0 0 0 0 */ - P3OUT = 0xff; /* 1 1 1 1 1 1 1 1 */ + P3OUT = 0x3f; /* 0 0 1 1 1 1 1 1 */ P3DIR = 0x4a; /* 0 1 0 0 1 0 1 0 */ P3REN = 0xb5; /* 1 0 1 1 0 1 0 1 */ - /* Port 4: 7:-, 6:LED2n, 5:LED1n, 4:-, 3:-, 2:-, 1:-, 0:- */ + /* Port 4: + * 7:-, 6:LED2n, 5:LED1n, 4:-, 3:-, 2:-, 1:-, 0:- + */ P4SEL = 0; /* 0 0 0 0 0 0 0 0 */ P4OUT = 0xff; /* 1 1 1 1 1 1 1 1 */ P4DIR = 0x60; /* 0 1 1 0 0 0 0 0 */ P4REN = 0x9f; /* 1 0 0 1 1 1 1 1 */ - /* Port 5: 7:-, 6:-, 5:-, 4:-, 3:-, 2:-, 1:-, 0:- */ + /* Port 5: + * 7:-, 6:-, 5:-, 4:-, 3:-, 2:-, 1:-, 0:- + */ P5SEL = 0; /* 0 0 0 0 0 0 0 0 */ P5OUT = 0xff; /* 1 1 1 1 1 1 1 1 */ P5DIR = 0; /* 0 0 0 0 0 0 0 0 */ P5REN = 0xff; /* 1 1 1 1 1 1 1 1 */ - /* Port 6: 7:-, 6:-, 5:-, 4:-, 3:-, 2:-, 1:-, 0:ADC_VBATT */ + /* Port 6: + * 7:-, 6:-, 5:-, 4:-, 3:-, 2:-, 1:-, 0:ADC_VBATT + */ P6SEL = 0x01; /* 0 0 0 0 0 0 0 1 */ P6OUT = 0; /* 0 0 0 0 0 0 0 0 */ P6DIR = 0; /* 0 0 0 0 0 0 0 0 */ - P6REN = 0xff; /* 1 1 1 1 1 1 1 1 */ + P6REN = 0xfe; /* 1 1 1 1 1 1 1 0 */ P1IE = 0; P2IE = 0; diff --git a/tos/platforms/tmirws/MotePlatformC.nc b/tos/platforms/tmirws/MotePlatformC.nc index bb7829e1..9f750488 100644 --- a/tos/platforms/tmirws/MotePlatformC.nc +++ b/tos/platforms/tmirws/MotePlatformC.nc @@ -61,32 +61,34 @@ implementation { P2DIR = 0x00; /* 0 0 0 0 0 0 0 0 */ P2REN = 0x88; /* 1 0 0 0 1 0 0 0 */ - /* Port 3: 7:UC_RX, 6:UC_TX, 5:GM_RXD, 4:GM_TXD, 3:UC_SCK, 2:UC_SOMI, - * 1:UC_SIMO, 0:SHT_SCK + /* Port 3: + * 7:UC_RX, 6:UC_TX, 5:GM_RXD, 4:GM_TXD, 3:UC_SCK, 2:UC_SOMI, 1:UC_SIMO, + * 0:SHT_SCK */ P3SEL = 0; /* 0 0 0 0 0 0 0 0 */ P3OUT = 0x3f; /* 0 0 1 1 1 1 1 1 */ P3DIR = 0x4b; /* 0 1 0 0 1 0 1 1 */ P3REN = 0xb4; /* 1 0 1 1 0 1 0 0 */ - /* Port 4: 7:GM_RTS, 6:LED2n, 5:LED1n, 4:FLH_CSn, 3:SCP_CSn, 2:SCP_PD, - * 1:GM_ONn, 0:GM_VGM_EN + /* Port 4: + * 7:GM_RTS, 6:LED2n, 5:LED1n, 4:FLH_CSn, 3:SCP_CSn, 2:SCP_PD, 1:GM_ONn, + * 0:GM_VGM_EN */ P4SEL = 0; /* 0 0 0 0 0 0 0 0 */ P4OUT = 0xfe; /* 1 1 1 1 1 1 1 0 */ P4DIR = 0x7c; /* 0 1 1 1 1 1 0 0 */ P4REN = 0x83; /* 1 0 0 0 0 0 1 1 */ - /* Port 5: 7:W315, 6:W270, 5:W225, 4:W180, 3:W135, 2:W090, 1:W045, - * 0:W000 + /* Port 5: + * 7:W315, 6:W270, 5:W225, 4:W180, 3:W135, 2:W090, 1:W045, 0:W000 */ P5SEL = 0; /* 0 0 0 0 0 0 0 0 */ P5OUT = 0; /* 0 0 0 0 0 0 0 0 */ P5DIR = 0; /* 0 0 0 0 0 0 0 0 */ P5REN = 0; /* 0 0 0 0 0 0 0 0 */ - /* Port 6: 7:TEMP_PWR, 6:TEMP3, 5:TEMP2, 4:TEMP1, 3:PHOTO, 2:-, 1:-, - * 0:ADC_VBATT + /* Port 6: + * 7:TEMP_PWR, 6:TEMP3, 5:TEMP2, 4:TEMP1, 3:PHOTO, 2:-, 1:-, 0:ADC_VBATT */ P6SEL = 0x79; /* 0 1 1 1 1 0 0 1 */ P6OUT = 0; /* 0 0 0 0 0 0 0 0 */ -- 2.39.2