summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2006-09-11 21:43:45 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2006-09-11 21:43:45 +0000
commit1883c8776581c3b39702f5ffa4c4f5bbb46fff52 (patch)
tree5e7f547c5f2dc095fedd405857367ea8935ffe09
parent2006-09-11 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-1883c8776581c3b39702f5ffa4c4f5bbb46fff52.tar.bz2
2006-09-11 Joel Sherrill <joel@OARcorp.com>
* console/console.c, startup/init5235.c: Convert C++ style comments to C style.
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/ChangeLog5
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/console/console.c2
-rw-r--r--c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c16
3 files changed, 14 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
index 990ed5655c..49a9d51168 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
+++ b/c/src/lib/libbsp/m68k/mcf5235/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-11 Joel Sherrill <joel@OARcorp.com>
+
+ * console/console.c, startup/init5235.c: Convert C++ style comments to
+ C style.
+
2006-06-23 Worth Burruss <worth@motioncontrol.org>
* Makefile.am, README, startup/init5235.c, startup/linkcmds,
diff --git a/c/src/lib/libbsp/m68k/mcf5235/console/console.c b/c/src/lib/libbsp/m68k/mcf5235/console/console.c
index acf6daab54..dc81a0c574 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/console/console.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/console/console.c
@@ -372,7 +372,7 @@ IntUartInitialize(void)
info->parity = -1;
info->stopbits = -1;
info->hwflow = -1;
- info->iomode = TERMIOS_POLLED; //polled console io
+ info->iomode = TERMIOS_POLLED; /*polled console io */
MCF5235_UART_UACR(chan) = 0;
MCF5235_UART_UIMR(chan) = 0;
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c b/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c
index 0efab30131..95549c1ad0 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c
+++ b/c/src/lib/libbsp/m68k/mcf5235/startup/init5235.c
@@ -32,18 +32,18 @@ void Init5235 (void)
int temp = 0;
int *address_of_MCF5235_BSP_START_FROM_FLASH;
- //Setup the GPIO Registers
+ /*Setup the GPIO Registers */
MCF5235_GPIO_UART=0x3FFF;
MCF5235_GPIO_PAR_AD=0xE1;
- //Setup the Chip Selects so CS0 is flash
+ /*Setup the Chip Selects so CS0 is flash */
MCF5235_CS_CSAR0 =(0xFFE00000 & 0xffff0000)>>16;
MCF5235_CS_CSMR0 = 0x001f0001;
MCF5235_CS_CSCR0 = 0x1980;
address_of_MCF5235_BSP_START_FROM_FLASH = (int *) & MCF5235_BSP_START_FROM_FLASH;
if ( (int)address_of_MCF5235_BSP_START_FROM_FLASH == 1) {
- //Setup the SDRAM
+ /*Setup the SDRAM */
for(x=0; x<20000; x++)
{
temp +=1;
@@ -55,18 +55,18 @@ void Init5235 (void)
{
temp +=1;
}
- // set ip ( bit 3 ) in dacr
+ /* set ip ( bit 3 ) in dacr */
MCF5235_SDRAMC_DACR0 |= (0x00000008) ;
- // init precharge
+ /* init precharge */
*((unsigned long *)MM_SDRAM_BASE) = 0xDEADBEEF;
- // set RE in dacr
+ /* set RE in dacr */
MCF5235_SDRAMC_DACR0 |= (0x00008000);
- // wait
+ /* wait */
for(x=0; x<20000; x++)
{
temp +=1;
}
- // issue IMRS
+ /* issue IMRS */
MCF5235_SDRAMC_DACR0 |= (0x00000040);
*((short *)MM_SDRAM_BASE) = 0;
for(x=0; x<60000; x++)