summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i386/ts_386ex
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/i386/ts_386ex
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/i386/ts_386ex')
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c32
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/clock/rtc.c22
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/console/console.c90
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/include/bsp.h8
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/include/wd80x3.h4
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/network/ne2000.c10
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/start/80386ex.h2
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/start/start.S136
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c8
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/timer/timer.c6
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c4
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/serial_debug.adb1
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c4
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/networkconfig.h4
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c4
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/i386_ports.ads2
-rw-r--r--c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c4
17 files changed, 169 insertions, 172 deletions
diff --git a/c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c b/c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c
index fb39b12608..e890139db5 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/clock/ckinit.c
@@ -36,7 +36,7 @@ void Clock_exit( void );
/*
* These are set by clock driver during its init
*/
-
+
rtems_device_major_number rtems_clock_major = ~0;
rtems_device_major_number rtems_clock_minor = 0;
@@ -100,7 +100,7 @@ rtems_device_driver Clock_initialize(
/* External Prototypes */
extern void init_rtc(void); /* defined in 'rtc.c' */
extern long rtc_read(rtems_time_of_day *); /* defined in 'rtc.c' */
-
+
#ifdef BSP_DEBUG
printk("Loading clock from on-board real-time clock.\n");
#endif
@@ -113,25 +113,25 @@ rtems_device_driver Clock_initialize(
Clock_driver_ticks = 0;
- Clock_isrs =
- Clock_initial_isr_value =
+ Clock_isrs =
+ Clock_initial_isr_value =
BSP_Configuration.microseconds_per_tick / 1000; /* ticks per clock_isr */
-
+
/*
* configure the counter timer ( should be based on microsecs/tick )
* NB. The divisor(Clock_isrs) resolves the is the same number that appears in confdefs.h
* when setting the microseconds_per_tick value.
*/
ClockOff ( &clockIrqData );
-
+
timer_counter_init_value = BSP_Configuration.microseconds_per_tick / Clock_isrs;
clock_lsb = (unsigned char)timer_counter_init_value;
clock_msb = timer_counter_init_value >> 8;
-
- outport_byte (TIMER_MODE, TIMER_SEL0|TIMER_16BIT|TIMER_RATEGEN);
+
+ outport_byte (TIMER_MODE, TIMER_SEL0|TIMER_16BIT|TIMER_RATEGEN);
outport_byte (TIMER_CNTR0, clock_lsb ); /* load LSB first */
outport_byte (TIMER_CNTR0, clock_msb ); /* then MSB */
-
+
if (!BSP_install_rtems_irq_handler (&clockIrqData)) {
printk("Unable to initialize system clock\n");
rtems_fatal_error_occurred(1);
@@ -140,10 +140,10 @@ rtems_device_driver Clock_initialize(
/*
* make major/minor avail to others such as shared memory driver
*/
-
+
rtems_clock_major = major;
rtems_clock_minor = minor;
-
+
return RTEMS_SUCCESSFUL;
}
@@ -154,15 +154,15 @@ rtems_device_driver Clock_control(
)
{
rtems_libio_ioctl_args_t *args = pargp;
-
+
if (args == 0)
goto done;
-
+
/*
* This is hokey, but until we get a defined interface
* to do this, it will just be this simple...
*/
-
+
if (args->command == rtems_build_name('I', 'S', 'R', ' '))
{
Clock_isr();
@@ -178,13 +178,13 @@ rtems_device_driver Clock_control(
printk("Clock installed AGAIN\n");
#endif
}
-
+
done:
return RTEMS_SUCCESSFUL;
}
void Clock_exit()
{
- ClockOff(&clockIrqData);
+ ClockOff(&clockIrqData);
BSP_remove_rtems_irq_handler (&clockIrqData);
}
diff --git a/c/src/lib/libbsp/i386/ts_386ex/clock/rtc.c b/c/src/lib/libbsp/i386/ts_386ex/clock/rtc.c
index 401220bf6d..26c4c2056d 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/clock/rtc.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/clock/rtc.c
@@ -79,9 +79,9 @@
| Description: Convert 2 digit number to its BCD representation.
| Global Variables: None.
| Arguments: i - Number to convert.
-| Returns: BCD representation of number.
+| Returns: BCD representation of number.
+--------------------------------------------------------------------------*/
-static inline uint8_t
+static inline uint8_t
bcd(uint8_t i)
{
return ((i / 16) * 10 + (i % 16));
@@ -99,9 +99,9 @@ bcd(uint8_t i)
| Description: Convert years to seconds (since 1970).
| Global Variables: None.
| Arguments: y - year to convert (1970 <= y <= 2100).
-| Returns: number of seconds since 1970.
+| Returns: number of seconds since 1970.
+--------------------------------------------------------------------------*/
-static inline uint32_t
+static inline uint32_t
ytos(uint16_t y)
{ /* v NUM LEAP YEARS v */
return ((y - 1970) * SECS_PER_REG_YEAR + (y - 1970 + 1) / 4 * SECS_PER_DAY);
@@ -113,9 +113,9 @@ ytos(uint16_t y)
| Description: Convert months to seconds since January.
| Global Variables: None.
| Arguments: m - month to convert, leap - is this a month of a leap year.
-| Returns: number of seconds since January.
+| Returns: number of seconds since January.
+--------------------------------------------------------------------------*/
-static inline uint32_t
+static inline uint32_t
mtos(uint8_t m, rtems_boolean leap)
{
static uint16_t daysMonth[] = { 0, 0, 31, 59, 90, 120, 151, 181,
@@ -132,9 +132,9 @@ mtos(uint8_t m, rtems_boolean leap)
| Description: Perform action on RTC and return its result.
| Global Variables: None.
| Arguments: what - what to write to RTC port (what to do).
-| Returns: result received from RTC port after action performed.
+| Returns: result received from RTC port after action performed.
+--------------------------------------------------------------------------*/
-static inline uint8_t
+static inline uint8_t
rtcin(uint8_t what)
{
uint8_t r;
@@ -153,7 +153,7 @@ rtcin(uint8_t what)
| Description: Initialize real-time clock (RTC).
| Global Variables: None.
| Arguments: None.
-| Returns: Nothing.
+| Returns: Nothing.
+--------------------------------------------------------------------------*/
void
init_rtc(void)
@@ -181,7 +181,7 @@ init_rtc(void)
| Description: Read present time from RTC and return it.
| Global Variables: None.
| Arguments: tod - to return present time in 'rtems_time_of_day' format.
-| Returns: number of seconds from 1970/01/01 corresponding to 'tod'.
+| Returns: number of seconds from 1970/01/01 corresponding to 'tod'.
+--------------------------------------------------------------------------*/
long int
rtc_read(rtems_time_of_day *tod)
@@ -201,7 +201,7 @@ rtc_read(rtems_time_of_day *tod)
sa = rtcin(RTC_STATUSA);
tod->year = bcd(rtcin(RTC_YEAR)) + 1900; /* year */
- if (tod->year < 1970) tod->year += 100;
+ if (tod->year < 1970) tod->year += 100;
tod->month = bcd(rtcin(RTC_MONTH)); /* month */
tod->day = bcd(rtcin(RTC_DAY)); /* day */
(void) bcd(rtcin(RTC_WDAY)); /* weekday */
diff --git a/c/src/lib/libbsp/i386/ts_386ex/console/console.c b/c/src/lib/libbsp/i386/ts_386ex/console/console.c
index 6dedba06de..a101823370 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/console/console.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/console/console.c
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------+
| console.c v1.1 - i386ex BSP - 1997/08/07
+--------------------------------------------------------------------------+
-| This file contains the i386ex console I/O package. It is just a termios
+| This file contains the i386ex console I/O package. It is just a termios
| wrapper.
+--------------------------------------------------------------------------+
| (C) Copyright 1997 -
@@ -48,7 +48,7 @@
* Possible value for console input/output :
* BSP_UART_COM1
* BSP_UART_COM2
- * BSP_CONSOLE_PORT_CONSOLE is not valid in this BSP.
+ * BSP_CONSOLE_PORT_CONSOLE is not valid in this BSP.
* All references to either keyboard or video handling have been removed.
*/
@@ -67,7 +67,7 @@ static int isr_is_on(const rtems_irq_connect_data *);
* Change references to com2 if required.
*/
-static rtems_irq_connect_data console_isr_data =
+static rtems_irq_connect_data console_isr_data =
{ BSP_UART_COM2_IRQ,
BSP_uart_termios_isr_com2,
isr_on,
@@ -79,7 +79,7 @@ isr_on(const rtems_irq_connect_data *unused)
{
return;
}
-
+
static void
isr_off(const rtems_irq_connect_data *unused)
{
@@ -108,20 +108,20 @@ console_initialize(rtems_device_major_number major,
* Set up TERMIOS
*/
rtems_termios_initialize ();
-
+
/*
* Do device-specific initialization
*/
-
+
/* 115200-8-N-1, without hardware flow control */
BSP_uart_init(BSPConsolePort, 115200, CHR_8_BITS, 0, 0, 0);
-
+
/* Set interrupt handler */
if(BSPConsolePort == BSP_UART_COM1)
{
console_isr_data.name = BSP_UART_COM1_IRQ;
console_isr_data.hdl = BSP_uart_termios_isr_com1;
-
+
}
else
{
@@ -129,9 +129,9 @@ console_initialize(rtems_device_major_number major,
console_isr_data.name = BSP_UART_COM2_IRQ;
console_isr_data.hdl = BSP_uart_termios_isr_com2;
}
-
+
status = BSP_install_rtems_irq_handler(&console_isr_data);
-
+
if (!status){
printk("Error installing serial console interrupt handler!\n");
rtems_fatal_error_occurred(status);
@@ -145,7 +145,7 @@ console_initialize(rtems_device_major_number major,
printk("Error registering console device!\n");
rtems_fatal_error_occurred (status);
}
-
+
if(BSPConsolePort == BSP_UART_COM1)
{
printk("Initialized console on port COM1 115200-8-N-1\n\n");
@@ -175,7 +175,7 @@ console_open(rtems_device_major_number major,
void *arg)
{
rtems_status_code status;
- static rtems_termios_callbacks cb =
+ static rtems_termios_callbacks cb =
{
NULL, /* firstOpen */
console_last_close, /* lastClose */
@@ -203,9 +203,9 @@ console_open(rtems_device_major_number major,
/*
* Pass data area info down to driver
*/
- BSP_uart_termios_set(BSPConsolePort,
+ BSP_uart_termios_set(BSPConsolePort,
((rtems_libio_open_close_args_t *)arg)->iop->data1);
-
+
/* Enable interrupts on channel */
BSP_uart_intr_ctrl(BSPConsolePort, BSP_UART_INTR_CTRL_TERMIOS);
@@ -222,10 +222,10 @@ console_close(rtems_device_major_number major,
{
return (rtems_termios_close (arg));
-
+
} /* console_close */
-
+
/*-------------------------------------------------------------------------+
| Console device driver READ entry point.
+--------------------------------------------------------------------------+
@@ -246,7 +246,7 @@ console_read(rtems_device_major_number major,
return sc;
} /* console_read */
-
+
/*-------------------------------------------------------------------------+
| Console device driver WRITE entry point.
@@ -259,20 +259,20 @@ console_write(rtems_device_major_number major,
void * arg)
{
return rtems_termios_write (arg);
-
+
} /* console_write */
-
+
/*
* Handle ioctl request.
*/
-rtems_device_driver
+rtems_device_driver
console_control(rtems_device_major_number major,
rtems_device_minor_number minor,
void * arg
)
-{
+{
return rtems_termios_ioctl (arg);
}
@@ -281,45 +281,45 @@ conSetAttr(int minor, const struct termios *t)
{
int baud;
- switch (t->c_cflag & CBAUD)
+ switch (t->c_cflag & CBAUD)
{
- case B50:
+ case B50:
baud = 50;
break;
- case B75:
- baud = 75;
+ case B75:
+ baud = 75;
break;
- case B110:
- baud = 110;
+ case B110:
+ baud = 110;
break;
- case B134:
- baud = 134;
+ case B134:
+ baud = 134;
break;
- case B150:
- baud = 150;
+ case B150:
+ baud = 150;
break;
case B200:
- baud = 200;
+ baud = 200;
break;
- case B300:
+ case B300:
baud = 300;
break;
- case B600:
- baud = 600;
+ case B600:
+ baud = 600;
break;
- case B1200:
+ case B1200:
baud = 1200;
break;
- case B1800:
- baud = 1800;
+ case B1800:
+ baud = 1800;
break;
- case B2400:
+ case B2400:
baud = 2400;
break;
- case B4800:
+ case B4800:
baud = 4800;
break;
- case B9600:
+ case B9600:
baud = 9600;
break;
case B19200:
@@ -328,7 +328,7 @@ conSetAttr(int minor, const struct termios *t)
case B38400:
baud = 38400;
break;
- case B57600:
+ case B57600:
baud = 57600;
break;
case B115200:
@@ -349,13 +349,13 @@ conSetAttr(int minor, const struct termios *t)
* BSP initialization
*/
-BSP_output_char_function_type BSP_output_char =
+BSP_output_char_function_type BSP_output_char =
(BSP_output_char_function_type) BSP_output_char_via_serial;
-BSP_polling_getchar_function_type BSP_poll_char =
+BSP_polling_getchar_function_type BSP_poll_char =
(BSP_polling_getchar_function_type) BSP_poll_char_via_serial;
int BSP_poll_read(int ttyMinor){
-
+
return BSP_poll_char_via_serial();
}
diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
index 1b5ce3d639..ae38792de6 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
+++ b/c/src/lib/libbsp/i386/ts_386ex/include/bsp.h
@@ -37,7 +37,7 @@ extern "C" {
/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */
#define CONFIGURE_INTERRUPT_STACK_MEMORY (8 * 1024)
-
+
/*
* Network driver configuration
*/
@@ -163,15 +163,15 @@ extern void Wait_X_ms (unsigned);
/*
* Device Driver Table Entries
*/
-
+
/*
* NOTE: Use the standard Console driver entry
*/
-
+
/*
* NOTE: Use the standard Clock driver entry
*/
-
+
/* miscellaneous stuff assumed to exist */
extern rtems_configuration_table BSP_Configuration;
diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/wd80x3.h b/c/src/lib/libbsp/i386/ts_386ex/include/wd80x3.h
index 545861cb3b..c82035b61c 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/include/wd80x3.h
+++ b/c/src/lib/libbsp/i386/ts_386ex/include/wd80x3.h
@@ -9,7 +9,7 @@
/* page 0 read or read/write registers */
-#define CMDR 0x00+RO
+#define CMDR 0x00+RO
#define CLDA0 0x01+RO /* current local dma addr 0 for read */
#define CLDA1 0x02+RO /* current local dma addr 1 for read */
#define BNRY 0x03+RO /* boundary reg for rd and wr */
@@ -55,7 +55,7 @@
/*-----CMDR command bits-----*/
#define MSK_STP 0x01 /* stop the chip */
-#define MSK_STA 0x02 /* start the chip */
+#define MSK_STA 0x02 /* start the chip */
#define MSK_TXP 0x04 /* initial txing of a frm */
#define MSK_RRE 0x08 /* remote read */
#define MSK_RWR 0x10 /* remote write */
diff --git a/c/src/lib/libbsp/i386/ts_386ex/network/ne2000.c b/c/src/lib/libbsp/i386/ts_386ex/network/ne2000.c
index a6a51d900f..80e97d8904 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/network/ne2000.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/network/ne2000.c
@@ -23,7 +23,7 @@
* is any point to having more than two transmit buffers. However, the
* code does make it possible, by changing NE_TX_BUFS, although that
* would of course reduce the number of receive buffers.
- *
+ *
* I suspect that the wd80x3 driver would benefit slightly from copying
* the multiple transmit buffer code. However, I have no way to test
* that.
@@ -223,7 +223,7 @@ ne_read_data (struct ne_softc *sc, int addr, int len, unsigned char *p)
if (sc->byte_transfers)
while (len > 0) {
unsigned char d;
-
+
inport_byte (dport, d);
*p++ = d;
len--;
@@ -231,7 +231,7 @@ ne_read_data (struct ne_softc *sc, int addr, int len, unsigned char *p)
else /* word transfers */
while (len > 0) {
unsigned short d;
-
+
inport_word (dport, d);
*p++ = d;
*p++ = d >> 8;
@@ -643,7 +643,7 @@ ne_loadpacket (struct ne_softc *sc, struct mbuf *m)
leftover = 0;
}
- /* If using byte transfers, len always ends up as zero so
+ /* If using byte transfers, len always ends up as zero so
there are no leftovers. */
if (sc->byte_transfers)
@@ -954,7 +954,7 @@ rtems_ne_driver_attach (struct rtems_bsdnet_ifconfig *config)
memset (sc, 0, sizeof *sc);
/* Check whether we do byte-wide or word-wide transfers. */
-
+
#ifdef NE2000_BYTE_TRANSFERS
sc->byte_transfers = TRUE;
#else
diff --git a/c/src/lib/libbsp/i386/ts_386ex/start/80386ex.h b/c/src/lib/libbsp/i386/ts_386ex/start/80386ex.h
index 8c2c5caeff..a62f08f425 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/start/80386ex.h
+++ b/c/src/lib/libbsp/i386/ts_386ex/start/80386ex.h
@@ -8,7 +8,7 @@
* 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/i386/ts_386ex/start/start.S b/c/src/lib/libbsp/i386/ts_386ex/start/start.S
index 1add645b37..53c28c5585 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/start/start.S
+++ b/c/src/lib/libbsp/i386/ts_386ex/start/start.S
@@ -2,14 +2,14 @@
* This file is the main boot and configuration file for the TS-1325. It is
* solely responsible for initializing the internal register set to reflect
* the proper board configuration. This version is modified from the i386ex
- * BSP startup:
+ * BSP startup:
*
* 1) 1 MB RAM @ 0x0100000
* 2) 1 MB RAM @ 0x0 but with standard DOS memory usage.
* 3) Timer0 used as RTEMS clock ticker, 1 msec tick rate.
* 4) READY# is generated by CPU
*
- * The file describes the ".initial" section, which contains:
+ * The file describes the ".initial" section, which contains:
* 1) device configuration code
* 2) interrupt descriptor table
* 3) global descriptor table
@@ -33,12 +33,12 @@
#include "80386ex.inc"
#include "ts_1325.inc" /* controls for LED and button */
-
+
/*
* NEW_GAS Needed for binutils 2.9.1.0.7 and higher
- */
+ */
- EXTERN (boot_card) /* exits to bspstart */
+ EXTERN (boot_card) /* exits to bspstart */
EXTERN (_DOS_seg_base) /* defined in startup/linkcmds */
EXTERN (Clock_exit)
@@ -49,34 +49,34 @@
PUBLIC( SYM(_init_i386ex) )
-
+
.section .initial, "ax"
/*
* Enable access to peripheral register at expanded I/O addresses
*/
-SYM(_init_i386ex):
+SYM(_init_i386ex):
.code16
/*
LED_GREEN
WAIT_BUTTON
*/
# cli Move this up for now for debug.
- movw $0x8000 , ax
+ movw $0x8000 , ax
outb al , $REMAPCFGH
xchg al , ah
outb al , $REMAPCFGL
outw ax , $REMAPCFG ;
-/*
+/*
LED_OFF
WAIT_BUTTON
*/
/*
* Configure operation of the A20 Address Line
- */
+ */
SYM(A20):
movw $PORT92 , dx
-
+
inb dx , al # clear A20 port reset
andb $0xfe , al # b0 Fast Reset(0)=disabled,(1)=reset triggered
orb $0x02 , al # Bit 1 Fast A20 = 0 (always 0) else enabled.
@@ -88,14 +88,14 @@ SYM(A20):
SYM(Watchdog):
movw $WDTSTATUS , dx # address the WDT status port
inb dx , al # get the WDT status
- orb $0x01 , al # set the CLKDIS bit
+ orb $0x01 , al # set the CLKDIS bit
outb al , dx # disable the clock to the WDT
/*
LED_GREEN
WAIT_BUTTON
*/
/*
- * Initialize Refresh Control Unit for:
+ * Initialize Refresh Control Unit for:
* Refresh Address = 0x0000
* Refresh gate between rows is 20.0 (???) uSec
@@ -108,7 +108,7 @@ SYM(Watchdog):
*/
/*
-SYM(InitRCU):
+SYM(InitRCU):
SetExRegWord( RFSCIR , 0x1F4) # refresh interval 500
SetExRegWord( RFSBAD , 0x0) # base address
SetExRegWord( RFSADD , 0x0) # address register
@@ -120,15 +120,15 @@ SYM(InitRCU):
WAIT_BUTTON
*/
/*
- * Initialize clock and power mgmt unit for:
+ * Initialize clock and power mgmt unit for:
* Clock Frequency = 50 Mhz
* Prescaled clock output = 1 Mhz
* Normal halt instructions
*
- * NOTE: Hope this doesn't change the COMCLK frequency
+ * NOTE: Hope this doesn't change the COMCLK frequency
*/
-
-SYM(InitClk):
+
+SYM(InitClk):
SetExRegByte( PWRCON, 0x0 )
SetExRegWord( CLKPRS, 0x17) # 0x13 for 1.19318 MHz. 0x17 for 1MHz.
@@ -140,7 +140,7 @@ SYM(InitClk):
WAIT_BUTTON
*/
/*
- * Initialize I/O port 1 for:
+ * Initialize I/O port 1 for:
* PIN 0 = 0, Inport for external push-button switch
* PIN 1 = 1, RTS0# to package pin
* PIN 2 = 1, DTR0# to package pin
@@ -151,7 +151,7 @@ SYM(InitClk):
* PIN 7 = 0, Inport ???
*/
-SYM(InitPort1):
+SYM(InitPort1):
SetExRegByte( P1LTC , 0xd1 )
SetExRegByte( P1DIR , 0x91)
SetExRegByte( P1CFG , 0x0e)
@@ -160,9 +160,9 @@ SYM(InitPort1):
WAIT_BUTTON
*/
/*
- * Initialize I/O port 2 for:
+ * Initialize I/O port 2 for:
* PIN 0 = 0, Outport ???
- * PIN 1 = 0, Outport ???
+ * PIN 1 = 0, Outport ???
* PIN 2 = 0, Outport ???
* PIN 3 = 0, Outport ???
* PIN 4 = 0, Outport ???
@@ -170,8 +170,8 @@ SYM(InitPort1):
* PIN 6 = 1, Int. periph, TXD0
* PIN 7 = 0, Outport ???
*/
-
-SYM(InitPort2):
+
+SYM(InitPort2):
SetExRegByte( P2LTC , 0x1f )
SetExRegByte( P2DIR , 0x00 )
SetExRegByte( P2CFG , 0x60)
@@ -180,18 +180,18 @@ SYM(InitPort2):
WAIT_BUTTON
*/
/*
- * Initialize I/O port 3 P3CFG
+ * Initialize I/O port 3 P3CFG
* PIN 0 = 1, Int. periph, TMROUT0
- * PIN 1 = 1, Int. periph, TMROUT1
- * PIN 2 = 1, Int. periph, INT0 (IR1)
- * PIN 3 = 1, Int. periph, INT1 (IR5)
- * PIN 4 = 1, Int. periph, INT2 (IR6)
- * PIN 5 = 1, Int. periph, INT2 (IR7)
+ * PIN 1 = 1, Int. periph, TMROUT1
+ * PIN 2 = 1, Int. periph, INT0 (IR1)
+ * PIN 3 = 1, Int. periph, INT1 (IR5)
+ * PIN 4 = 1, Int. periph, INT2 (IR6)
+ * PIN 5 = 1, Int. periph, INT2 (IR7)
* PIN 6 = 0, Outport ???
* PIN 7 = 1, Int. periph, COMCLK used for serial I/O
*/
-
-SYM(InitPort3):
+
+SYM(InitPort3):
SetExRegByte( P3LTC , 0x00 )
SetExRegByte( P3DIR , 0xbf )
SetExRegByte( P3CFG , 0xbf ) # can check TMROUT0
@@ -200,7 +200,7 @@ SYM(InitPort3):
WAIT_BUTTON
*/
/*
- * Initialize Peripheral Pin Configurations:
+ * Initialize Peripheral Pin Configurations:
* PIN 0 = 1, Select RTS1#
* PIN 1 = 1, Select DTR1#
* PIN 2 = 1, Select TXD1#
@@ -210,23 +210,23 @@ SYM(InitPort3):
* PIN 6 = 0, Select CS6#
* PIN 7 = 0, Don't care
*/
-
-SYM(InitPeriph):
- SetExRegByte( PINCFG , 0x3f)
+
+SYM(InitPeriph):
+ SetExRegByte( PINCFG , 0x3f)
/*
LED_GREEN
WAIT_BUTTON
*/
/*
- * Initialize the Asynchronous Serial Ports:
+ * Initialize the Asynchronous Serial Ports:
* BIT 7 = 1, Internal SIO1 modem signals
* BIT 6 = 1, Internal SIO0 modem signals
* BIT 2 = 0, PSCLK for SSIO clock
- * BIT 1 = 1, SERCLK for SIO1 clock
+ * BIT 1 = 1, SERCLK for SIO1 clock
* BIT 0 = 1, SERCLK for SIO0 clock
*/
-SYM(InitSIO):
+SYM(InitSIO):
SetExRegByte( SIOCFG, 0x00 ) # COMCLK -> baud-rate generator
# modem signals -> package pins
SetExRegByte( LCR0, 0x80 ) # latch DLL0, DLH0
@@ -235,8 +235,8 @@ SYM(InitSIO):
SetExRegByte( LCR0, 0x03 ) # enable r/w buffers, IER0 accessible
# mode 8-n-1
SetExRegByte( IER0, 0x00 ) # no generated interrupts
-
- SetExRegByte( LCR1, 0x80 ) # latch DLL0, DLH0
+
+ SetExRegByte( LCR1, 0x80 ) # latch DLL0, DLH0
SetExRegByte( DLL1, 0x01 ) # 0x0C set to 9600 baud, 0x6 = 19.2K
SetExRegByte( DLH1, 0x00 ) # 0x4 is 28.8K baud
SetExRegByte( LCR1, 0x03 ) # enable r/w buffers, IER1 accessible
@@ -251,43 +251,43 @@ SYM(InitMCR):
SetExRegByte( MCR1, 0x03 ) # standard mode, RTS,DTR activated
/*
- * Initialize Timer for:
+ * Initialize Timer for:
* BIT 7 = 1, Timer clocks disabled
* BIT 6 = 0, Reserved
* BIT 5 = 1, TMRCLK2 instead of Vcc to Gate2
* BIT 4 = 0, PSCLK to CLK2
* BIT 3 = 1, TMRCLK1 instead of Vcc to Gate1
* BIT 2 = 0, PSCLK to Gate1
- * BIT 1 = 0, Vcc to Gate0
+ * BIT 1 = 0, Vcc to Gate0
* BIT 0 = 0, PSCLK to Gate0
*/
/*
LED_YELLOW
WAIT_BUTTON
*/
-SYM(InitTimer):
- SetExRegByte(TMRCFG , 0x80 ) # All counters disabled, Gates 0,1
+SYM(InitTimer):
+ SetExRegByte(TMRCFG , 0x80 ) # All counters disabled, Gates 0,1
# and 2 are set to Vcc
SetExRegByte(TMRCON , 0x34 ) # prepare to write counter 0 LSB,MSB
SetExRegByte(TMR0 , 0x00 ) # sfa
- SetExRegByte(TMR0 , 0x00 ) # sfa
+ SetExRegByte(TMR0 , 0x00 ) # sfa
+
-
SetExRegByte(TMRCON , 0x70 ) # mode 0 disables on Gate= Vcc
- SetExRegByte(TMR1 , 0x00 ) # sfa
SetExRegByte(TMR1 , 0x00 ) # sfa
-
+ SetExRegByte(TMR1 , 0x00 ) # sfa
+
SetExRegByte(TMRCON , 0xB0 ) # mode 0 disables on gate =Vcc
- SetExRegByte(TMR2 , 0x00 ) #
- SetExRegByte(TMR2 , 0x00 ) #
+ SetExRegByte(TMR2 , 0x00 ) #
+ SetExRegByte(TMR2 , 0x00 ) #
/*
LED_GREEN
WAIT_BUTTON
*/
/*
- * Initialize the DMACFG register for:
+ * Initialize the DMACFG register for:
* BIT 7 = 1 , Disable DACK#1
* BITs 6:4 = 100, TMROUT2 connected to DRQ1
* BIT 3 = 1 , Disable DACK0#
@@ -315,7 +315,7 @@ SYM(InitTimer):
*/
SYM(InitInt):
-
+
cli # !
/*
LED_YELLOW
@@ -330,7 +330,7 @@ SYM(InitInt):
SetExRegByte(ICW2M , 0x20 ) # base vector starts at byte 32
SetExRegByte(ICW3M , 0x04) # internal slave cascaded from master IR2
SetExRegByte(ICW4M , 0x01 ) # idem
-
+
SetExRegByte(OCW1M , 0xfb ) # mask master IRQs, but not IR2 (cascade)
SetExRegByte(OCW1S , 0xff ) # mask all slave IRQs
SetExRegByte(INTCFG , 0x00 ) # slave IRs -> Vss or SSIOINT
@@ -346,11 +346,11 @@ SYM(InitInt):
/*
NOTE: not sure about this so comment out...
-SYM(SetCS4):
+SYM(SetCS4):
SetExRegWord(CS4ADL , 0x702) #Configure chip select 4
SetExRegWord(CS4ADH , 0x00)
- SetExRegWord(CS4MSKH, 0x03F)
- SetExRegWord(CS4MSKL, 0xFC01)
+ SetExRegWord(CS4MSKH, 0x03F)
+ SetExRegWord(CS4MSKL, 0xFC01)
*/
/*
LED_GREEN
@@ -364,10 +364,10 @@ SYM(SetCS4):
movl $SYM(GDTR), eax
andl $0xFFFF, eax
-#ifdef NEW_GAS
+#ifdef NEW_GAS
addr32
data32
-#endif
+#endif
#if 0
lgdt (eax) # location of GDT in segment
@@ -375,11 +375,11 @@ SYM(SetCS4):
lgdt SYM(GDTR) # location of GDT
/*
- NOTE: not sure about this either so comment out for now...
-SYM(SetUCS):
+ NOTE: not sure about this either so comment out for now...
+SYM(SetUCS):
SetExRegWord(UCSADL, 0xC503) # values taken from TS-1325 memory
SetExRegWord(UCSADH, 0x000D)
- SetExRegWord(UCSMSKH, 0x0000)
+ SetExRegWord(UCSMSKH, 0x0000)
SetExRegWord(UCSMSKL, 0x3C01) # configure upper chip select
*/
/*
@@ -392,7 +392,7 @@ SYM(SetUCS):
mov cr0, eax
orw $0x1, ax
mov eax, cr0
-
+
/**************************
* Flush prefetch queue,
* and load CS selector
@@ -406,7 +406,7 @@ SYM(SetUCS):
/*
* Load the segment registers
*/
-SYM(_load_segment_registers):
+SYM(_load_segment_registers):
.code32
/*
LED_GREEN
@@ -417,7 +417,7 @@ SYM(_load_segment_registers):
pLOAD_SEGMENT( GDT_DATA_PTR, ss)
pLOAD_SEGMENT( GDT_DATA_PTR, ds)
pLOAD_SEGMENT( GDT_DATA_PTR, es)
-
+
/*
* Set up the stack
*/
@@ -482,7 +482,7 @@ SYM (zero_bss):
.balign 4 # align tables to 4 byte boundary
SYM(IDTR): DESC3( SYM(Interrupt_descriptor_table), 0x07ff );
-
+
SYM(Interrupt_descriptor_table): /* Now in data section */
.rept 256
.word 0,0,0,0
@@ -493,8 +493,8 @@ SYM(Interrupt_descriptor_table): /* Now in data section */
* Use the first (null) entry in the the GDT as a self-pointer for the GDTR.
* (looks like a common trick)
*/
-
-SYM (_Global_descriptor_table):
+
+SYM (_Global_descriptor_table):
SYM(GDTR): DESC3( GDTR, 0x17 ); # one less than the size
.word 0 # padding to DESC2 size
SYM(GDT_CODE): DESC2(0xffff,0,0x0,0x9B,0xDF,0x00);
diff --git a/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c b/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c
index aca43a4d56..e84334c41c 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/startup/bspstart.c
@@ -13,10 +13,10 @@
*
* Ported to the i386ex and submitted by:
*
- * Erik Ivanenko
+ * Erik Ivanenko
* University of Toronto
* erik.ivanenko@utoronto.ca
- *
+ *
* $Id$
*/
@@ -45,7 +45,7 @@ extern uint32_t rdb_start;
/*
* Use the shared implementations of the following routines
*/
-
+
void bsp_postdriver_hook(void);
void bsp_libc_init( void *, uint32_t, int );
@@ -62,7 +62,7 @@ void bsp_libc_init( void *, uint32_t, int );
* not yet initialized.
*
*/
-
+
void bsp_pretasking_hook(void)
{
extern int heap_bottom;
diff --git a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c
index c4301d39aa..3125165466 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/timer/timer.c
@@ -33,7 +33,7 @@ rtems_boolean Timer_driver_Find_average_overhead;
extern void timerisr();
-/*
+/*
* Number of us per timer interrupt. Note: 1 us == 1 tick.
*/
@@ -87,7 +87,7 @@ static rtems_raw_irq_connect_data timer_raw_irq_data = {
static rtems_raw_irq_connect_data old_raw_irq_data = {
BSP_PERIODIC_TIMER + BSP_IRQ_VECTOR_BASE,
-};
+};
void Timer_exit()
{
@@ -143,7 +143,7 @@ int Read_timer(void)
/* latch the count */
outport_byte (TIMER_MODE, TIMER_SEL0|TIMER_LATCH );
- /* read the count */
+ /* read the count */
inport_byte (TIMER_CNTR0, lsb );
inport_byte (TIMER_CNTR0, msb );
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c
index 1df43db4a3..ede6acd692 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/init.c
@@ -1,4 +1,4 @@
-/*
+/*
* COPYRIGHT (c) 1989-1997.
* On-Line Applications Research Corporation (OAR).
*
@@ -30,7 +30,7 @@ pid_t getpid()
* of the "Ada environment task". Otherwise, we would be
* stuck with the defaults set by RTEMS.
*/
-
+
void *start_gnat_main( void * argument )
{
extern int gnat_main ( int argc, char **argv, char **envp );
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/serial_debug.adb b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/serial_debug.adb
index f89e290764..5250d82fee 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/serial_debug.adb
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/debug_ada/serial_debug.adb
@@ -63,4 +63,3 @@ begin
I386_Stub_Glue_Init_Breakin;
end Serial_Debug;
-
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c
index 6b3342f91b..5e87ddf6e2 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/listener/init.c
@@ -1,4 +1,4 @@
-/*
+/*
* COPYRIGHT (c) 1989-1997.
* On-Line Applications Research Corporation (OAR).
*
@@ -32,7 +32,7 @@ pid_t getpid()
* of the "Ada environment task". Otherwise, we would be
* stuck with the defaults set by RTEMS.
*/
-
+
void *start_gnat_main( void * argument )
{
extern int gnat_main ( int argc, char **argv, char **envp );
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/networkconfig.h b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/networkconfig.h
index 41dfbe11d4..6b424ccb96 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/networkconfig.h
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/networkconfig.h
@@ -1,9 +1,9 @@
/*
* Network configuration
- *
+ *
************************************************************
* EDIT THIS FILE TO REFLECT YOUR NETWORK CONFIGURATION *
- * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! *
+ * BEFORE RUNNING ANY RTEMS PROGRAMS WHICH USE THE NETWORK! *
************************************************************
*
* $Id$
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c
index e05eb635d4..5590ad8f2a 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/network_ada/tcprelay/init.c
@@ -1,4 +1,4 @@
-/*
+/*
* COPYRIGHT (c) 1989-1997.
* On-Line Applications Research Corporation (OAR).
*
@@ -32,7 +32,7 @@ pid_t getpid()
* of the "Ada environment task". Otherwise, we would be
* stuck with the defaults set by RTEMS.
*/
-
+
void *start_gnat_main( void * argument )
{
extern int gnat_main ( int argc, char **argv, char **envp );
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/i386_ports.ads b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/i386_ports.ads
index c27ea646e7..44090c4f4b 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/i386_ports.ads
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/i386_ports.ads
@@ -43,5 +43,3 @@ private
P3DIR: constant Port_Address := 16#F874#;
end I386_Ports;
-
-
diff --git a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c
index 7d3c2026ea..faa6f9876f 100644
--- a/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c
+++ b/c/src/lib/libbsp/i386/ts_386ex/tools/ts_1325_ada/init.c
@@ -1,4 +1,4 @@
-/*
+/*
* COPYRIGHT (c) 1989-1997.
* On-Line Applications Research Corporation (OAR).
*
@@ -28,7 +28,7 @@ pid_t getpid()
* of the "Ada environment task". Otherwise, we would be
* stuck with the defaults set by RTEMS.
*/
-
+
void *start_gnat_main( void * argument )
{
extern int gnat_main ( int argc, char **argv, char **envp );