From 828439c9223e5ddc379d714d516c73f11415eda1 Mon Sep 17 00:00:00 2001 From: nvt-se Date: Mon, 29 Jun 2009 12:46:49 +0000 Subject: [PATCH] code style compliancy --- .../msb430/buildscripts/jtag/pyjtag/elf.pyc | Bin 8579 -> 9708 bytes platform/msb430/dev/dma.c | 27 +++--- platform/msb430/dev/infomem.c | 25 ++--- platform/msb430/dev/msb430-uart1.c | 88 +++++++++--------- platform/msb430/dev/msb430-uart1.h | 14 +-- platform/msb430/dev/rs232.c | 8 +- platform/msb430/dev/rs232.h | 4 +- platform/msb430/msb430-slip-arch.c | 4 +- 8 files changed, 85 insertions(+), 85 deletions(-) diff --git a/platform/msb430/buildscripts/jtag/pyjtag/elf.pyc b/platform/msb430/buildscripts/jtag/pyjtag/elf.pyc index a40951d8a6aa1fa9168c9dfb5abc65b86ee00fd4..10662cddbe57243d227d75f3ecac8a6bad2f77ee 100644 GIT binary patch literal 9708 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 delta 3653 zcma)9O>87r5w6!W)AQq*@z|apkALFv+Fm!=#qr-7;t*nI?OiVclk^Y_yK80>&)8|l z_SiGMix2h=;79}^A+26GfdX8(AR(dUl9gD95aEJ^#DxnNg2X8jQ4Zt=)K@)!ST@4) zD_7O4uBumm@A-olPOjE=KZ-?Sk4~;_Q2ocpe;0UFFDRlS(d$Gv8BtVHw5h0Q&>KW2 zL|?sWP|-)5yytJSd{hhw%WSgzR169$)MN#yWKuCq+XfAm-yv0u(Djv409tPbsT3q9 zM5QnlJ0ARKXg*3OioT_2Pm$uS>np_=72}k=zH*or*(fcochJokm14Ym@Gh;@B_4d( zANhNe(p{=Q(V^C$hmV!FI{A=#QCV@9%__3<79W^a^*uFdxXbz{BPrkX#G!tWo75kv zE6ROn85N~}?3>oBDYK7{eneD=A_hR%DG!P34}8zWpxpH%jHR7TeaZi`Njt!l#mfUW z;_QYP6bjCs;}!}WWvWIP5PNvTr@t5&jj&2ZCkEY)=%-T8>PLZzSG(6GF-IWt|zzgDccI8#;kn^w(^Giu{=%K!#{>|T((+MR-i%}RMU?^c|> ztqrECI0@X^fI6%gudBSOcNuVTa0nbljv)wFfuFX+RE~3~8?4Useg~5hBqu;=-4mP( z;ImG>68y87U_Ev~=Rz5?3ur?3nwJ(@KHELal?m3f#7 zKdEMtP@4tlXV5ydV3H0S$9#@gb(%p`k^V+kQvWd$)$!4Y{##^Hx!N*T^zDxKxDGCd z>KTvdFGrWn4*rA>@WW_nPR`QJ^tt}paOO>3RiqD*eb&%Nv0N+RAx`)dCp@D68XFl! zxa|}`8UU$lOZ1DJXuDVcs`KI%`)S_#-}#joe2>K%K~nm0d{8Ox7zJk$e}IrQh@^?=k-D2`~OdJrdXO= zl?M|8FF9AegglIPf4b3`Pw2OLrc6{hC*!@I-;ABnb`t%^P}Qhw{b4dUB+bU9$wnNr zUdTLq@XH+-*N-+rW z(t4GSxe-|^AlwA>70vol-63*v;3PAA5byX+-te)XnBdub%-;sc8KEP84blqKD3z0* z>;2@6K>#}kBMM7~E&OG7FN%53$(RTo-fKA71A1w_^xsZ)gWGa)oE!@rI9Y3W*Rxmsby3U=UgLz}^aItB6PE3n?kWEt7@$}Eq z&@mUIucejKl7;3uI{2lrRt)NYX1+V|DHQp+Ltz=yA7gRT*(sG@-PUjSX7r=p1;c(> zf82X7EAyjT+Hjrn-rn6^8|`J!Gth~?bkG}=Gx~mZU>;3kXBfyQe4o|7676-|#-(A) zl)&J#Vc5>;ce0~3X?lz~7p+)zU#Yk@M!Xe>NmTfis-r&BlyD30#WdTP4l%Wly;-(<1o9#3<3yXLH?hpmZ&8PD6^ z{6U20PK4GxSMqWRuA+d*N)ivuR%j(+_7&ba9o|{+r0AqLrNgACkt2B?*b~5{yvKme z07&uAG1itE(b7y!P7>t3GIm(7i?i$1j1eJI{Whc@42?~rZk}l*sgab0@~9V*pcGO_ zQc^FZaJ`WJH8gc=)e<+PBu>@!x!#{uPH_BmIlY@pdF8~jUH>IF{yZnL@vy_}^2<;Q z5Vw;5*n15I`78-J3)7sbFm)eXru+O)1V8>7kBhD08@0OM;hJ?r-0J^3t7iK$d0bK_u=wDoTL*3SM zBO~iyV}^@5SpNLArNu8TPJbc)ygVZ8J&2Y8Dga2WT?IJzjd`7S-{w{QECYVV82X!C zJvuR3^Pa#d{g2U1O@`AH^gvvEl?lPaS4>Jg%KN1~FHXl0lE|RoJO|*96$B~Dz5|R` oU8Bf}0bC%b((QI4IM3mYRzY=X&$F!QdosmtnKfA0H;eYxBvhE diff --git a/platform/msb430/dev/dma.c b/platform/msb430/dev/dma.c index 73af75e4d..4d47eaf70 100644 --- a/platform/msb430/dev/dma.c +++ b/platform/msb430/dev/dma.c @@ -48,35 +48,35 @@ static void (*callbacks[DMA_LINES])(void); interrupt(DACDMA_VECTOR) irq_dacdma(void) { - if (DMA0CTL & DMAIFG) { + if(DMA0CTL & DMAIFG) { DMA0CTL &= ~(DMAIFG | DMAIE); - if (callbacks[0] != NULL) { + if(callbacks[0] != NULL) { callbacks[0](); } LPM_AWAKE(); } - if (DMA1CTL & DMAIFG) { + if(DMA1CTL & DMAIFG) { DMA1CTL &= ~(DMAIFG | DMAIE); - if (callbacks[1] != NULL) { + if(callbacks[1] != NULL) { callbacks[1](); } LPM_AWAKE(); } - if (DMA2CTL & DMAIFG) { + if(DMA2CTL & DMAIFG) { DMA2CTL &= ~(DMAIFG | DMAIE); - if (callbacks[2] != NULL) { + if(callbacks[2] != NULL) { callbacks[2](); } LPM_AWAKE(); } - if (DAC12_0CTL & DAC12IFG) { + if(DAC12_0CTL & DAC12IFG) { DAC12_0CTL &= ~(DAC12IFG | DAC12IE); } - if (DAC12_1CTL & DAC12IFG) { + if(DAC12_1CTL & DAC12IFG) { DAC12_1CTL &= ~(DAC12IFG | DAC12IE); } } @@ -84,8 +84,9 @@ interrupt(DACDMA_VECTOR) irq_dacdma(void) int dma_subscribe(int line, void (*callback)(void)) { - if (line >= DMA_LINES) + if(line >= DMA_LINES) { return -1; + } callbacks[line] = callback; return 0; @@ -94,10 +95,10 @@ dma_subscribe(int line, void (*callback)(void)) void dma_transfer(unsigned char *dst, unsigned char *src, unsigned len) { - // Configure DMA Channel 0 for UART0 TXIFG. + /* Configure DMA Channel 0 for UART0 TXIFG. */ DMACTL0 = DMA0TSEL_4; - // No DMAONFETCH, ROUNDROBIN, ENNMI. + /* No DMAONFETCH, ROUNDROBIN, ENNMI. */ DMACTL1 = 0x0000; /* @@ -116,6 +117,6 @@ dma_transfer(unsigned char *dst, unsigned char *src, unsigned len) DMA0DA = (unsigned) dst; DMA0SZ = len; - DMA0CTL |= DMAEN | DMAIE; // enable DMA and interrupts - U0CTL &= ~SWRST; // enable UART state machine, starts transfer + DMA0CTL |= DMAEN | DMAIE; /* enable DMA and interrupts */ + U0CTL &= ~SWRST; /* enable the UART state machine */ } diff --git a/platform/msb430/dev/infomem.c b/platform/msb430/dev/infomem.c index b5786fd9d..93160b437 100644 --- a/platform/msb430/dev/infomem.c +++ b/platform/msb430/dev/infomem.c @@ -60,7 +60,7 @@ Berlin, 2007 void infomem_read(void *buffer, unsigned int offset, unsigned char size) { - uint8_t *address = (uint8_t *) INFOMEM_START + offset; + uint8_t *address = (uint8_t *)INFOMEM_START + offset; memcpy(buffer, address, size); } @@ -76,21 +76,22 @@ infomem_write(unsigned int offset, unsigned char count, ...) uint8_t *data; int s; - if (offset > (2 * INFOMEM_BLOCK_SIZE)) + if(offset > (2 * INFOMEM_BLOCK_SIZE)) { return FALSE; + } - flash = (uint8_t *) INFOMEM_START + offset; + flash = (uint8_t *)INFOMEM_START + offset; s = splhigh(); - // backup into RAM + /* backup into RAM */ memcpy(backup, flash, INFOMEM_BLOCK_SIZE); - // merge backup with new data + /* merge backup with new data */ va_start(argp, count); - buffer = (uint8_t *) backup; - for (i = 0; i < count; i++) { + buffer = (uint8_t *)backup; + for(i = 0; i < count; i++) { data = va_arg(argp, uint8_t*); size = va_arg(argp, uint16_t); memcpy(buffer, data, size); @@ -99,18 +100,18 @@ infomem_write(unsigned int offset, unsigned char count, ...) va_end(argp); - // init flash access + /* init flash access */ FCTL2 = FWKEY + FSSEL1 + FN2; FCTL3 = FWKEY; - // erase flash + /* erase flash */ FCTL1 = FWKEY + ERASE; *flash = 0; - // write flash + /* write flash */ FCTL1 = FWKEY + WRT; - buffer = (uint8_t *) backup; - for (i = 0; i < INFOMEM_BLOCK_SIZE; i++) { + buffer = (uint8_t *)backup; + for(i = 0; i < INFOMEM_BLOCK_SIZE; i++) { *flash++ = *buffer++; } diff --git a/platform/msb430/dev/msb430-uart1.c b/platform/msb430/dev/msb430-uart1.c index e97c9ffd4..106772091 100644 --- a/platform/msb430/dev/msb430-uart1.c +++ b/platform/msb430/dev/msb430-uart1.c @@ -69,73 +69,71 @@ volatile uint8_t uart_edge = 0; static unsigned char uart_speed_br0[UART_NUM_MODES]; static unsigned char uart_speed_br1[UART_NUM_MODES]; static unsigned char uart_speed_bmn[UART_NUM_MODES]; -static fp_uart_handler uart_handler[UART_NUM_MODES] = {NULL, NULL}; +static uart_handler_t uart_handler[UART_NUM_MODES] = {NULL, NULL}; /*---------------------------------------------------------------------------*/ static void uart_configure(unsigned mode) { - _DINT(); // disable interrupts + _DINT(); /* disable interrupts */ - UART_WAIT_TXDONE(); // wait till all buffered data has been transmitted + UART_WAIT_TXDONE(); /* wait till all buffered data has been transmitted */ - // configure if(mode == UART_MODE_RS232) { P5OUT |= 0x01; - // unselect SPI + /* unselect SPI */ P3SEL |= 0xC0; - // select rs232 - // to RS232 mode - UCTL1 = SWRST | CHAR; // 8-bit character - UTCTL1 |= SSEL1; // UCLK = MCLK - // activate - U1ME |= UTXE1 | URXE1; // Enable USART1 TXD/RXD + /* select rs232 */ + UCTL1 = SWRST | CHAR; /* 8-bit character */ + UTCTL1 |= SSEL1; /* UCLK = MCLK */ + /* activate */ + U1ME |= UTXE1 | URXE1; /* Enable USART1 TXD/RXD */ } else if(mode == UART_MODE_SPI) { - P3SEL &= ~0xC0; // unselect RS232 + P3SEL &= ~0xC0; /* unselect RS232 */ // to SPI mode - UCTL1 = SWRST | CHAR | SYNC | MM; // 8-bit SPI Master + UCTL1 = SWRST | CHAR | SYNC | MM; /* 8-bit SPI Master */ /* * SMCLK, 3-pin mode, clock idle low, data valid on * rising edge, UCLK delayed */ - UTCTL1 |= CKPH | SSEL1 | SSEL0 | STC; // activate - U1ME |= USPIE1; // Enable USART1 SPI + UTCTL1 |= CKPH | SSEL1 | SSEL0 | STC; /* activate */ + U1ME |= USPIE1; /* Enable USART1 SPI */ } - // restore speed settings - UBR01 = uart_speed_br0[mode]; // set baudrate + /* restore speed settings */ + UBR01 = uart_speed_br0[mode]; /* set baudrate */ UBR11 = uart_speed_br1[mode]; - UMCTL1 = uart_speed_bmn[mode]; // set modulation + UMCTL1 = uart_speed_bmn[mode]; /* set modulation */ - UCTL1 &= ~SWRST; // clear reset flag - _EINT(); // enable interrupts + UCTL1 &= ~SWRST; /* clear reset flag */ + _EINT(); /* enable interrupts */ } /*---------------------------------------------------------------------------*/ void uart_set_speed(unsigned mode, unsigned ubr0, unsigned ubr1, unsigned umctl) { - // store setting - uart_speed_br0[mode] = ubr0; // baudrate - uart_speed_br1[mode] = ubr1; // baudrate - uart_speed_bmn[mode] = umctl; // modulation + /* store the setting */ + uart_speed_br0[mode] = ubr0; /* baudrate */ + uart_speed_br1[mode] = ubr1; /* baudrate */ + uart_speed_bmn[mode] = umctl; /* modulation */ - // reconfigure, if mode active - if (uart_mode == mode) { + /* reconfigure, if mode active */ + if(uart_mode == mode) { uart_configure(mode); } } /*---------------------------------------------------------------------------*/ void -uart_set_handler(unsigned mode, fp_uart_handler fpHandler) +uart_set_handler(unsigned mode, uart_handler_t handler) { - // store setting - uart_handler[mode] = fpHandler; + /* store the setting */ + uart_handler[mode] = handler; if(mode == uart_mode) { - if (fpHandler == NULL) { - IE2 &= ~URXIE1; // Disable USART1 RX interrupt + if(handler == NULL) { + IE2 &= ~URXIE1; /* Disable USART1 RX interrupt */ } else { - IE2 |= URXIE1; // Enable USART1 RX interrupt + IE2 |= URXIE1; /* Enable USART1 RX interrupt */ } } } @@ -143,14 +141,14 @@ uart_set_handler(unsigned mode, fp_uart_handler fpHandler) int uart_lock(unsigned mode) { - // already locked? + /* already locked? */ if(uart_mode != mode && uart_lockcnt > 0) { return 0; } - // increase lock count + /* increase lock count */ uart_lockcnt++; - // switch mode (if neccessary) + /* switch mode (if neccessary) */ uart_set_mode(mode); return 1; } @@ -173,10 +171,10 @@ uart_unlock(unsigned mode) return 0; } - // decrement lock - if (uart_lockcnt > 0) { + /* decrement lock */ + if(uart_lockcnt > 0) { uart_lockcnt--; - // if no more locks, switch back to default mode + /* if no more locks, switch back to default mode */ if(uart_lockcnt == 0) { uart_set_mode(UART_MODE_DEFAULT); } @@ -188,17 +186,17 @@ uart_unlock(unsigned mode) void uart_set_mode(unsigned mode) { - // do nothing if mode already set + /* do nothing if the mode is already set */ if(mode == uart_mode) { return; } - IE2 &= ~(URXIE1 | UTXIE1); // disable irq - uart_configure(mode); // configure uart parameters + IE2 &= ~(URXIE1 | UTXIE1); /* disable irq */ + uart_configure(mode); /* configure uart parameters */ uart_mode = mode; if(uart_handler[mode] != NULL) { - IE2 |= URXIE1; // Enable USART1 RX interrupt + IE2 |= URXIE1; /* Enable USART1 RX interrupt */ } } /*---------------------------------------------------------------------------*/ @@ -211,11 +209,11 @@ uart_get_mode(void) interrupt(UART1RX_VECTOR) uart_rx(void) { - fp_uart_handler handler = uart_handler[uart_mode]; + uart_handler_t handler = uart_handler[uart_mode]; int c; if(!(IFG2 & URXIFG1)) { - // If start edge detected, toggle & return + /* If rising edge is detected, toggle & return */ uart_edge = 1; U1TCTL &= ~URXSE; U1TCTL |= URXSE; @@ -229,7 +227,7 @@ uart_rx(void) _BIC_SR_IRQ(LPM3_bits); } } else { - // read out the char to clear the I-flags, etc. + /* read out the char to clear the interrupt flags. */ c = UART_RX; } } diff --git a/platform/msb430/dev/msb430-uart1.h b/platform/msb430/dev/msb430-uart1.h index 2fc76526e..470eb852d 100644 --- a/platform/msb430/dev/msb430-uart1.h +++ b/platform/msb430/dev/msb430-uart1.h @@ -56,8 +56,8 @@ Berlin, 2007 * \author Michael Baar */ -#ifndef MSB430_UART_H -#define MSB430_UART_H +#ifndef MSB430_UART1_H +#define MSB430_UART1_H #define UART_RX RXBUF1 #define UART_TX TXBUF1 @@ -84,10 +84,10 @@ extern volatile unsigned char uart_lockcnt; #define UART_MODE_RESET (0xFFu) ///< reset with current settings /** @} */ -#define UART_WAIT_LOCK(x) ( (uart_mode != x ) && (uart_lockcnt) ) -#define UART_MODE_IS(x) ( uart_mode == x ) +#define UART_WAIT_LOCK(x) ((uart_mode != x) && (uart_lockcnt)) +#define UART_MODE_IS(x) (uart_mode == x) -typedef int(*fp_uart_handler)(unsigned char); +typedef int(*uart_handler_t)(unsigned char); /** * \brief Initialize the UART module @@ -98,14 +98,14 @@ typedef int(*fp_uart_handler)(unsigned char); void uart_init(void); void uart_set_speed(unsigned, unsigned, unsigned, unsigned); -void uart_set_handler(unsigned, fp_uart_handler); +void uart_set_handler(unsigned, uart_handler_t); int uart_lock(unsigned); int uart_lock_wait(unsigned); int uart_unlock(unsigned); void uart_set_mode(unsigned); int uart_get_mode(void); -#endif /* !UART_H */ +#endif /* !MSB430_UART1_H */ /** @} */ /** @} */ diff --git a/platform/msb430/dev/rs232.c b/platform/msb430/dev/rs232.c index 5b8c92b9a..53ac55f0d 100644 --- a/platform/msb430/dev/rs232.c +++ b/platform/msb430/dev/rs232.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: rs232.c,v 1.8 2009/04/08 14:56:03 nvt-se Exp $ + * @(#)$Id: rs232.c,v 1.9 2009/06/29 12:46:50 nvt-se Exp $ */ /** \addtogroup esbrs232 @@ -108,8 +108,8 @@ rs232_set_speed(enum rs232_speed speed) void rs232_print(char *cptr) { - // lock UART for print operation - if (uart_lock(UART_MODE_RS232)) { + /* lock UART for the print operation */ + if(uart_lock(UART_MODE_RS232)) { while(*cptr != 0) { rs232_send(*cptr); ++cptr; @@ -119,7 +119,7 @@ rs232_print(char *cptr) } /*---------------------------------------------------------------------------*/ void -rs232_set_input(fp_uart_handler f) +rs232_set_input(uart_handler_t f) { uart_set_handler(UART_MODE_RS232, f); } diff --git a/platform/msb430/dev/rs232.h b/platform/msb430/dev/rs232.h index 318224be2..e8660ddd0 100644 --- a/platform/msb430/dev/rs232.h +++ b/platform/msb430/dev/rs232.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * @(#)$Id: rs232.h,v 1.5 2009/03/12 12:23:22 nvt-se Exp $ + * @(#)$Id: rs232.h,v 1.6 2009/06/29 12:46:50 nvt-se Exp $ */ /** \addtogroup esb @@ -84,7 +84,7 @@ void rs232_init(void); * take place. If the input handler returns zero, the CPU * is kept sleeping. */ -void rs232_set_input(fp_uart_handler f); +void rs232_set_input(uart_handler_t f); /** * \brief Configure the speed of the RS232 hardware diff --git a/platform/msb430/msb430-slip-arch.c b/platform/msb430/msb430-slip-arch.c index 1f680b7ae..45768acb1 100644 --- a/platform/msb430/msb430-slip-arch.c +++ b/platform/msb430/msb430-slip-arch.c @@ -23,7 +23,7 @@ putchar(int c) #define SLIP_END 0300 static char debug_frame = 0; - if (!debug_frame) { /* Start of debug output */ + if(!debug_frame) { /* Start of debug output */ slip_arch_writeb(SLIP_END); slip_arch_writeb('\r'); /* Type debug line == '\r' */ debug_frame = 1; @@ -35,7 +35,7 @@ putchar(int c) * Line buffered output, a newline marks the end of debug output and * implicitly flushes debug output. */ - if (c == '\n') { + if(c == '\n') { slip_arch_writeb(SLIP_END); debug_frame = 0; }