aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-01-06 09:20:21 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2012-01-06 09:20:21 +0000
commitc56e9ea70a9a8e79f00fb70fb4278b9bd7bf3ae7 (patch)
tree1cfa3cf5ddc669bc03eb517b12d6f9c5351726b9
parent28b69f3e808c26eb4e4f84d44b93c7a6a63e53d1 (diff)
downloadChibiOS-c56e9ea70a9a8e79f00fb70fb4278b9bd7bf3ae7.tar.gz
ChibiOS-c56e9ea70a9a8e79f00fb70fb4278b9bd7bf3ae7.tar.bz2
ChibiOS-c56e9ea70a9a8e79f00fb70fb4278b9bd7bf3ae7.zip
Removed instances of //
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3746 35acf78f-673a-0410-8e92-d51de3d6d3f4
-rw-r--r--demos/ARM7-LPC214x-FATFS-GCC/main.c2
-rw-r--r--os/hal/platforms/AT91SAM7/at91sam7_mii.c10
-rw-r--r--os/hal/platforms/LPC214x/lpc214x.h2
-rw-r--r--os/hal/platforms/Win32/hal_lld.c2
-rw-r--r--test/testmtx.c7
-rw-r--r--testhal/STM32F1xx/EXT_WAKEUP/main.c16
-rw-r--r--testhal/STM32F4xx/PVD/mcuconf.h6
7 files changed, 22 insertions, 23 deletions
diff --git a/demos/ARM7-LPC214x-FATFS-GCC/main.c b/demos/ARM7-LPC214x-FATFS-GCC/main.c
index b5d7e82d6..02e6c944c 100644
--- a/demos/ARM7-LPC214x-FATFS-GCC/main.c
+++ b/demos/ARM7-LPC214x-FATFS-GCC/main.c
@@ -275,7 +275,7 @@ int main(void) {
chEvtRegister(&evt.et_es, &el0, 0); /* Registers on the timer event source. */
chEvtRegister(&MMCD1.inserted_event, &el1, 1);
chEvtRegister(&MMCD1.removed_event, &el2, 2);
- while (TRUE)// chThdSleepMilliseconds(50);
+ while (TRUE)
chEvtDispatch(evhndl, chEvtWaitOne(ALL_EVENTS));
return 0;
}
diff --git a/os/hal/platforms/AT91SAM7/at91sam7_mii.c b/os/hal/platforms/AT91SAM7/at91sam7_mii.c
index 707a373b9..4d7d0006a 100644
--- a/os/hal/platforms/AT91SAM7/at91sam7_mii.c
+++ b/os/hal/platforms/AT91SAM7/at91sam7_mii.c
@@ -81,14 +81,14 @@ void miiReset(MACDriver *macp) {
/*
* PHY power control.
*/
- AT91C_BASE_PIOB->PIO_OER = PIOB_PHY_PD_MASK; // Becomes an output.
- AT91C_BASE_PIOB->PIO_PPUDR = PIOB_PHY_PD_MASK; // Default pullup disabled.
+ AT91C_BASE_PIOB->PIO_OER = PIOB_PHY_PD_MASK; /* Becomes an output. */
+ AT91C_BASE_PIOB->PIO_PPUDR = PIOB_PHY_PD_MASK;/* Default pullup disabled. */
#if (PHY_HARDWARE == PHY_DAVICOM_9161)
- AT91C_BASE_PIOB->PIO_CODR = PIOB_PHY_PD_MASK; // Output to low level.
+ AT91C_BASE_PIOB->PIO_CODR = PIOB_PHY_PD_MASK; /* Output to low level. */
#else
- AT91C_BASE_PIOB->PIO_SODR = PIOB_PHY_PD_MASK; // Output to high level.
+ AT91C_BASE_PIOB->PIO_SODR = PIOB_PHY_PD_MASK; /* Output to high level. */
+#endif
#endif
-#endif // PIOB_PHY_PD_MASK
/*
* PHY reset by pulsing the NRST pin.
diff --git a/os/hal/platforms/LPC214x/lpc214x.h b/os/hal/platforms/LPC214x/lpc214x.h
index b30996568..d1990bea9 100644
--- a/os/hal/platforms/LPC214x/lpc214x.h
+++ b/os/hal/platforms/LPC214x/lpc214x.h
@@ -277,7 +277,7 @@ typedef struct {
IOREG32 UART_FCR;
};
IOREG32 UART_LCR;
- IOREG32 UART_MCR; // UART1 only
+ IOREG32 UART_MCR;
IOREG32 UART_LSR;
IOREG32 unused18;
IOREG32 UART_SCR;
diff --git a/os/hal/platforms/Win32/hal_lld.c b/os/hal/platforms/Win32/hal_lld.c
index 5906e372c..48d017f2f 100644
--- a/os/hal/platforms/Win32/hal_lld.c
+++ b/os/hal/platforms/Win32/hal_lld.c
@@ -89,7 +89,7 @@ void ChkIntSources(void) {
}
#endif
- // Interrupt Timer simulation (10ms interval).
+ /* Interrupt Timer simulation (10ms interval).*/
QueryPerformanceCounter(&n);
if (n.QuadPart > nextcnt.QuadPart) {
nextcnt.QuadPart += slice.QuadPart;
diff --git a/test/testmtx.c b/test/testmtx.c
index 08329a33b..599ed4539 100644
--- a/test/testmtx.c
+++ b/test/testmtx.c
@@ -100,7 +100,7 @@ static msg_t thread1(void *p) {
static void mtx1_execute(void) {
- tprio_t prio = chThdGetPriority(); // Because priority inheritance.
+ tprio_t prio = chThdGetPriority(); /* Because priority inheritance.*/
chMtxLock(&m1);
threads[0] = chThdCreateStatic(wa[0], WA_SIZE, prio+1, thread1, "E");
threads[1] = chThdCreateStatic(wa[1], WA_SIZE, prio+2, thread1, "D");
@@ -244,8 +244,8 @@ ROMCONST struct testcase testmtx2 = {
static void mtx3_setup(void) {
- chMtxInit(&m1); // Mutex B
- chMtxInit(&m2); // Mutex A
+ chMtxInit(&m1); /* Mutex B.*/
+ chMtxInit(&m2); /* Mutex A.*/
}
/* Lowest priority thread */
@@ -539,7 +539,6 @@ static void mtx7_setup(void) {
static void mtx7_execute(void) {
- // Bacause priority inheritance.
tprio_t prio = chThdGetPriority();
threads[0] = chThdCreateStatic(wa[0], WA_SIZE, prio+1, thread10, "E");
threads[1] = chThdCreateStatic(wa[1], WA_SIZE, prio+2, thread10, "D");
diff --git a/testhal/STM32F1xx/EXT_WAKEUP/main.c b/testhal/STM32F1xx/EXT_WAKEUP/main.c
index 986721fc9..047ba0053 100644
--- a/testhal/STM32F1xx/EXT_WAKEUP/main.c
+++ b/testhal/STM32F1xx/EXT_WAKEUP/main.c
@@ -93,7 +93,7 @@ static void cmd_reboot(BaseChannel *chp, int argc, char *argv[]){
return;
}
chprintf(chp, "rebooting...\r\n");
- chThdSleepMilliseconds(100); // time to print out message in terminal
+ chThdSleepMilliseconds(100);
NVIC_SystemReset();
}
@@ -105,11 +105,11 @@ static void cmd_sleep(BaseChannel *chp, int argc, char *argv[]){
}
chprintf(chp, "Going to sleep. Type any character to wake up.\r\n");
- chThdSleepMilliseconds(200); // time to print out message in terminal
+ chThdSleepMilliseconds(200);
extChannelEnable(&EXTD1, 10);
PWR->CR |= (PWR_CR_LPDS | PWR_CR_CSBF | PWR_CR_CWUF);
- PWR->CR &= ~PWR_CR_PDDS; // explicit clear PDDS, just to be safe
+ PWR->CR &= ~PWR_CR_PDDS;
SCB->SCR |= SCB_SCR_SLEEPDEEP_Msk;
__WFI();
}
@@ -146,20 +146,20 @@ int main(void) {
*/
extStart(&EXTD1, &extcfg);
- /* Activates the serial driver using the driver default configuration. */
+ /* Activates the serial driver using the driver default configuration.*/
sdStart(&SD1, NULL);
- /* Setting up ports. */
+ /* Setting up ports.*/
palSetPadMode(IOPORT1, 9, PAL_MODE_STM32_ALTERNATE_PUSHPULL);
palSetPadMode(IOPORT1, 10, PAL_MODE_INPUT);
- /* Shell manager initialization. */
+ /* Shell manager initialization.*/
shellInit();
static WORKING_AREA(waShell, 512);
shellCreateStatic(&shell_cfg1, waShell, sizeof(waShell), NORMALPRIO);
- /* Start blink indicating. */
- chThdSleepMilliseconds(2000); // timeuot to differ reboot and wake up from sleep
+ /* Start blink indicating.*/
+ chThdSleepMilliseconds(2000);
while (TRUE) {
chThdSleepMilliseconds(100);
palTogglePad(IOPORT3, GPIOC_LED);
diff --git a/testhal/STM32F4xx/PVD/mcuconf.h b/testhal/STM32F4xx/PVD/mcuconf.h
index ff8f8a1fa..29cf76a4c 100644
--- a/testhal/STM32F4xx/PVD/mcuconf.h
+++ b/testhal/STM32F4xx/PVD/mcuconf.h
@@ -99,12 +99,12 @@
#define STM32_EXT_EXTI5_9_IRQ_PRIORITY 6
#define STM32_EXT_EXTI10_15_IRQ_PRIORITY 6
#define STM32_EXT_EXTI16_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI17_IRQ_PRIORITY 15 // RTC alarm
+#define STM32_EXT_EXTI17_IRQ_PRIORITY 15
#define STM32_EXT_EXTI18_IRQ_PRIORITY 6
#define STM32_EXT_EXTI19_IRQ_PRIORITY 6
#define STM32_EXT_EXTI20_IRQ_PRIORITY 6
-#define STM32_EXT_EXTI21_IRQ_PRIORITY 15 // RTC tamper-timestamp
-#define STM32_EXT_EXTI22_IRQ_PRIORITY 15 // RTC wakeup
+#define STM32_EXT_EXTI21_IRQ_PRIORITY 15
+#define STM32_EXT_EXTI22_IRQ_PRIORITY 15
/*
* GPT driver system settings.