summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/m68k/mcf5206elite
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2004-04-21 10:43:04 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2004-04-21 10:43:04 +0000
commit6128a4aa5e791ed4e0a655bfd346a52d92da7883 (patch)
treeaf53ca3f67ce405b6fbc6c98399c8e0c87e01a9e /c/src/lib/libbsp/m68k/mcf5206elite
parent2004-04-20 Ralf Corsepius <ralf_corsepius@rtems.org> (diff)
downloadrtems-6128a4aa5e791ed4e0a655bfd346a52d92da7883.tar.bz2
Remove stray white spaces.
Diffstat (limited to 'c/src/lib/libbsp/m68k/mcf5206elite')
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/console/console.c16
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c14
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c24
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h8
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h8
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h2
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c4
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/start/start.S10
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/startup/bspclean.c4
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c8
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c50
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/tod/ds1307.c30
-rw-r--r--c/src/lib/libbsp/m68k/mcf5206elite/tod/todcfg.c6
13 files changed, 92 insertions, 92 deletions
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c b/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c
index 06980a4530..c3cb1ae5bf 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/console/console.c
@@ -154,7 +154,7 @@ console_first_open(int major, int minor, void *arg)
rtems_libio_open_close_args_t *args = arg;
rtems_status_code sc;
uint8_t intvec;
-
+
switch (minor)
{
case 0: intvec = BSP_INTVEC_UART1; break;
@@ -251,7 +251,7 @@ console_initialize(rtems_device_major_number major,
sc = mcfuart_reset(&uart[1]);
return sc;
}
-
+
return RTEMS_SUCCESSFUL;
}
@@ -267,8 +267,8 @@ console_initialize(rtems_device_major_number major,
* RETURNS:
* RTEMS error code
*/
-rtems_device_driver
-console_open(rtems_device_major_number major,
+rtems_device_driver
+console_open(rtems_device_major_number major,
rtems_device_minor_number minor,
void *arg)
{
@@ -297,10 +297,10 @@ console_open(rtems_device_major_number major,
{
case CONSOLE_MODE_RAW:
return RTEMS_SUCCESSFUL;
-
+
case CONSOLE_MODE_INT:
return rtems_termios_open(major, minor, arg, &intr_callbacks);
-
+
case CONSOLE_MODE_POLL:
return rtems_termios_open(major, minor, arg, &poll_callbacks);
@@ -321,7 +321,7 @@ console_open(rtems_device_major_number major,
* RETURNS:
* RTEMS error code
*/
-rtems_device_driver
+rtems_device_driver
console_close(rtems_device_major_number major,
rtems_device_minor_number minor,
void *arg)
@@ -431,7 +431,7 @@ rtems_device_driver
console_control(rtems_device_major_number major,
rtems_device_minor_number minor,
void *arg)
-{
+{
if (console_mode != CONSOLE_MODE_RAW)
{
return rtems_termios_ioctl (arg);
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c
index dd57ad8ff8..32c8809584 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2c.c
@@ -65,7 +65,7 @@ i2c_transfer_wait_sema(i2c_bus_number bus, i2c_message *msg, int nmsg)
sc = rtems_semaphore_create(
rtems_build_name('I', '2', 'C', 'S'),
0,
- RTEMS_COUNTING_SEMAPHORE | RTEMS_NO_INHERIT_PRIORITY |
+ RTEMS_COUNTING_SEMAPHORE | RTEMS_NO_INHERIT_PRIORITY |
RTEMS_NO_PRIORITY_CEILING | RTEMS_LOCAL,
0,
&sema
@@ -101,7 +101,7 @@ i2c_transfer_wait_poll(i2c_bus_number bus, i2c_message *msg, int nmsg)
volatile rtems_boolean poll_done_flag;
rtems_status_code sc;
poll_done_flag = 0;
- sc = i2c_transfer(bus, nmsg, msg, i2c_transfer_poll_done_func,
+ sc = i2c_transfer(bus, nmsg, msg, i2c_transfer_poll_done_func,
(uint32_t)&poll_done_flag);
if (sc != RTEMS_SUCCESSFUL)
return sc;
@@ -123,7 +123,7 @@ i2c_transfer_wait_poll(i2c_bus_number bus, i2c_message *msg, int nmsg)
* nmsg - number of messages in transfer
*
* RETURNS:
- * I2C_SUCCESSFUL, if tranfer finished successfully,
+ * I2C_SUCCESSFUL, if tranfer finished successfully,
* I2C_RESOURCE_NOT_AVAILABLE, if semaphore operations has failed,
* value of status field of first error-finished message in transfer,
* if something wrong.
@@ -141,10 +141,10 @@ i2c_transfer_wait(i2c_bus_number bus, i2c_message *msg, int nmsg)
{
sc = i2c_transfer_wait_poll(bus, msg, nmsg);
}
-
+
if (sc != RTEMS_SUCCESSFUL)
return I2C_RESOURCE_NOT_AVAILABLE;
-
+
for (i = 0; i < nmsg; i++)
{
if (msg[i].status != I2C_SUCCESSFUL)
@@ -264,7 +264,7 @@ i2c_wrrd(i2c_bus_number bus, i2c_address addr, void *bufw, int sizew,
msg[0].status = 0;
msg[0].len = sizew;
msg[0].buf = bufw;
-
+
msg[1].addr = addr;
msg[1].flags = 0;
if (addr > 0xff)
@@ -303,7 +303,7 @@ i2c_wbrd(i2c_bus_number bus, i2c_address addr, uint8_t cmd,
msg[0].status = 0;
msg[0].len = sizeof(bufw);
msg[0].buf = &bufw;
-
+
msg[1].addr = addr;
msg[1].flags = I2C_MSG_ERRSKIP;
if (addr > 0xff)
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c
index cf23767577..8850ab8aaa 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/i2c/i2cdrv.c
@@ -32,7 +32,7 @@
#define I2C_SELECT_BUS(bus)
#endif
-/*
+/*
* Few I2C transfers may be posted simultaneously, but MBUS driver is able
* to process it one-by-one. To serialize transfers, function i2c_transfer
* put transfer information to the queue and initiate new transfers if MBUS
@@ -40,7 +40,7 @@
* when current active transfer is finished.
*/
-/*
+/*
* i2c_qel - I2C transfers queue element; contain information about
* delayed transfer
*/
@@ -113,7 +113,7 @@ i2cdrv_unload(void)
mbus_busy = 1;
rtems_interrupt_enable(level);
qel = tqueue + tqueue_tail;
-
+
I2C_SELECT_BUS(qel->bus);
if (i2cdrv_bus_clock_div[qel->bus] != i2cdrv_bus_clock_div_current)
{
@@ -160,17 +160,17 @@ i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg,
{
i2c_qel qel;
rtems_interrupt_level level;
-
+
if (bus >= I2C_NUMBER_OF_BUSES)
{
return RTEMS_INVALID_NUMBER;
}
-
+
if (msg == NULL)
{
return RTEMS_INVALID_ADDRESS;
}
-
+
qel.bus = bus;
qel.msg = msg;
qel.nmsg = nmsg;
@@ -204,11 +204,11 @@ i2cdrv_initialize(rtems_device_major_number major,
tqueue_tail = tqueue_head = 0;
tqueue_size = 32;
tqueue = calloc(tqueue_size, sizeof(i2c_qel));
-
+
sc = mcfmbus_initialize(&mbus, MBAR);
if (sc != RTEMS_SUCCESSFUL)
return sc;
-
+
for (i = 0; i < I2C_NUMBER_OF_BUSES; i++)
{
sc = i2c_select_clock_rate(i, 4096);
@@ -221,7 +221,7 @@ i2cdrv_initialize(rtems_device_major_number major,
/* i2c_select_clock_rate --
* select I2C bus clock rate for specified bus. Some bus controller do not
- * allow to select arbitrary clock rate; in this case nearest possible
+ * allow to select arbitrary clock rate; in this case nearest possible
* slower clock rate is selected.
*
* PARAMETERS:
@@ -229,7 +229,7 @@ i2cdrv_initialize(rtems_device_major_number major,
* bps - data transfer rate for this bytes in bits per second
*
* RETURNS:
- * RTEMS_SUCCESSFUL, if operation performed successfully,
+ * RTEMS_SUCCESSFUL, if operation performed successfully,
* RTEMS_INVALID_NUMBER, if wrong bus number is specified,
* RTEMS_UNSATISFIED, if bus do not support data transfer rate selection
* or specified data transfer rate could not be used.
@@ -240,10 +240,10 @@ i2c_select_clock_rate(i2c_bus_number bus, int bps)
int div;
if (bus >= I2C_NUMBER_OF_BUSES)
return RTEMS_INVALID_NUMBER;
-
+
if (bps == 0)
return RTEMS_UNSATISFIED;
-
+
div = BSP_SYSTEM_FREQUENCY / bps;
i2cdrv_bus_clock_div[bus] = div;
return RTEMS_SUCCESSFUL;
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
index 7a677f2108..1d0d753a75 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/bsp.h
@@ -21,20 +21,20 @@
#ifndef KB
#define KB (1024)
#endif
-#ifndef MB
+#ifndef MB
#define MB (KB*KB)
#endif
/*** Board resources allocation ***/
-/*
+/*
* To achieve some compatibility with dBUG monitor, we use the same
* memory resources allocation as it is used in dBUG.
*
* If this definitions will be changed, change the linker script also.
*/
-
+
/* Memory mapping */
/* CS0: Boot Flash */
#define BSP_MEM_ADDR_FLASH (0xFFE00000)
@@ -214,7 +214,7 @@ extern char _SYS_CLOCK_FREQUENCY; /* Don't use this variable directly!!! */
/*
* NOTE: Use the standard Console driver entry
*/
-
+
/*
* NOTE: Use the standard Clock driver entry
*/
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h
index 844f88b362..1ff270a973 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/i2c.h
@@ -90,7 +90,7 @@ i2c_initialize(rtems_device_major_number major,
/* i2c_select_clock_rate --
* select I2C bus clock rate for specified bus. Some bus controller do not
- * allow to select arbitrary clock rate; in this case nearest possible
+ * allow to select arbitrary clock rate; in this case nearest possible
* slower clock rate is selected.
*
* PARAMETERS:
@@ -98,7 +98,7 @@ i2c_initialize(rtems_device_major_number major,
* bps - data transfer rate for this bytes in bits per second
*
* RETURNS:
- * RTEMS_SUCCESSFUL, if operation performed successfully,
+ * RTEMS_SUCCESSFUL, if operation performed successfully,
* RTEMS_INVALID_NUMBER, if wrong bus number is specified,
* RTEMS_UNSATISFIED, if bus do not support data transfer rate selection
* or specified data transfer rate could not be used.
@@ -123,7 +123,7 @@ i2c_select_clock_rate(i2c_bus_number bus, int bps);
* code if something failed.
*/
rtems_status_code
-i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg,
+i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg,
i2c_transfer_done done, uint32_t done_arg);
/* i2c_transfer_wait --
@@ -137,7 +137,7 @@ i2c_transfer(i2c_bus_number bus, int nmsg, i2c_message *msg,
* nmsg - number of messages in transfer
*
* RETURNS:
- * I2C_SUCCESSFUL, if tranfer finished successfully,
+ * I2C_SUCCESSFUL, if tranfer finished successfully,
* I2C_RESOURCE_NOT_AVAILABLE, if semaphore operations has failed,
* value of status field of first error-finished message in transfer,
* if something wrong.
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h b/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h
index 12ce30a0cd..10c25bf36d 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/include/i2cdrv.h
@@ -33,5 +33,5 @@ i2cdrv_initialize(rtems_device_major_number major,
#ifdef __cplusplus
}
#endif
-
+
#endif /* __I2CDRV_H__ */
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c b/c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c
index cbf8579f8a..09edc4c361 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/nvram/nvram.c
@@ -1,4 +1,4 @@
-/*
+/*
* DS1307-based Non-Volatile memory device driver
*
* DS1307 chip is a I2C Real-Time Clock. It contains 56 bytes of
@@ -142,7 +142,7 @@ nvram_driver_write(rtems_device_major_number major,
i2c_bus_number bus = DS1307_I2C_BUS_NUMBER;
i2c_address addr = DS1307_I2C_ADDRESS;
i2c_message_status status;
-
+
if (args->offset >= DS1307_NVRAM_SIZE)
{
count = 0;
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S b/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S
index 6e7cdd4e41..58bdaeb34f 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/start/start.S
@@ -314,17 +314,17 @@ SYM(start):
move.l #(INITIAL_STACK),sp | Set up stack again (may be we are
| going here from monitor or with
| BDM interface assistance)
-
+
/*
* Remainder of the startup code is handled by C code
*/
jmp SYM(Init5206e) | Start C code (which never returns)
-
+
/***************************************************************************
Function : CopyDataClearBSSAndStart
- Description : Copy DATA segment, clear BSS segment, initialize heap,
- initialise real stack, start C program. Assume that DATA and BSS sizes
+ Description : Copy DATA segment, clear BSS segment, initialize heap,
+ initialise real stack, start C program. Assume that DATA and BSS sizes
are multiples of 4.
***************************************************************************/
PUBLIC (CopyDataClearBSSAndStart)
@@ -396,7 +396,7 @@ _avec2_int:
_avec3_int:
nop
- jmp _unexp_int
+ jmp _unexp_int
_avec4_int:
nop
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspclean.c b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspclean.c
index 23e2c26c25..4fb551e228 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspclean.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspclean.c
@@ -11,9 +11,9 @@
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
- *
+ *
* http://www.rtems.com/license/LICENSE.
- *
+ *
* $Id$
*/
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c
index b6c78521a7..0d9149b2aa 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/bspstart.c
@@ -21,15 +21,15 @@
* found in the file LICENSE in this distribution or at
*
* http://www.rtems.com/license/LICENSE.
- *
+ *
* $Id$
*/
#include <bsp.h>
#include <rtems/libio.h>
-
+
#include <rtems/libcsupport.h>
-
+
#include <string.h>
/*
@@ -49,7 +49,7 @@ char *rtems_progname;
/*
* Use the shared implementations of the following routines
*/
-
+
void bsp_postdriver_hook(void);
void bsp_libc_init( void *, uint32_t, int );
void bsp_pretasking_hook(void); /* m68k version */
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c b/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c
index 8bf94caaad..64be2e5354 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/startup/init5206e.c
@@ -24,7 +24,7 @@
* found in the file LICENSE in this distribution or at
*
* http://www.rtems.com/license/LICENSE.
- *
+ *
* $Id$
*/
@@ -82,19 +82,19 @@ void
Init5206e(void)
{
extern void CopyDataClearBSSAndStart(unsigned long ramsize);
-
+
/* Set Module Base Address register */
m68k_set_mbar((MBAR & MCF5206E_MBAR_BA) | MCF5206E_MBAR_V);
-
+
/* Set System Protection Control Register (SYPCR):
* Bus Monitor Enable, Bus Monitor Timing = 1024 clocks,
* Software watchdog disabled
*/
*MCF5206E_SYPCR(MBAR) = MCF5206E_SYPCR_BME |
MCF5206E_SYPCR_BMT_1024;
-
+
/* Set Pin Assignment Register (PAR):
- * Output Timer 0 (not DREQ) on *TOUT[0] / *DREQ[1]
+ * Output Timer 0 (not DREQ) on *TOUT[0] / *DREQ[1]
* Input Timer 0 (not DREQ) on *TIN[0] / *DREQ[0]
* IRQ, not IPL
* UART2 RTS signal (not \RSTO)
@@ -108,7 +108,7 @@ Init5206e(void)
MCF5206E_PAR_PAR5_PST |
MCF5206E_PAR_PAR4_DDATA |
MCF5206E_PAR_WE0_WE1_WE2_WE3;
-
+
/* Set SIM Configuration Register (SIMR):
* Disable software watchdog timer and bus timeout monitor when
* internal freeze signal is asserted.
@@ -117,45 +117,45 @@ Init5206e(void)
/* Set Interrupt Mask Register: Disable all interrupts */
*MCF5206E_IMR(MBAR) = 0xFFFF;
-
+
/* Assign Interrupt Control Registers as it is defined in bsp.h */
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL1) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL1) =
(BSP_INTLVL_AVEC1 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_AVEC1 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL2) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL2) =
(BSP_INTLVL_AVEC2 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_AVEC2 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL3) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL3) =
(BSP_INTLVL_AVEC3 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_AVEC3 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL4) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL4) =
(BSP_INTLVL_AVEC4 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_AVEC4 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL5) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL5) =
(BSP_INTLVL_AVEC5 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_AVEC5 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL6) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL6) =
(BSP_INTLVL_AVEC6 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_AVEC6 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL7) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_EXT_IPL7) =
(BSP_INTLVL_AVEC7 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_AVEC7 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_TIMER_1) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_TIMER_1) =
(BSP_INTLVL_TIMER1 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_TIMER1 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_TIMER_2) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_TIMER_2) =
(BSP_INTLVL_TIMER2 << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_TIMER2 << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
- *MCF5206E_ICR(MBAR,MCF5206E_INTR_MBUS) =
+ *MCF5206E_ICR(MBAR,MCF5206E_INTR_MBUS) =
(BSP_INTLVL_MBUS << MCF5206E_ICR_IL_S) |
(BSP_INTPRIO_MBUS << MCF5206E_ICR_IP_S) |
MCF5206E_ICR_AVEC;
@@ -178,7 +178,7 @@ Init5206e(void)
*MCF5206E_SWIVR(MBAR) = 0x0F; /* Uninitialized interrupt */
*MCF5206E_SWSR(MBAR) = MCF5206E_SWSR_KEY1;
*MCF5206E_SWSR(MBAR) = MCF5206E_SWSR_KEY2;
-
+
/* Configuring Chip Selects */
/* CS2: SRAM memory */
*MCF5206E_CSAR(MBAR,2) = BSP_MEM_ADDR_ESRAM >> 16;
@@ -189,7 +189,7 @@ Init5206e(void)
MCF5206E_CSCR_EMAA |
MCF5206E_CSCR_WR |
MCF5206E_CSCR_RD;
-
+
/* CS3: GPIO on eLITE board */
*MCF5206E_CSAR(MBAR,3) = BSP_MEM_ADDR_GPIO >> 16;
*MCF5206E_CSMR(MBAR,3) = BSP_MEM_MASK_GPIO;
@@ -199,7 +199,7 @@ Init5206e(void)
MCF5206E_CSCR_EMAA |
MCF5206E_CSCR_WR |
MCF5206E_CSCR_RD;
-
+
{
extern void INTERRUPT_VECTOR();
uint32_t *inttab = (uint32_t*)&INTERRUPT_VECTOR;
@@ -211,9 +211,9 @@ Init5206e(void)
}
}
m68k_set_vbr(BSP_MEM_ADDR_ESRAM);
-
+
/* CS0: Flash EEPROM */
- *MCF5206E_CSAR(MBAR,0) = BSP_MEM_ADDR_FLASH >> 16;
+ *MCF5206E_CSAR(MBAR,0) = BSP_MEM_ADDR_FLASH >> 16;
*MCF5206E_CSCR(MBAR,0) = MCF5206E_CSCR_WS3 |
MCF5206E_CSCR_AA |
MCF5206E_CSCR_PS_16 |
@@ -221,7 +221,7 @@ Init5206e(void)
MCF5206E_CSCR_WR |
MCF5206E_CSCR_RD;
*MCF5206E_CSMR(MBAR,0) = BSP_MEM_MASK_FLASH;
-
+
/*
* Invalidate the cache and disable it
*/
@@ -244,8 +244,8 @@ Init5206e(void)
| MCF5206E_ACR_SM_ANY
);
- mcf5206e_enable_cache();
-
+ mcf5206e_enable_cache();
+
/*
* Copy data, clear BSS, switch stacks and call boot_card()
*/
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tod/ds1307.c b/c/src/lib/libbsp/m68k/mcf5206elite/tod/ds1307.c
index 559b7bdb5d..a2c62ebcc1 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/tod/ds1307.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/tod/ds1307.c
@@ -53,17 +53,17 @@ ds1307_initialize(int minor)
uint8_t sec;
i2c_bus_number bus;
i2c_address addr;
-
+
bus = RTC_Table[minor].ulCtrlPort1;
addr = RTC_Table[minor].ulDataPort;
-
+
/* Read SECONDS register */
try = 0;
do {
status = i2c_wbrd(bus, addr, 0, &sec, sizeof(sec));
try++;
} while ((status != I2C_SUCCESSFUL) && (try < 15));
-
+
/* If clock is halted, reset and start the clock */
if ((sec & DS1307_SECOND_HALT) != 0)
{
@@ -98,13 +98,13 @@ ds1307_get_time(int minor, rtems_time_of_day *time)
uint32_t v1, v2;
i2c_message_status status;
int try;
-
+
if (time == NULL)
return -1;
-
+
bus = RTC_Table[minor].ulCtrlPort1;
addr = RTC_Table[minor].ulDataPort;
-
+
memset(time, 0, sizeof(rtems_time_of_day));
try = 0;
do {
@@ -116,20 +116,20 @@ ds1307_get_time(int minor, rtems_time_of_day *time)
{
return -1;
}
-
+
v1 = info[DS1307_YEAR];
v2 = From_BCD(v1);
if (v2 < 88)
time->year = 2000 + v2;
else
time->year = 1900 + v2;
-
+
v1 = info[DS1307_MONTH] & ~0xE0;
time->month = From_BCD(v1);
-
+
v1 = info[DS1307_DAY] & ~0xC0;
time->day = From_BCD(v1);
-
+
v1 = info[DS1307_HOUR];
if (v1 & DS1307_HOUR_12)
{
@@ -151,11 +151,11 @@ ds1307_get_time(int minor, rtems_time_of_day *time)
v1 = info[DS1307_MINUTE] & ~0x80;
time->minute = From_BCD(v1);
-
+
v1 = info[DS1307_SECOND];
v2 = v1 & ~0x80;
time->second = From_BCD(v2);
-
+
return 0;
}
@@ -178,7 +178,7 @@ ds1307_set_time(int minor, rtems_time_of_day *time)
uint8_t info[8];
i2c_message_status status;
int try;
-
+
if (time == NULL)
return -1;
@@ -187,7 +187,7 @@ ds1307_set_time(int minor, rtems_time_of_day *time)
if (time->year >= 2088)
rtems_fatal_error_occurred(RTEMS_INVALID_NUMBER);
-
+
info[0] = DS1307_SECOND;
info[1 + DS1307_YEAR] = To_BCD(time->year % 100);
info[1 + DS1307_MONTH] = To_BCD(time->month);
@@ -196,7 +196,7 @@ ds1307_set_time(int minor, rtems_time_of_day *time)
info[1 + DS1307_MINUTE] = To_BCD(time->minute);
info[1 + DS1307_SECOND] = To_BCD(time->second);
info[1 + DS1307_DAY_OF_WEEK] = 1; /* Do not set day of week */
-
+
try = 0;
do {
status = i2c_write(bus, addr, info, 8);
diff --git a/c/src/lib/libbsp/m68k/mcf5206elite/tod/todcfg.c b/c/src/lib/libbsp/m68k/mcf5206elite/tod/todcfg.c
index 117f95488f..35d00c1792 100644
--- a/c/src/lib/libbsp/m68k/mcf5206elite/tod/todcfg.c
+++ b/c/src/lib/libbsp/m68k/mcf5206elite/tod/todcfg.c
@@ -63,12 +63,12 @@ mcf5206elite_ds1307_probe(int minor)
rtc_tbl *rtc;
i2c_bus_number bus;
i2c_address addr;
-
+
if (minor >= NUM_RTCS)
return FALSE;
-
+
rtc = RTC_Table + minor;
-
+
bus = rtc->ulCtrlPort1;
addr = rtc->ulDataPort;
do {