summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/i386
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-11-30 05:09:41 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-11-30 05:09:41 +0000
commit359e5374164ccb2a66833354b412a859c144ea2f (patch)
tree6f065d7d6247bc255f43ddb0152fc26c50bd4f87 /c/src/lib/libbsp/i386
parentWhitespace removal. (diff)
downloadrtems-359e5374164ccb2a66833354b412a859c144ea2f.tar.bz2
Whitespace removal.
Diffstat (limited to 'c/src/lib/libbsp/i386')
-rw-r--r--c/src/lib/libbsp/i386/i386ex/timer/timer.c2
-rw-r--r--c/src/lib/libbsp/i386/pc386/clock/ckinit.c18
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/console.c4
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/fb_vga.c12
-rw-r--r--c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c6
-rw-r--r--c/src/lib/libbsp/i386/pc386/ide/ide.c52
-rw-r--r--c/src/lib/libbsp/i386/pc386/ide/idecfg.c10
-rw-r--r--c/src/lib/libbsp/i386/pc386/start/start.S6
-rw-r--r--c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c2
-rw-r--r--c/src/lib/libbsp/i386/pc386/startup/ldsegs.S4
10 files changed, 58 insertions, 58 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/timer/timer.c b/c/src/lib/libbsp/i386/i386ex/timer/timer.c
index 96f013f9eb..00ff157628 100644
--- a/c/src/lib/libbsp/i386/i386ex/timer/timer.c
+++ b/c/src/lib/libbsp/i386/i386ex/timer/timer.c
@@ -1,4 +1,4 @@
-/*
+/*
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR).
*
diff --git a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c
index 328844ed6c..ebc935b0e7 100644
--- a/c/src/lib/libbsp/i386/pc386/clock/ckinit.c
+++ b/c/src/lib/libbsp/i386/pc386/clock/ckinit.c
@@ -84,7 +84,7 @@ uint32_t bsp_clock_nanoseconds_since_last_tick_tsc(void)
/******
* Get nanoseconds using Pentium-compatible TSC register
******/
-
+
uint64_t diff_nsec;
diff_nsec = rdtsc() - pc586_tsc_at_tick;
@@ -106,7 +106,7 @@ uint32_t bsp_clock_nanoseconds_since_last_tick_tsc(void)
return (uint32_t)diff_nsec;
}
-
+
uint32_t bsp_clock_nanoseconds_since_last_tick_i8254(void)
{
@@ -179,7 +179,7 @@ static void calibrate_tsc(void)
begin_time = rdtsc();
for (i = rtems_clock_get_ticks_per_second() * pc386_isrs_per_tick;
- i != 0; --i ) {
+ i != 0; --i ) {
/* We know we've just completed a tick when timer goes from low to high */
then_lsb = then_msb = 0xff;
do {
@@ -200,7 +200,7 @@ static void calibrate_tsc(void)
#if 0
printk( "CPU clock at %u MHz\n", (uint32_t)(pc586_tsc_per_tick / 1000000));
#endif
-
+
pc586_tsc_per_tick /= rtems_clock_get_ticks_per_second();
}
@@ -218,7 +218,7 @@ static void clockOn(
pc386_clock_click_count = US_TO_TICK(pc386_microseconds_per_isr);
#if 0
- printk( "configured usecs per tick=%d \n",
+ printk( "configured usecs per tick=%d \n",
rtems_configuration_get_microseconds_per_tick() );
printk( "Microseconds per ISR =%d\n", pc386_microseconds_per_isr );
printk( "final ISRs per=%d\n", pc386_isrs_per_tick );
@@ -267,7 +267,7 @@ void Clock_driver_support_initialize_hardware(void)
{
bool use_tsc = false;
bool use_8254 = false;
-
+
#if (CLOCK_DRIVER_USE_TSC == 1)
use_tsc = true;
#endif
@@ -275,7 +275,7 @@ void Clock_driver_support_initialize_hardware(void)
#if (CLOCK_DRIVER_USE_8254 == 1)
use_8254 = true;
#endif
-
+
if ( !use_tsc && !use_8254 ) {
if ( x86_has_tsc() ) use_tsc = true;
else use_8254 = true;
@@ -284,12 +284,12 @@ void Clock_driver_support_initialize_hardware(void)
if ( use_8254 ) {
/* printk( "Use 8254\n" ); */
Clock_driver_support_at_tick = Clock_driver_support_at_tick_empty;
- Clock_driver_nanoseconds_since_last_tick =
+ Clock_driver_nanoseconds_since_last_tick =
bsp_clock_nanoseconds_since_last_tick_i8254;
} else {
/* printk( "Use TSC\n" ); */
Clock_driver_support_at_tick = Clock_driver_support_at_tick_tsc;
- Clock_driver_nanoseconds_since_last_tick =
+ Clock_driver_nanoseconds_since_last_tick =
bsp_clock_nanoseconds_since_last_tick_tsc;
}
diff --git a/c/src/lib/libbsp/i386/pc386/console/console.c b/c/src/lib/libbsp/i386/pc386/console/console.c
index d31f2a2413..49addc8d85 100644
--- a/c/src/lib/libbsp/i386/pc386/console/console.c
+++ b/c/src/lib/libbsp/i386/pc386/console/console.c
@@ -228,8 +228,8 @@ console_initialize(rtems_device_major_number major,
void *arg)
{
rtems_status_code status;
-
-
+
+
/* Initialize the KBD interface */
kbd_init();
diff --git a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c b/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
index 96251f8951..bc6a171225 100644
--- a/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
+++ b/c/src/lib/libbsp/i386/pc386/console/fb_vga.c
@@ -86,7 +86,7 @@ rtems_device_driver frame_buffer_initialize(
printk("Error registering /dev/fb0 FBVGA framebuffer device!\n");
rtems_fatal_error_occurred( status );
}
-
+
return RTEMS_SUCCESSFUL;
}
@@ -102,13 +102,13 @@ rtems_device_driver frame_buffer_open(
if (pthread_mutex_trylock(&mutex)== 0){
/* restore previous state. for VGA this means return to text mode.
* leave out if graphics hardware has been initialized in
- * frame_buffer_initialize()
+ * frame_buffer_initialize()
*/
ega_hwinit();
- printk( "FBVGA open called.\n" );
+ printk( "FBVGA open called.\n" );
return RTEMS_SUCCESSFUL;
}
-
+
return RTEMS_UNSATISFIED;
}
@@ -145,7 +145,7 @@ rtems_device_driver frame_buffer_read(
rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *)arg;
rw_args->bytes_moved = ((rw_args->offset + rw_args->count) > fb_fix.smem_len ) ? (fb_fix.smem_len - rw_args->offset) : rw_args->count;
memcpy(rw_args->buffer, (const void *) (fb_fix.smem_start + rw_args->offset), rw_args->bytes_moved);
- return RTEMS_SUCCESSFUL;
+ return RTEMS_SUCCESSFUL;
}
/*
@@ -160,7 +160,7 @@ rtems_device_driver frame_buffer_write(
rtems_libio_rw_args_t *rw_args = (rtems_libio_rw_args_t *)arg;
rw_args->bytes_moved = ((rw_args->offset + rw_args->count) > fb_fix.smem_len ) ? (fb_fix.smem_len - rw_args->offset) : rw_args->count;
memcpy( (void *) (fb_fix.smem_start + rw_args->offset), rw_args->buffer, rw_args->bytes_moved);
- return RTEMS_SUCCESSFUL;
+ return RTEMS_SUCCESSFUL;
}
static int get_fix_screen_info( struct fb_fix_screeninfo *info )
diff --git a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
index e4635bd361..7c5b4bfa17 100644
--- a/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
+++ b/c/src/lib/libbsp/i386/pc386/console/ps2_mouse.c
@@ -96,10 +96,10 @@ static int isr_is_on(const rtems_irq_connect_data *irq)
}
static rtems_irq_connect_data ps2_isr_data = { AUX_IRQ,
- ps2_mouse_interrupt,
+ ps2_mouse_interrupt,
0,
- isr_on,
- isr_off,
+ isr_on,
+ isr_off,
isr_is_on };
/*
diff --git a/c/src/lib/libbsp/i386/pc386/ide/ide.c b/c/src/lib/libbsp/i386/pc386/ide/ide.c
index 602fd00a29..ccfe5fd865 100644
--- a/c/src/lib/libbsp/i386/pc386/ide/ide.c
+++ b/c/src/lib/libbsp/i386/pc386/ide/ide.c
@@ -87,7 +87,7 @@ static bool pc386_ide_status_busy (uint32_t port,
{
volatile uint8_t status;
int polls;
-
+
do
{
polls = 500;
@@ -121,14 +121,14 @@ static bool pc386_ide_status_data_ready (uint32_t port,
{
volatile uint8_t status;
int polls;
-
+
do
{
polls = 1000;
while (polls)
{
inport_byte (port + IDE_REGISTER_STATUS, status);
-
+
if (((status & IDE_REGISTER_STATUS_BSY) == 0) &&
(status & IDE_REGISTER_STATUS_DRQ))
{
@@ -229,7 +229,7 @@ void pc386_ide_initialize
char model_number[41];
char* p = &model_number[0];
bool data_ready;
-
+
memset(model_number, 0, sizeof(model_number));
outport_byte(port+IDE_REGISTER_DEVICE_HEAD,
@@ -240,11 +240,11 @@ void pc386_ide_initialize
*/
outport_byte(port+IDE_REGISTER_COMMAND, 0x00);
-
+
if (!pc386_ide_status_busy (port, PC386_IDE_PROBE_TIMEOUT,
&status, pc386_ide_prestart_sleep))
continue;
-
+
inport_byte(port+IDE_REGISTER_STATUS, status);
inport_byte(port+IDE_REGISTER_ERROR, error);
inport_byte(port+IDE_REGISTER_CYLINDER_LOW, cyllsb);
@@ -294,15 +294,15 @@ void pc386_ide_initialize
if (!data_ready)
continue;
-
+
byte = 0;
while (byte < 512)
{
uint16_t word;
-
+
if (pc386_ide_show && ((byte % 16) == 0))
printk("\n %04x : ", byte);
-
+
inport_word(port+IDE_REGISTER_DATA, word);
if (pc386_ide_show)
@@ -314,7 +314,7 @@ void pc386_ide_initialize
heads = word;
if (byte == 12)
sectors = word;
-
+
if (byte >= 54 && byte < (54 + 40))
{
*p = word >> 8;
@@ -325,10 +325,10 @@ void pc386_ide_initialize
if (byte == (47 * 2))
max_multiple_sectors = word & 0xff;
-
+
if (byte == (49 * 2))
capabilities = word;
-
+
if (byte == (59 * 2))
{
if (word & (1 << 8))
@@ -339,10 +339,10 @@ void pc386_ide_initialize
lba_sectors = word;
if (byte == (61 * 2))
lba_sectors |= word << 16;
-
+
byte += 2;
}
-
+
if (pc386_ide_show)
printk("\nbytes read = %d\n", byte);
@@ -359,7 +359,7 @@ void pc386_ide_initialize
size = cylinders * heads * sectors;
size /= 2;
-
+
if (size > (1024 * 1024))
{
size = (size * 10) / (1000 * 1000);
@@ -378,7 +378,7 @@ void pc386_ide_initialize
left = size / 10;
right = size % 10;
-
+
p--;
while (*p == ' ')
{
@@ -390,7 +390,7 @@ void pc386_ide_initialize
minor, label, model_number, left, right, units,
heads, cylinders, sectors, max_multiple_sectors * 512);
}
-
+
#if IDE_CLEAR_MULTI_SECTOR_COUNT
if (max_multiple_sectors)
{
@@ -417,14 +417,14 @@ void pc386_ide_initialize
}
}
#endif
-
+
outport_byte(port+IDE_REGISTER_DEVICE_CONTROL,
IDE_REGISTER_DEVICE_CONTROL_nIEN);
wait(10000);
}
pc386_ide_timeout = PC386_IDE_TASKING_TIMEOUT;
-
+
/*
* FIXME: enable interrupts, if needed
*/
@@ -535,7 +535,7 @@ void pc386_ide_read_block
uint16_t *lbuf;
uint8_t status_val;
int b;
-
+
if (!pc386_ide_status_data_ready (port, pc386_ide_timeout,
&status_val, pc386_ide_tasking_sleep))
{
@@ -544,7 +544,7 @@ void pc386_ide_read_block
/* FIXME: add an error here. */
return;
}
-
+
if (status_val & IDE_REGISTER_STATUS_ERR)
{
inport_byte(port+IDE_REGISTER_ERROR, status_val);
@@ -553,7 +553,7 @@ void pc386_ide_read_block
}
lbuf = (uint16_t*)((uint8_t*)(bufs[(*cbuf)].buffer) + (*pos));
-
+
for (b = 0; b < (ATA_SECTOR_SIZE / 2); b++)
{
inport_word(port+IDE_REGISTER_DATA,*lbuf);
@@ -614,7 +614,7 @@ void pc386_ide_write_block
uint16_t *lbuf;
uint8_t status_val;
int b;
-
+
if (!pc386_ide_status_data_ready (port, pc386_ide_timeout,
&status_val, pc386_ide_tasking_sleep))
{
@@ -623,16 +623,16 @@ void pc386_ide_write_block
/* FIXME: add an error here. */
return;
}
-
+
if (status_val & IDE_REGISTER_STATUS_ERR)
{
inport_byte(port+IDE_REGISTER_ERROR, status_val);
printk ("pc386_ide_write_block: error: %02x\n", status_val);
return;
}
-
+
lbuf = (uint16_t*)(((uint8_t*)bufs[*cbuf].buffer) + (*pos));
-
+
for (b = 0; b < (ATA_SECTOR_SIZE / 2); b++)
{
#if PC386_IDE_DEBUG_OUT
diff --git a/c/src/lib/libbsp/i386/pc386/ide/idecfg.c b/c/src/lib/libbsp/i386/pc386/ide/idecfg.c
index 35797d9ee4..f0f5bfe7cb 100644
--- a/c/src/lib/libbsp/i386/pc386/ide/idecfg.c
+++ b/c/src/lib/libbsp/i386/pc386/ide/idecfg.c
@@ -77,13 +77,13 @@ void bsp_ide_cmdline_init(void)
bool ide1 = IDE1_DEFAULT;
bool ide2 = IDE2_DEFAULT;
const char* ide;
-
+
/*
* Can have:
* --ide=0,1
*/
ide = bsp_cmdline_arg ("--ide=");
-
+
if (ide)
{
int i;
@@ -91,9 +91,9 @@ void bsp_ide_cmdline_init(void)
* If a command line option exists remove the defaults.
*/
ide1 = ide2 = false;
-
+
ide += sizeof ("--ide=") - 1;
-
+
for (i = 0; i < 3; i++)
{
switch (ide[i])
@@ -133,7 +133,7 @@ void bsp_ide_cmdline_init(void)
* type information.
*/
ide = bsp_cmdline_arg ("--ide-show");
-
+
if (ide)
pc386_ide_show = true;
}
diff --git a/c/src/lib/libbsp/i386/pc386/start/start.S b/c/src/lib/libbsp/i386/pc386/start/start.S
index 904bc57fa2..d4d1ec0fa2 100644
--- a/c/src/lib/libbsp/i386/pc386/start/start.S
+++ b/c/src/lib/libbsp/i386/pc386/start/start.S
@@ -104,7 +104,7 @@ speakl: jmp speakl # and SPIN!!!
/* Save multiboot info if we detect a multiboot loader */
cmp $0x2badb002,eax
jne 2f
-
+
/* We have multiboot info; let's hope DS and ES are OK... */
movl ebx, SYM(_boot_multiboot_info_p)
/* Check for memory size info and save */
@@ -231,7 +231,7 @@ SYM (zero_bss):
jne 1f
movl $SYM (no_sse_msg), 0(esp)
jmp SYM(_sse_panic)
-1:
+1:
#ifdef __SSE2__
testl $0x04000000, eax
jne 1f
@@ -301,7 +301,7 @@ SYM(_boot_multiboot_cmdline):
.rept 256 /* cmd line */
.byte 0
.endr
-
+
PUBLIC(_stack_size)
SYM(_stack_size):
.long STACK_SIZE
diff --git a/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c b/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c
index b43b61b7db..df11f8505d 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c
+++ b/c/src/lib/libbsp/i386/pc386/startup/bspgetworkarea.c
@@ -94,7 +94,7 @@ void bsp_size_memory(void)
break;
}
}
-
+
topAddr = (i-1)*1024*1024 - 4;
} else {
printk( "hardcoded\n" );
diff --git a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S
index 6f1e370cfe..942c9ec465 100644
--- a/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S
+++ b/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S
@@ -222,7 +222,7 @@ SYM(Interrupt_descriptor_table):
.rept 256
.word 0,0,0,0
.endr
-
+
/*---------------------------------------------------------------------------+
| Descriptor of IDT
+--------------------------------------------------------------------------*/
@@ -231,7 +231,7 @@ SYM(Interrupt_descriptor_table):
SYM(idtdesc):
.word (256*8 - 1)
.long SYM (Interrupt_descriptor_table)
-
+
END_DATA
.section .m_hdr