Remove duplicate white lines.

This commit is contained in:
Ralf Corsepius
2004-04-21 16:01:48 +00:00
parent 6128a4aa5e
commit f05b2ac0bc
403 changed files with 33 additions and 2026 deletions

View File

@@ -14,7 +14,6 @@
#define Clock_driver_support_install_isr( _new, _old ) \
do { _old = 0; } while(0)
#define Clock_driver_support_initialize_hardware()
#define Clock_driver_support_shutdown_hardware()

View File

@@ -14,7 +14,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#ifndef __BSP_H_
#define __BSP_H_

View File

@@ -10,7 +10,6 @@
*
*/
#ifndef __REGS_H__
#define __REGS_H__
@@ -22,8 +21,6 @@
extern volatile unsigned long *Regs; /* Chip registers */
#endif
/*
* Here must be "defined" each register, to use with Regs as
* LM_Regs[REGISTER1] = value
@@ -32,7 +29,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define REGISTER1 1
#define REGISTER2 2
/*
* define for UART registers to be able
* to compile and link arm_bare_bsp

View File

@@ -16,7 +16,6 @@
#include <bsp.h>
#include <registers.h>
void BSP_rtems_irq_mngt_init() {
/*

View File

@@ -12,14 +12,12 @@
* $Id$
*/
#include <bsp.h>
#include <irq.h>
#include <registers.h>
#include <rtems/score/thread.h>
#include <rtems/score/apiext.h>
/*
* This function check that the value given for the irq line
* is valid.
@@ -103,8 +101,6 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
return 1;
}
void _ThreadProcessSignalsFromIrq (CPU_Exception_frame* ctx)
{
/*

View File

@@ -110,7 +110,6 @@ typedef struct __rtems_irq_connect_data__ {
*/
void BSP_rtems_irq_mngt_init();
/*
* function to connect a particular irq handler. This hanlder will NOT be called
* directly as the result of the corresponding interrupt. Instead, a RTEMS
@@ -159,7 +158,6 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* ptr);
*/
int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data*);
#ifdef __cplusplus
}
#endif

View File

@@ -29,18 +29,15 @@
.equ I_Bit, 0x80
.equ F_Bit, 0x40
.text
.globl _start
_start:
/*
* Here is the code to initialize the low-level BSP environment
* (Chip Select, PLL, ....?)
/* Copy data from FLASH to RAM */
LDR r0, =_initdata /* load address of region */
LDR r1, =0x400000 /* execution address of region */
@@ -61,7 +58,6 @@ zi_init:
STRLOT r2, [r0], #4
BLO zi_init
/* Load basic ARM7 interrupt table */
VectorInit:
MOV R8, #0

View File

@@ -13,7 +13,6 @@
|
+--------------------------------------------------------------------------*/
#include <bsp.h>
#include <rtems/libcsupport.h>
#include <rtems/libio.h>
@@ -81,7 +80,6 @@ void bsp_pretasking_hook(void)
rtemsFreeMemStart += _heap_size; /* HEAP_SIZE in KBytes */
#ifdef RTEMS_DEBUG
rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
@@ -90,7 +88,6 @@ void bsp_pretasking_hook(void)
} /* bsp_pretasking_hook */
/*-------------------------------------------------------------------------+
| Function: bsp_start
| Description: Called before main is invoked.

View File

@@ -13,7 +13,6 @@
|
+--------------------------------------------------------------------------*/
#include <stdio.h>
#include <bsp.h>
#include <rtems/bspIo.h>

View File

@@ -14,7 +14,6 @@
#define Clock_driver_support_install_isr( _new, _old ) \
do { _old = 0; } while(0)
#define Clock_driver_support_initialize_hardware()
#define Clock_driver_support_shutdown_hardware()

View File

@@ -11,8 +11,6 @@
#define ENTRY(name) \
_ENTRY(_C_LABEL(name))
ENTRY(_sys_exit)
lda 257,g13
calls g13

View File

@@ -64,7 +64,6 @@ _mainCRTStartup:
ldr a3, .LC2
sub a3, a3, a1 /* Third arg: length of block */
#ifdef __thumb__ /* Enter Thumb mode.... */
add a4, pc, #1 /* Get the address of the Thumb block */

View File

@@ -25,7 +25,6 @@ do_AngelSWI (int reason, void * arg)
}
#endif /* ARM_RDI_MONITOR */
void
abort_program (void)
{

View File

@@ -30,7 +30,6 @@
#define SWI_InstallHandler 0x70
#define SWI_GenerateError 0x71
/* Now the SWI numbers and reason codes for RDI (Angel) monitors */
#define AngelSWI_ARM (0x123456)
#ifdef __thumb__

View File

@@ -16,7 +16,6 @@
#include <bsp.h>
#include <irq.h>
rtems_isr clock_isr(rtems_vector_number vector);
rtems_isr Clock_isr(rtems_vector_number vector);
static void clock_isr_on(const rtems_irq_connect_data *unused);
@@ -43,7 +42,6 @@ rtems_irq_connect_data clock_isr_data = {BSP_TC1OI,
BSP_install_rtems_irq_handler(&clock_isr_data); \
} while(0)
/*
* Set up the clock hardware
*/
@@ -74,5 +72,4 @@ static int clock_isr_is_on(const rtems_irq_connect_data *irq)
return 1;
}
#include "../../../shared/clockdrv_shell.c"

View File

@@ -100,8 +100,6 @@ int uart_poll_read(int minor)
return -1;
}
err = *data_reg;
c = err & 0xff;
err &= (EP7312_UART_FRMERR | EP7312_UART_PARERR | EP7312_UART_OVERR);
@@ -157,5 +155,4 @@ static void uart_init(int minor)
EP7312_UART_FIFOEN |
0x17); /* 9600 baud */
}

View File

@@ -50,17 +50,12 @@ extern rtems_configuration_table BSP_Configuration;
#define Lower_tm27_intr()
/*
* Network driver configuration
*/
#define RTEMS_BSP_NETWORK_DRIVER_NAME "eth0"
#define RTEMS_BSP_NETWORK_DRIVER_ATTACH cs8900_driver_attach
#ifdef __cplusplus
}
#endif

View File

@@ -67,8 +67,6 @@ typedef enum {
BSP_MAX_INT,
} rtems_irq_symbolic_name;
/*
* Type definition for RTEMS managed interrupts
*/
@@ -137,7 +135,6 @@ typedef struct __rtems_irq_connect_data__ {
*/
void BSP_rtems_irq_mngt_init();
/*
* function to connect a particular irq handler. This hanlder will NOT be called
* directly as the result of the corresponding interrupt. Instead, a RTEMS

View File

@@ -14,7 +14,6 @@
* $Id$
*/
/* Some standard definitions...*/
.equ Mode_USR, 0x10
@@ -29,11 +28,9 @@
.equ I_Bit, 0x80
.equ F_Bit, 0x40
.text
.globl _start
_start:
/* store the sp */
mov r12, sp

View File

@@ -78,7 +78,6 @@ void bsp_pretasking_hook(void)
uint32_t heap_start;
uint32_t heap_size;
/*
* Set up the heap. It uses all free SDRAM except that reserved
* for non-cached uses.
@@ -98,7 +97,6 @@ void bsp_pretasking_hook(void)
} /* bsp_pretasking_hook */
/**************************************************************************/
/* */
/* NAME: bsp_start_default - BSP initialization function */
@@ -152,7 +150,6 @@ void bsp_start_default( void )
*/
rtems_irq_mngt_init();
/*
* The following information is very useful when debugging.
*/
@@ -175,9 +172,6 @@ void bsp_start_default( void )
#endif
} /* bsp_start */
/*
* By making this a weak alias for bsp_start_default, a brave soul
* can override the actual bsp_start routine used.

View File

@@ -47,7 +47,6 @@ int BSPPrintkPort = BSP_UART_COM1;
int BSPBaseBaud = 115200;
/*-------------------------------------------------------------------------+
| External Prototypes
+--------------------------------------------------------------------------*/
@@ -70,7 +69,6 @@ BSP_output_char_function_type BSP_output_char =
BSP_polling_getchar_function_type BSP_poll_char =
(BSP_polling_getchar_function_type) BSP_poll_char_via_serial;
static rtems_irq_connect_data console_isr_data = {BSP_UART,
BSP_uart_termios_isr_com1,
isr_on,
@@ -125,7 +123,6 @@ void __assert (const char *file, int line, const char *msg)
}
/*-------------------------------------------------------------------------+
| Console device driver INITIALIZE entry point.
+--------------------------------------------------------------------------+
@@ -150,7 +147,6 @@ console_initialize(rtems_device_major_number major,
/* 38400-8-N-1 */
BSP_uart_init(BSPConsolePort, 38400, 0);
/* Set interrupt handler */
console_isr_data.name = BSP_UART;
console_isr_data.hdl = BSP_uart_termios_isr_com1;
@@ -179,7 +175,6 @@ console_initialize(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* console_initialize */
static int console_last_close(int major, int minor, void *arg)
{
BSP_remove_rtems_irq_handler (&console_isr_data);
@@ -243,7 +238,6 @@ console_close(rtems_device_major_number major,
return res;
} /* console_close */
/*-------------------------------------------------------------------------+
| Console device driver READ entry point.
+--------------------------------------------------------------------------+
@@ -259,7 +253,6 @@ console_read(rtems_device_major_number major,
} /* console_read */
/*-------------------------------------------------------------------------+
| Console device driver WRITE entry point.
+--------------------------------------------------------------------------+
@@ -275,8 +268,6 @@ console_write(rtems_device_major_number major,
} /* console_write */
/*
* Handle ioctl request.
*/

View File

@@ -222,7 +222,6 @@ BSP_uart_intr_ctrl(int uart, int cmd)
return;
}
/*
* Status function, -1 if error
* detected, 0 if no received chars available,
@@ -269,7 +268,6 @@ BSP_uart_polled_status(int uart)
return BSP_UART_STATUS_ERROR;
}
/*
* Polled mode write function
*/
@@ -330,7 +328,6 @@ BSP_poll_char_via_serial()
return BSP_uart_polled_read(BSPConsolePort);
}
/* ================ Termios support =================*/
static volatile int termios_stopped_com1 = 0;
@@ -422,7 +419,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len)
return 0;
}
/* If there TX buffer is busy - something is royally screwed up */
assert((uread(BSP_UART_COM2, LSR) & THRE) != 0);
@@ -453,7 +449,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len)
return 0;
}
void
BSP_uart_termios_isr_com1(void)
{

View File

@@ -26,7 +26,6 @@ _ISR_Handler:
stmdb sp!, {r0, r1, r2, r3, r12} /* save regs on INT stack */
stmdb sp!, {lr} /* now safe to call C funcs */
/* one nest level deeper */
ldr r0, =_ISR_Nest_level
ldr r1, [r0]
@@ -111,7 +110,6 @@ bframe:
ldmia sp!, {r1} /* out with the old */
stmdb sp!, {lr} /* in with the new (lr) */
orr r0, r0, #0xc0
msr spsr, r0
@@ -120,8 +118,6 @@ exitit:
ldmia sp!, {r0, r1, r2, r3, r12} /* restore regs from INT stack */
subs pc, lr, #4 /* return */
/* on entry to _ISR_Dispatch, we're in SVC mode */
.globl _ISR_Dispatch
_ISR_Dispatch:

View File

@@ -14,7 +14,6 @@
#define Clock_driver_support_install_isr( _new, _old ) \
do { _old = 0; } while(0)
#define Clock_driver_support_initialize_hardware()
#define Clock_driver_support_shutdown_hardware()

View File

@@ -14,7 +14,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#ifndef __BSP_H_
#define __BSP_H_

View File

@@ -10,7 +10,6 @@
*
*/
#ifndef __LMREGS_H__
#define __LMREGS_H__
@@ -28,8 +27,6 @@
extern volatile unsigned long *Regs; /* Chip registers */
#endif
/******************************************************************************
* RADIO CONTROLLER BLOCK 0x0C00 - 0x0FFF *
******************************************************************************
@@ -71,7 +68,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define ADCPERIOD ((RC_BASE+0x7C)/4)
#define SYNTIOCNTL ((RC_BASE+0x80)/4) /* added 30/08/99 */
/* modified 30/08/99 by LHT */
#define SHAPE0 ((RC_BASE+0x100)/4) /* previously 0x80 */
#define SHAPE1 ((RC_BASE+0x104)/4)
@@ -121,7 +117,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define TSTRXD ((PLP_BASE+0x78)/4)
#define PLPID ((PLP_BASE+0x7C)/4)
/** ENCRYPTION ENGINE 0x1800 - 0x1BFF */
#define EE_BASE 0x1800
@@ -250,7 +245,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define RSCNT ((UART_BASE+0x20)/4)
/*PRODUCT_VERSION*/
/** THUMB and INTERFACES BLOCK 0x3400 - 0x4FFF */
#define TIM_BASE 0x3400
@@ -333,8 +327,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define SLEEPTIMER ((TI_BASE+0x204)/4)
#define SLEEPCNTL ((TI_BASE+0x208)/4)
/******************************************************************************
* BIT MASKS for Chip registers
******************************************************************************
@@ -358,8 +350,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define MSK_TADCMD 0x0F /* Mask on TADCMD */
#define CONTINUE 0x10
/** RADIO CONTROLER BLOCK (RC3) */
/* SLICECNTL register */
@@ -461,7 +451,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
/* RCCNTL register */
#define RCCNTL_ENABLE 0x80
/* ADCCNTL1 register */
#define ADCSTART 0x80
#define SCAN 0x40
@@ -474,8 +463,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define ADCDWN1 0x04
#define ADCDWN2 0x08
/** PLP BLOCK */
/* DCNTL0 register */
@@ -511,7 +498,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define MSK_PRES 0x0F /* mask on PRES field */
/* PLPALIN register */
#define SYNM 0x08
#define BITSLIP 0x10
@@ -537,7 +523,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
/* Bit ENABLE already defined */
#define EECNTL_ENABLE 0x80
/** PAINT+ BLOCK */
/* PAINTCNTL register */
@@ -555,7 +540,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define FORCE13 0x4000
#define PAINTENB 0x8000
/* PAINTPLLCNTL register */
#define MSK_MC 0x001F /* Mask on MC field */
#define MCSIGN 0x0020
@@ -649,7 +633,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define G726ENB0 0x0001
#define G726ENB1 0x0003
/** GENERAL REGISTERS BLOCK */
/* RINGCNTL register */
@@ -730,7 +713,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define PWM0_PADENB 0x20
#define MIRROR 0x10
/* LCDEECNTL1 register */
/* Bit ENABLE already defined */
#define LCDEE_ENABLE 0x80
@@ -788,7 +770,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define CSMODE_16_WHWL 0x0002
#define CSMODE_16_BHBL 0x0003
/* MUXADCNTL register */
#define MSK_AHOLD 0x0007
#define MSK_ALEWIDTH 0x0070
@@ -815,11 +796,9 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define ADDRESS_1M 0x3000
#define ADDRESS_2M 0x4000
/* CSGCNTL register */
#define CSSWITCH 0x0040
/* SLEEPCNTL register */
#define EXPIRED 0x01
#define SLEEP_ENABLE 0x80
@@ -828,12 +807,10 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define WDSTROKE 0x80
#define WDFLAG 0x80 /* same bit */
/* DCC register */
/* bit ENABLE=0x80 already defined */
#define DCC_ENABLE 0x80
/* TIMERCNTL[0:1] register */
/* bit ENABLE=0x80 already defined */
#define TIMER_ENABLE 0x80
@@ -844,7 +821,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define TIMER_216kHz 0x0001
#define TIMER_27kHz 0x0000
/* INTMASKALL register */
#define MASKIRQ 0x80
#define MASKFIQ 0x40
@@ -880,7 +856,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
/* INTHPAI register */
#define AUTOACK 0x0080
/******************************************************************************
* Memory Mapping definition
******************************************************************************
@@ -899,7 +874,6 @@ extern volatile unsigned long *Regs; /* Chip registers */
#define REGS_BASE_ADR 0x000F0000 /* Base Address of registers */
#define RADRAM_BASE_ADR 0x000F0000 /* Base Address of registers */
/******************************************************************************
* Slot Control bloc
******************************************************************************
@@ -1067,10 +1041,6 @@ typedef LM_SCB *LM_SCB_P; /* pointer to Slot Control Block */
#define LM_WIN_OPEN 0x3F /* wide open window size */
#define MSK_WINSZ 0x3F
/*
* Some macros to mask the VEGA+ interrupt sources
******************************************************************************
@@ -1085,7 +1055,6 @@ typedef LM_SCB *LM_SCB_P; /* pointer to Slot Control Block */
#define LM_MaskSTX() (LM_Regs[RSIER] &= ~TX_INT_ENABLE)
#define LM_MaskUARTStatus() (LM_Regs[RSIER] &= ~LINE_STATUS_ENABLE)
#define LM_MaskTMR0() (LM_Regs[INTMASK] |= TMR0)
#define LM_MaskTMR1() (LM_Regs[INTMASK] |= TMR1)
#define LM_MaskLCDEE() (LM_Regs[INTMASK] |= LCDEE)

View File

@@ -16,7 +16,6 @@
#include <bsp.h>
#include <registers.h>
void BSP_rtems_irq_mngt_init() {
/* Initialize the vector table address in internal RAM */

View File

@@ -12,14 +12,12 @@
* $Id$
*/
#include <bsp.h>
#include <irq.h>
#include <registers.h>
#include <rtems/score/thread.h>
#include <rtems/score/apiext.h>
/*
* This function check that the value given for the irq line
* is valid.
@@ -121,8 +119,6 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
return 1;
}
void _ThreadProcessSignalsFromIrq (CPU_Exception_frame* ctx)
{
/*

View File

@@ -135,7 +135,6 @@ typedef struct __rtems_irq_connect_data__ {
*/
void BSP_rtems_irq_mngt_init();
/*
* function to connect a particular irq handler. This hanlder will NOT be called
* directly as the result of the corresponding interrupt. Instead, a RTEMS
@@ -184,7 +183,6 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* ptr);
*/
int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data*);
#ifdef __cplusplus
}
#endif

View File

@@ -40,12 +40,10 @@
.equ I_Bit, 0x80
.equ F_Bit, 0x40
.equ Mode_SVC_MIRQ, Mode_SVC | I_Bit | F_Bit
.equ Mode_SVC_UIRQ, Mode_SVC
.equ Mode_IRQ_MIRQ, Mode_SVC | I_Bit | F_Bit
.equ MARK_STACK, 0 /*Fill every stack with a pattern for debug (0 or 1)*/
/*-----------------------------------------------------------------------------
@@ -129,7 +127,6 @@ Real_start:
LDR r1, =0xA2
STR r1, [r0,#CSCNTL1_2]
MOV r0,#CNTL_CLK_ADR
/* Load clock mode 55 MHz */
LDR r1, =0x0010
@@ -155,7 +152,6 @@ zi_init:
STRLOT r2, [r0], #4
BLO zi_init
/* Load basic ARM7 interrupt table */
VectorInit:
MOV R8, #0

View File

@@ -13,7 +13,6 @@
|
+--------------------------------------------------------------------------*/
#include <bsp.h>
#include <rtems/libcsupport.h>
#include <rtems/libio.h>
@@ -77,7 +76,6 @@ void bsp_pretasking_hook(void)
rtemsFreeMemStart += _heap_size; /* HEAP_SIZE in KBytes */
#ifdef RTEMS_DEBUG
rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
@@ -86,7 +84,6 @@ void bsp_pretasking_hook(void)
} /* bsp_pretasking_hook */
/*-------------------------------------------------------------------------+
| Function: bsp_start
| Description: Called before main is invoked.

View File

@@ -13,7 +13,6 @@
|
+--------------------------------------------------------------------------*/
#include <stdio.h>
#include <bsp.h>
#include <rtems/bspIo.h>

View File

@@ -53,7 +53,6 @@ rtems_isr_entry Old_ticker;
void Clock_exit( void );
/*
* Isr Handler
*/

View File

@@ -107,7 +107,6 @@ rtems_device_driver console_open(
0 /* outputUsesInterrupts */
};
assert( minor <= 1 );
if ( minor > 2 )
return RTEMS_INVALID_NUMBER;

View File

@@ -30,7 +30,6 @@ extern "C" {
#include <rtems/console.h>
#include <rtems/iosupp.h>
/*
* Define the time limits for RTEMS Test Suite test durations.
* Long test and short test duration limits are provided. These
@@ -42,7 +41,6 @@ extern "C" {
#define MAX_LONG_TEST_DURATION 300 /* 5 minutes = 300 seconds */
#define MAX_SHORT_TEST_DURATION 3 /* 3 seconds */
/*
* Stuff for Time Test 27
*/
@@ -83,7 +81,6 @@ extern "C" {
* NOTE: Use the standard Clock driver entry
*/
/*
* Information placed in the linkcmds file.
*/

View File

@@ -35,7 +35,6 @@ void Timer_initialize( void )
* implemenations of timer but ....
*/
c4x_timer_stop(C4X_TIMER_0);
c4x_timer_set_period(C4X_TIMER_0, 0xffffffff); /* so no interupts */
c4x_timer_start(C4X_TIMER_0);

View File

@@ -82,7 +82,6 @@ static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER,
ClockOff,
ClockIsOn};
rtems_device_driver Clock_initialize(
rtems_device_major_number major,
rtems_device_minor_number minor,

View File

@@ -116,7 +116,6 @@ console_initialize(rtems_device_major_number major,
/* 9600-8-N-1, no hardware flow control */
BSP_uart_init(BSPConsolePort, 9600, CHR_8_BITS, 0, 0, 0);
/* Set interrupt handler */
if(BSPConsolePort == BSP_UART_COM1)
{
@@ -159,7 +158,6 @@ console_initialize(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* console_initialize */
static int console_last_close(int major, int minor, void *arg)
{
BSP_remove_rtems_irq_handler (&console_isr_data);
@@ -226,7 +224,6 @@ console_close(rtems_device_major_number major,
} /* console_close */
/*-------------------------------------------------------------------------+
| Console device driver READ entry point.
+--------------------------------------------------------------------------+
@@ -249,7 +246,6 @@ console_read(rtems_device_major_number major,
} /* console_read */
/*-------------------------------------------------------------------------+
| Console device driver WRITE entry point.
+--------------------------------------------------------------------------+
@@ -264,8 +260,6 @@ console_write(rtems_device_major_number major,
} /* console_write */
/*
* Handle ioctl request.
*/

View File

@@ -56,7 +56,6 @@ extern "C" {
#define MUST_WAIT_FOR_INTERRUTPT 0
#define Install_tm27_vector(handler) \
{ \
rtems_isr_entry dummy; \
@@ -104,7 +103,6 @@ extern "C" {
#define Is_tx_ready( _status ) ( (_status) & 0x40 )
#define Is_rx_ready( _status ) ( (_status) & 0x01 )
/* Structures */

View File

@@ -14,7 +14,6 @@ void printk_time(void);
#define KERNEL
/*
EII: Oct 16 : Version 0.0
@@ -62,12 +61,10 @@ int count_rx = 0;
#include <rtems/asm.h>
#include <string.h>
/* #include "../misc/utils.h" */
static struct uti596_softc uti596_softc;
static int scbStatus;
static struct i596_cmd *pIsrCmd;
static struct i596_rfd *pIsrRfd;
@@ -103,7 +100,6 @@ char uti596initSetup[] = {
#define RBUF_SIZE 1520
/*
* Local Routines
*/
@@ -177,8 +173,6 @@ uti596_request_reset(void){
rtems_panic ("Can't notify resetDaemon: %s\n", rtems_status_text (sc));
}
static void uti596_maskOn(const rtems_irq_connect_data* irq)
{
/*
@@ -202,7 +196,6 @@ static int uti596_isOn(const rtems_irq_connect_data* irq)
return BSP_irq_enabled_at_i8259s (irq->name);
}
/***********************************************************************
* Function: uti596initRFA(int num) ( New )
*
@@ -214,13 +207,11 @@ static int uti596_isOn(const rtems_irq_connect_data* irq)
*
***********************************************************************/
int uti596_initRFA(int num)
{
struct i596_rfd *pRfd;
int i = 0;
#ifdef DBG_596
printf ("%s: uti596_initRFA %d.\n", num);
#endif
@@ -285,7 +276,6 @@ int uti596_initRFA(int num)
printf ( "Head of RFA is buffer @ %p \n", uti596_softc.pBeginRFA );
#endif
uti596_softc.pSavedRfdQueue =
uti596_softc.pEndSavedQueue = I596_NULL; /* initially empty */
@@ -309,7 +299,6 @@ void uti596supplyFD(struct i596_rfd * pRfd )
{
struct i596_rfd *pLastRfd;
UTI_596_ASSERT(pRfd != I596_NULL, "Supplying NULL RFD!\n");
pRfd -> cmd = CMD_EOL;
pRfd -> pRbd = I596_NULL;
@@ -406,7 +395,6 @@ void uti596supplyFD(struct i596_rfd * pRfd )
uti596_softc.pEndSavedQueue = pRfd; /* reset end of saved queue */
uti596_softc.savedCount++;
return;
}
}
@@ -520,7 +508,6 @@ uti596_reset_hardware(struct uti596_softc *sc)
rtems_status_code status_code;
struct i596_cmd *pCmd;
printf("uti596_reset_hardware\n");
pCmd = sc->pCmdHead; /* This is a tx command for sure (99.99999%) */
@@ -543,7 +530,6 @@ uti596_reset_hardware(struct uti596_softc *sc)
printf("reset_hardware:change scp address to : %p\n",sc->pScp);
#endif
/* change the scp address */
#ifdef DBG_RESET
printf("Change the SCP address\n");
@@ -625,7 +611,6 @@ uti596_reset_hardware(struct uti596_softc *sc)
*
***********************************************************************/
void
uti596_initMem(struct uti596_softc * sc)
{
@@ -736,7 +721,6 @@ uti596_initMem(struct uti596_softc * sc)
}
/***********************************************************************
* Function: uti596dump
@@ -751,7 +735,6 @@ uti596dump(char * pDumpArea)
struct i596_dump dumpCmd;
int boguscnt = 25000000; /* over a second! */
#ifdef DBG_596
printf("uti596dump:\n");
#endif
@@ -771,7 +754,6 @@ printf("uti596dump:\n");
return 1; /* successful completion */
}
}
/***********************************************************************
@@ -852,7 +834,6 @@ uti596_rxDaemon(void *arg)
#endif
frames++;
/*
* Allocate an mbuf to give to the stack
* The format of the data portion of the RFD is:
@@ -1044,7 +1025,6 @@ void uti596reset(void)
#endif
/* restore the RFA */
/*dumpQ();*/
@@ -1149,8 +1129,6 @@ void uti596reset(void)
#endif
pCmd->status = 0;
pCmd->command |= (CMD_EOL | CMD_INTR ); /* all commands last in list & return an interrupt */
@@ -1181,7 +1159,6 @@ void uti596reset(void)
_ISR_Enable(level);
}
#ifdef DBG_596
printf("Scb status & command 0x%x 0x%x\n",
uti596_softc.scb.status,
@@ -1398,14 +1375,12 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
}
} while( m != NULL && ++bd_count < 16 );
/* This should never happen */
if ( bd_count == 16 ) {
printf("TX ERROR:Too many mbufs in the packet!!!\n");
printf("Must coalesce!\n");
}
if ( length < UTI_596_ETH_MIN_SIZE ) {
pTbd->data = sc->zeroes; /* add padding to pTbd */
pTbd->size = UTI_596_ETH_MIN_SIZE - length; /* zeroes have no effect on the CRC */
@@ -1431,7 +1406,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
/* Sending Zero length packet: shouldn't happen */
if (pTbd->size <= 0) return ;
#ifdef DEBUG_INIT_2
printf("\nTransmitter adds packet\n");
print_hdr ( sc->pTxCmd->pTbd->data ); /* print the first part */
@@ -1442,7 +1416,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
BREAKPOINT();
#endif
/* add the command to the output command queue */
uti596addCmd ( (struct i596_cmd *) sc->pTxCmd );
@@ -1502,7 +1475,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
m = n;
}
}
/***********************************************************************
@@ -1608,7 +1580,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
*/
}
}
#ifdef DEBUG_INIT
@@ -1647,7 +1618,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
printf ("frame type %2.2X%2.2X\n", add[12], add[13]);
}
/***********************************************************************
* Function: print_pkt
@@ -1735,7 +1705,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
printf("ICMP sequence nbr: %2.2x %2.2x\n", add[40], add[41]);
}
}
/***********************************************************************
* Function: print_echo
@@ -1827,7 +1796,6 @@ void send_packet(struct ifnet *ifp, struct mbuf *m)
*
***********************************************************************/
int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
{
struct uti596_softc *sc = &uti596_softc; /* soft config */
@@ -1838,7 +1806,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
printf("attach");
#endif
sc->started = 0; /* The NIC is not started yet */
sc->ioAddr = IO_ADDR;
@@ -1895,7 +1862,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
sc->started = 1;
sc->pInboundFrameQueue = I596_NULL;
ifp->if_ioctl = uti596_ioctl;
ifp->if_init = uti596_init;
ifp->if_start = uti596_start;
@@ -2221,7 +2187,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
}
} /* end if command complete */
/* if the receiver has stopped,
* check if this is a No Resources scenario,
* Try to add more RFD's ( no RBDs are used )
@@ -2320,7 +2285,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
uti596_softc.savedCount = 0;
}
#ifdef DBG_596_RFD
printk("The list starts here %p\n",uti596_softc.pBeginRFA );
#endif
@@ -2363,7 +2327,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
printk("Frame @ %x, status: %x, cmd: %x\n",
pISR_Rfd, pISR_Rfd->stat, pISR_Rfd->cmd);
printk("\nSaved: \n");
for ( pISR_Rfd = uti596_softc.pSavedRfdQueue;
pISR_Rfd != I596_NULL;
@@ -2396,7 +2359,6 @@ int uti596_attach(struct rtems_bsdnet_ifconfig * pConfig )
return;
}
/***********************************************************************
* Function: void uti596dequeue
*
@@ -2424,7 +2386,6 @@ struct i596_rfd * uti596dequeue( struct i596_rfd ** ppQ )
*ppQ = pRfd->next; /* advance the queue pointer */
pRfd->next = I596_NULL; /* unlink the rfd being returned */
_ISR_Enable(level);
return pRfd;
}
@@ -2485,7 +2446,6 @@ void uti596append( struct i596_rfd ** ppQ , struct i596_rfd * pRfd )
*
***********************************************************************/
/* static */
void uti596_stop(struct uti596_softc *sc)
{
@@ -2502,7 +2462,6 @@ void uti596_stop(struct uti596_softc *sc)
}
static int
uti596_ioctl (struct ifnet *ifp, int command, caddr_t data)
{
@@ -2570,7 +2529,6 @@ uti596_ioctl (struct ifnet *ifp, int command, caddr_t data)
*
***********************************************************************/
void
uti596_stats(struct uti596_softc *sc)
{
@@ -2669,7 +2627,6 @@ void show_buffers (void)
printf("Frame @ %p, status: %2.2x, cmd: %2.2x\n",
pRfd, pRfd->stat, pRfd->cmd);
printf("\nSaved: \n");
for ( pRfd = uti596_softc.pSavedRfdQueue;
pRfd != I596_NULL;
@@ -2683,7 +2640,6 @@ void show_queues(void)
{
struct i596_rfd *pRfd;
printf("CMD: 0x%x, Status: 0x%x\n",
uti596_softc.scb.command,
uti596_softc.scb.status);
@@ -2707,13 +2663,11 @@ void show_queues(void)
printf("uti596_softc.pEndRFA: %p\n",uti596_softc.pEndRFA);
}
void uti596_init(void * arg){
struct uti596_softc *sc = arg;
struct ifnet *ifp = &sc->arpcom.ac_if;
if (sc->txDaemonTid == 0) {
uti596_initialize_hardware(sc);
@@ -2727,7 +2681,6 @@ void uti596_init(void * arg){
sc->resetDaemonTid = rtems_bsdnet_newproc ("UTrt", 2*4096,
uti596_resetDaemon, sc);
#ifdef DBG_INIT
printf("After attach, status of board = 0x%x\n", sc->scb.status );
#endif

View File

@@ -55,8 +55,6 @@ struct enet_statistics{
int nic_reset_count; /* The number of times uti596reset() has been called. */
};
enum commands {
CmdNOp = 0,
CmdSASetup = 1,
@@ -68,10 +66,8 @@ enum commands {
CmdDiagnose = 7
};
#define UTI596_MUTEX 1
#define CMD_EOL 0x8000 /* The last command of the list, stop. */
#define CMD_SUSP 0x4000 /* Suspend after doing cmd. */
#define CMD_INTR 0x2000 /* Interrupt after doing cmd. */
@@ -86,7 +82,6 @@ enum commands {
#define SCB_CUS_SUSPENDED 0x0100
#define SCB_CUS_ACTIVE 0x0200
#define STAT_C 0x8000 /* Set to 1 after execution */
#define STAT_B 0x4000 /* 1 : Cmd being executed, 0 : Cmd done. */
#define STAT_OK 0x2000 /* 1: Command executed ok 0 : Error */
@@ -101,7 +96,6 @@ enum commands {
#define STAT_S5 0x0020
#define STAT_MAX_COLLS 0x000F
#define RBD_STAT_P 0x4000 /* prefetch */
#define RBD_STAT_F 0x4000 /* used */
@@ -118,7 +112,6 @@ enum commands {
#define RU_NO_RESOURCES 0x0020
#define RU_READY 0x0040
#define IO_ADDR 0x360
#define PORT_ADDR IO_ADDR
#define CHAN_ATTN PORT_ADDR + 4
@@ -168,7 +161,6 @@ struct tx_cmd {
unsigned short pad;
} ;
/*
* Receive Frame Descriptor
*/
@@ -182,7 +174,6 @@ struct i596_rfd {
char data [1532 ];
} ;
struct i596_dump {
struct i596_cmd cmd;
char * pData;
@@ -227,7 +218,6 @@ struct i596_scb {
volatile unsigned short t_off;
};
/*
* Intermediate System Control Block
*/

View File

@@ -47,7 +47,6 @@
#define OCW3MDOS 0x0020
#define OCW3SDOS 0x00A0
/* CONFIGURATION Registers */
#define DMACFG 0xF830
#define INTCFG 0xF832

View File

@@ -28,19 +28,16 @@
*
* $Id$
changes:
SetExRegByte(ICW3S , 0x02 ) # MUST be 0x02 according to intel
SetExRegByte(ICW3M , 0x04 ) # IR2 is cascaded internally: was 0x02 => IR1 is cascaded
*/
#include <rtems/asm.h>
#include "macros.inc"
#include "80386ex.inc"
/*
* NEW_GAS Needed for binutils 2.9.1.0.7 and higher
*/
@@ -76,7 +73,6 @@ SYM(GDT_END):
END_DATA
/* This section is the section that is used by the interrupt
descriptor table. It is used to provide the IDT with the
correct vector offsets. It is for symbol definition only.
@@ -131,7 +127,6 @@ SYM(A20):
orb $0x02 , al # Bit 1 Fast A20 = 0 (always 0) else enabled.
outb al , dx
SYM(Watchdog):
movw $WDTSTATUS , dx # address the WDT status port
inb dx , al # get the WDT status
@@ -284,7 +279,6 @@ SYM(InitTimer):
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
@@ -342,7 +336,6 @@ SYM(InitInt):
# for IR0 and IR2 use 0xfa
SetExRegByte(INTCFG , 0x00 )
SYM(SetCS4):
SetExRegWord(CS4ADL , 0x702) #Configure chip select 4
SetExRegWord(CS4ADH , 0x00)
@@ -383,7 +376,6 @@ SYM(SetUCS1):
lgdt SYM(GDTR) # location of GDT
#endif
SYM(SetUCS):
SetExRegWord(UCSADL, 0x0702) # now 512K starting at 0x3f80000.
SetExRegWord(UCSADH, 0x03f8)
@@ -472,7 +464,6 @@ SYM (zero_bss):
repne # while ecx != 0
stosl # clear a long in the bss
/*
* Transfer control to User's Board Support Package
*/

View File

@@ -80,7 +80,6 @@ void bsp_pretasking_hook(void)
heap_size &= 0xfffffff0; /* keep it as a multiple of 16 bytes */
bsp_libc_init((void *) heap_start, heap_size, 0);
#ifdef RTEMS_DEBUG
rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
#endif

View File

@@ -23,7 +23,6 @@
* $Id$
*/
#include <rtems.h>
#include <bsp.h>
#include <stdlib.h>

View File

@@ -58,6 +58,9 @@
*
* MODIFICATION/HISTORY:
* $Log$
* Revision 1.3 2004/04/21 10:42:43 ralf
* Remove stray white spaces.
*
* Revision 1.2 1999/12/13 21:21:31 joel
* Warning removal patch from Philip A. Prindeville <philipp@zembu.com>.
*
@@ -151,7 +154,6 @@ struct isa_device
u_int id_irq; /* interrupt request */
};
struct ep_board
{
int epb_addr; /* address of this board */
@@ -162,7 +164,6 @@ struct ep_board
u_short res_cfg; /* resource configuration */
};
/*
* Ethernet software status per interface.
*/
@@ -192,7 +193,6 @@ struct ep_softc
short rx_overrunl;
};
/* static unsigned long loopc; */
static volatile unsigned long overrun;
static volatile unsigned long resend;
@@ -216,7 +216,6 @@ static char *ep_conn_type[] = {"UTP", "AUI", "???", "BNC"};
#define ep_fset(f) (sc->stat|=(f))
#define ep_frst(f) (sc->stat&=~(f))
/* forward declarations for functions */
static int ep_attach( struct ep_softc *sc );
static int ep_isa_probe( struct isa_device *is );
@@ -231,7 +230,6 @@ static void ep_intr( struct ep_softc *sc );
/* external functions */
extern void Wait_X_ms( unsigned int timeToWait ); /* timer.c ??? */
/**********************************************************************************
*
* DESCRIPTION: Writes a buffer of data to the I/O port. The data is sent to the
@@ -285,7 +283,6 @@ static __inline void outsb( unsigned short io_addr, unsigned char *out_data, int
}
}
/**********************************************************************************
*
* DESCRIPTION: Read a buffer of data from an I/O port. The data is read as 16 bits
@@ -338,7 +335,6 @@ static __inline void insb( unsigned short io_addr, unsigned char *in_data, int l
}
}
/**********************************************************************************
*
* DESCRIPTION: Writes a word to the I/O port.
@@ -354,7 +350,6 @@ static __inline void outw( unsigned short io_addr, unsigned short out_data )
outport_word( io_addr, out_data );
}
/**********************************************************************************
*
* DESCRIPTION: Routine to read a word as defined in FreeBSD.
@@ -395,7 +390,6 @@ static __inline unsigned char inb( unsigned short io_addr )
return in_data;
}
/**********************************************************************************
*
* DESCRIPTION:
@@ -423,7 +417,6 @@ static int get_eeprom_data( int id_port, int offset )
return( data );
}
/**********************************************************************************
*
* DESCRIPTION: Waits until the EEPROM of the card is ready to be accessed.
@@ -464,7 +457,6 @@ u_short get_e( struct ep_softc *sc, int offset )
return( inw( BASE + EP_W0_EEPROM_DATA ) );
}
/**********************************************************************************
*
* DESCRIPTION:
@@ -485,7 +477,6 @@ static rtems_isr ap_interrupt_handler( rtems_vector_number v )
rtems_event_send( sc->rxDaemonTid, INTERRUPT_EVENT );
}
/**********************************************************************************
*
* DESCRIPTION:
@@ -510,7 +501,6 @@ static int _3c509_IsOn(const rtems_irq_connect_data* irq)
return BSP_irq_enabled_at_i8259s (irq->name);
}
/**********************************************************************************
*
* DESCRIPTION:
@@ -568,7 +558,6 @@ static void _3c509_rxDaemon (void *arg)
printf ("3C509: RX Daemon is finishing.\n");
}
/**********************************************************************************
*
* DESCRIPTION: Driver transmit daemon
@@ -601,7 +590,6 @@ static void _3c509_txDaemon (void *arg)
printf ("3C509: TX Daemon is finishing.\n");
}
/**********************************************************************************
*
* DESCRIPTION: Activates the trabsmitter task...
@@ -680,7 +668,6 @@ static void _3c509_stop (struct ep_softc *sc)
outw(BASE + EP_COMMAND, SET_RX_FILTER);
}
/**********************************************************************************
*
* DESCRIPTION: Show interface statistics
@@ -857,7 +844,6 @@ int rtems_3c509_driver_attach (struct rtems_bsdnet_ifconfig *config )
return 1;
}
/**********************************************************************************
*
* DESCRIPTION:
@@ -971,8 +957,6 @@ static struct ep_board *ep_look_for_board_at( struct isa_device *is )
}
}
/**********************************************************************************
*
* DESCRIPTION:
@@ -1039,8 +1023,6 @@ static int ep_isa_probe( struct isa_device *is )
return (EP_IOSIZE); /* 16 bytes of I/O space used. */
}
/**********************************************************************************
*
* DESCRIPTION:
@@ -1127,7 +1109,6 @@ static int ep_attach( struct ep_softc *sc )
return 0;
}
/**********************************************************************************
*
* DESCRIPTION:
@@ -1255,7 +1236,6 @@ static void epinit( struct ep_softc *sc )
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE; /* just in case */
sc->rx_no_first = sc->rx_no_mbuf =
sc->rx_bpf_disc = sc->rx_overrunf = sc->rx_overrunl =
sc->tx_underrun = 0;
@@ -1278,7 +1258,6 @@ static void epinit( struct ep_softc *sc )
GO_WINDOW(1);
}
static const char padmap[] = {0, 3, 2, 1};
/**********************************************************************************
@@ -1386,8 +1365,6 @@ readcheck:
goto startagain;
}
/**********************************************************************************
*
* DESCRIPTION: Routine to read frames from the card.
@@ -1530,8 +1507,6 @@ out:
outw(BASE + EP_COMMAND, SET_RX_EARLY_THRESH | RX_INIT_EARLY_THRESH);
}
/**********************************************************************************
*
* DESCRIPTION:

View File

@@ -37,7 +37,6 @@
#include "elink.h"
extern void outb( unsigned short io_addr, unsigned char out_data );
/*

View File

@@ -30,7 +30,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#include <stdlib.h>
#include <bsp.h>
@@ -109,7 +108,6 @@ void clockOff(const rtems_irq_connect_data* unused)
outport_byte(TIMER_CNTR0, 0);
} /* Clock_exit */
/*-------------------------------------------------------------------------+
| Function: Install_clock
| Description: Initialize and install clock interrupt handler.
@@ -177,8 +175,6 @@ static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER,
clockOff,
clockIsOn};
/*-------------------------------------------------------------------------+
| Clock device driver INITIALIZE entry point.
+--------------------------------------------------------------------------+
@@ -202,7 +198,6 @@ Clock_initialize(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* Clock_initialize */
/*-------------------------------------------------------------------------+
| Console device driver CONTROL entry point
+--------------------------------------------------------------------------*/
@@ -245,7 +240,6 @@ void Clock_exit()
| to be correctly integrated with the rest of the code!!!
+--------------------------------------------------------------------------*/
#if 0 && defined(pentium)
/* This can be used to get extremely accurate timing on a pentium. */

View File

@@ -31,7 +31,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#include <string.h>
#include <bsp.h>
@@ -70,7 +69,6 @@
#define RTC_CENTURY 0x32 /* current century - increment in Dec99 */
/*-------------------------------------------------------------------------+
| Auxiliary Functions
+--------------------------------------------------------------------------*/
@@ -107,7 +105,6 @@ ytos(uint16_t y)
return ((y - 1970) * SECS_PER_REG_YEAR + (y - 1970 + 1) / 4 * SECS_PER_DAY);
} /* ytos */
/*-------------------------------------------------------------------------+
| Function: mtos
| Description: Convert months to seconds since January.
@@ -144,7 +141,6 @@ rtcin(uint8_t what)
return r;
} /* rtcin */
/*-------------------------------------------------------------------------+
| Functions
+--------------------------------------------------------------------------*/
@@ -175,7 +171,6 @@ init_rtc(void)
printf("RTC BIOS diagnostic error %b\n", s, RTCDG_BITS); */
} /* init_rtc */
/*-------------------------------------------------------------------------+
| Function: rtc_read
| Description: Read present time from RTC and return it.

View File

@@ -125,7 +125,6 @@ ibmpc_console_write(int minor, const char *buf, int len)
return 0;
}
int kbd_poll_read( int minor )
{
if( rtems_kbpoll() )
@@ -174,7 +173,6 @@ void __assert (const char *file, int line, const char *msg)
}
/*-------------------------------------------------------------------------+
| Console device driver INITIALIZE entry point.
+--------------------------------------------------------------------------+
@@ -187,7 +185,6 @@ console_initialize(rtems_device_major_number major,
{
rtems_status_code status;
/* Initialize the KBD interface */
kbd_init();
@@ -241,7 +238,6 @@ console_initialize(rtems_device_major_number major,
/* 9600-8-N-1 */
BSP_uart_init(BSPConsolePort, 9600, CHR_8_BITS, 0, 0, 0);
/* Set interrupt handler */
if(BSPConsolePort == BSP_UART_COM1)
{
@@ -303,7 +299,6 @@ console_initialize(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* console_initialize */
static int console_open_count = 0;
static int console_last_close(int major, int minor, void *arg)
@@ -391,7 +386,6 @@ console_close(rtems_device_major_number major,
return rtems_termios_close (arg);
} /* console_close */
/*-------------------------------------------------------------------------+
| Console device driver READ entry point.
+--------------------------------------------------------------------------+
@@ -405,7 +399,6 @@ console_read(rtems_device_major_number major,
return rtems_termios_read( arg );
} /* console_read */
/*-------------------------------------------------------------------------+
| Console device driver WRITE entry point.
+--------------------------------------------------------------------------+
@@ -431,7 +424,6 @@ console_write(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* console_write */
extern int vt_ioctl( unsigned int cmd, unsigned long arg);
/*

View File

@@ -11,6 +11,9 @@
// MODIFICATION/HISTORY:
//
// $Log$
// Revision 1.2 2004/04/21 10:42:44 ralf
// Remove stray white spaces.
//
// Revision 1.1 2000/08/30 08:15:30 joel
// 2000-08-26 Rosimildo da Silva <rdasilva@connecttel.com>
//
@@ -66,7 +69,6 @@
extern void ega_hwinit( void );
extern void ega_hwterm( void );
/* screen information for the VGA driver */
static struct fb_screeninfo fb_info =
{
@@ -79,7 +81,6 @@ static struct fb_screeninfo fb_info =
FB_VISUAL_PSEUDOCOLOR /* color scheme used */
};
static __u16 red16[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0xaaaa, 0xaaaa, 0xaaaa, 0xaaaa,
0x5555, 0x5555, 0x5555, 0x5555, 0xffff, 0xffff, 0xffff, 0xffff
@@ -116,7 +117,6 @@ fbvga_initialize( rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
}
/*
* fbvga device driver OPEN entry point
*/
@@ -142,7 +142,6 @@ fbvga_close(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
}
/*
* fbvga device driver READ entry point.
* Read characters from the PS/2 mouse.
@@ -158,7 +157,6 @@ fbvga_read( rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
}
/*
* fbvga device driver WRITE entry point.
* Write characters to the PS/2 mouse.
@@ -174,14 +172,12 @@ fbvga_write( rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
}
static int get_screen_info( struct fb_screeninfo *info )
{
*info = fb_info;
return 0;
}
static int get_palette( struct fb_cmap *cmap )
{
__u32 i;
@@ -198,7 +194,6 @@ static int get_palette( struct fb_cmap *cmap )
return 0;
}
static int set_palette( struct fb_cmap *cmap )
{
__u32 i;
@@ -215,7 +210,6 @@ static int set_palette( struct fb_cmap *cmap )
return 0;
}
/*
* IOCTL entry point -- This method is called to carry
* all services of this interface.

View File

@@ -16,6 +16,9 @@
* MODIFICATION/HISTORY:
*
* $Log$
* Revision 1.3 2004/04/21 10:42:44 ralf
* Remove stray white spaces.
*
* Revision 1.2 2004/04/15 13:26:12 ralf
* Remove stray white spaces.
*
@@ -84,7 +87,6 @@ rtems_device_driver fbvga_close(
void *
);
rtems_device_driver fbvga_read(
rtems_device_major_number,
rtems_device_minor_number,

View File

@@ -58,8 +58,6 @@ extern unsigned char pckbd_sysrq_xlate[128];
#define aux_free_irq(dev_id) /* free_irq(AUX_IRQ, dev_id) */
/*
* include/linux/pc_keyb.h
*
@@ -78,8 +76,6 @@ extern unsigned char pckbd_sysrq_xlate[128];
#undef KBD_IS_FOCUS_9000 /* We have the brain-damaged FOCUS-9000 keyboard */
#undef INITIALIZE_MOUSE /* Define if your PS/2 mouse needs initialization. */
#define KBD_INIT_TIMEOUT 1000 /* Timeout in ms for initializing the keyboard */
#define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */
#define KBD_TIMEOUT 1000 /* Timeout in ms for keyboard command acknowledge */

View File

@@ -66,7 +66,6 @@ static char shift_map[] =
'1','2','3','0',177
}; /* Keyboard scancode -> character map with SHIFT key modifier. */
static unsigned short kbd_buffer[KBD_BUF_SIZE];
static uint16_t kbd_first = 0;
static uint16_t kbd_last = 0;
@@ -85,7 +84,6 @@ void rtemsReboot(void)
outport_byte(0x64, 0xFE); /* use keyboard controler to do the job... */
} /* rtemsReboot */
/*-------------------------------------------------------------------------+
| Function: _IBMPC_scankey
| Description: This function can be called during a poll for input, or by
@@ -238,7 +236,6 @@ _IBMPC_chrdy(char *c)
return FALSE;
} /* _IBMPC_chrdy */
/*-------------------------------------------------------------------------+
| Function: _IBMPC_inch
| Description: Poll keyboard until a character is ready and return it.
@@ -256,7 +253,6 @@ _IBMPC_inch(void)
return c;
} /* _IBMPC_inch */
/*
* Routine that can be used before interrupt management is initialized.
*/

View File

@@ -10,6 +10,9 @@
//
// MODIFICATION/HISTORY:
// $Log$
// Revision 1.2 2004/04/21 10:42:44 ralf
// Remove stray white spaces.
//
// Revision 1.1 2000/08/30 08:15:30 joel
// 2000-08-26 Rosimildo da Silva <rdasilva@connecttel.com>
//
@@ -110,7 +113,6 @@ struct kbsentry {
unsigned char kb_string[512];
};
struct kbdiacr {
unsigned char diacr, base, result;
};

View File

@@ -56,8 +56,6 @@
extern void add_to_queue( unsigned short );
extern void rtemsReboot( void );
int set_bit(int nr, unsigned long * addr)
{
int mask, retval,level;
@@ -96,7 +94,6 @@ int test_bit(int nr, unsigned long * addr)
#define test_and_set_bit(x,y) set_bit(x,y)
#define test_and_clear_bit(x,y) clear_bit(x,y)
/*
* global state includes the following, and various static variables
* in this module: prev_scancode, shift_state, diacr, npadch, dead_key_next.
@@ -123,7 +120,6 @@ static char rep = 0; /* flag telling character repeat */
/* default console for RTEMS */
static int fg_console = 0;
struct kbd_struct kbd_table[MAX_NR_CONSOLES];
static struct kbd_struct * kbd = kbd_table;
@@ -150,7 +146,6 @@ static k_hand key_handler[16] = {
typedef void (*void_fnp)(void);
typedef void (void_fn)(void);
static void show_mem(void)
{
}
@@ -211,7 +206,6 @@ void to_utf8(ushort c) {
but we need only 16 bits here */
}
/*
* Translation of escaped scancodes to keycodes.
* This is now user-settable (for machines were it makes sense).
@@ -277,7 +271,6 @@ void handle_scancode(unsigned char scancode, int down)
} else
rep = test_and_set_bit(keycode, key_down);
#ifdef CONFIG_MAGIC_SYSRQ /* Handle the SysRq Hack */
if (keycode == SYSRQ_KEY) {
sysrq_pressed = !up_flag;
@@ -289,7 +282,6 @@ void handle_scancode(unsigned char scancode, int down)
}
#endif
if (kbd->kbdmode == VC_MEDIUMRAW) {
/* soon keycodes will require more than one byte */
put_queue(keycode + up_flag);
@@ -320,7 +312,6 @@ void handle_scancode(unsigned char scancode, int down)
int shift_final = shift_state ^ kbd->lockstate ^ kbd->slockstate;
ushort *key_map = key_maps[shift_final];
if (key_map != NULL) {
keysym = key_map[keycode];
type = KTYP(keysym);
@@ -383,7 +374,6 @@ static void put_queue(int ch)
}
}
static void puts_queue(char *cp)
{
while (*cp) {
@@ -578,7 +568,6 @@ static void do_dead2(unsigned char value, char up_flag)
diacr = (diacr ? handle_diacr(value) : value);
}
/*
* We have a combining character DIACR here, followed by the character CH.
* If the combination occurs in the table, return the corresponding value.
@@ -846,7 +835,6 @@ void register_leds(int console, unsigned int led,
static inline unsigned char getleds(void){
struct kbd_struct *kbd = kbd_table + fg_console;
unsigned char leds;
@@ -899,13 +887,11 @@ static void kbd_bh(void)
}
}
void set_leds(void)
{
kbd_bh();
}
int kbd_init(void)
{

View File

@@ -10,6 +10,9 @@
//
// MODIFICATION/HISTORY:
// $Log$
// Revision 1.3 2004/04/21 10:42:44 ralf
// Remove stray white spaces.
//
// Revision 1.2 2000/08/30 17:06:23 joel
// 2000-08-30 Joel Sherrill <joel@OARcorp.com>
//
@@ -82,7 +85,6 @@ extern unsigned char keyboard_type;
#define MAX_NR_FUNC 256 /* max nr of strings assigned to keys */
#define MAX_NR_CONSOLES 1
extern char *func_table[MAX_NR_FUNC];
#define KT_LATIN 0 /* we depend on this being zero */
@@ -360,7 +362,6 @@ extern char *func_table[MAX_NR_FUNC];
#define K_F245 K(KT_FN,254)
#define K_UNDO K(KT_FN,255)
#define K_HOLE K(KT_SPEC,0)
#define K_ENTER K(KT_SPEC,1)
#define K_SH_REGS K(KT_SPEC,2)
@@ -623,5 +624,4 @@ void compute_shiftstate(void);
extern unsigned int keymap_count;
#endif

View File

@@ -30,7 +30,6 @@
#include "mouse_parser.h"
#include "serial_mouse.h"
/* NOTE NOTE NOTE NOTE:
Select here the mouse type !!!!!
*/
@@ -225,7 +224,6 @@ static int ParsePC(int byte)
return 0;
}
/*
* Input routine for Microsoft mouse.
* Returns nonzero when a new mouse state has been completed.
@@ -394,7 +392,6 @@ void register_kbd_msg_queue( char *q_name, int port )
kbd_set_driver_handler( kbd_parser );
}
void unregister_kbd_msg_queue( int port )
{
kbd_set_driver_handler( NULL );

View File

@@ -31,5 +31,4 @@ void unregister_kbd_msg_queue( int port );
}
#endif
#endif /* __mouse_parser_h__ */

View File

@@ -17,7 +17,6 @@
* $Id$
*/
#include <bsp.h>
#include <stdlib.h>
@@ -76,7 +75,6 @@ doCRNL(int cr, int nl)
wr_cursor(row * maxCol + column, ioCrtBaseAddr);
}
int (*videoHook)(char, int *)=0;
static void
@@ -101,7 +99,6 @@ gotorc(int r, int c)
/* erase current location without moving the cursor */
#define BLANK ((char)0x7f)
static void
videoPutChar(char car)
{
@@ -273,7 +270,6 @@ static int escaped = 0;
videoPutChar(c);
} /* _IBMPC_outch */
/*-------------------------------------------------------------------------+
| Function: _IBMPC_initVideo
| Description: Video system initialization. Hook for any early setup.
@@ -309,14 +305,12 @@ _IBMPC_initVideo(void)
#endif
} /* _IBMPC_initVideo */
/* for old DOS compatibility n-curses type of applications */
void gotoxy( int x, int y )
{
gotorc(y,x);
}
int whereX( void )
{
return row;

View File

@@ -165,7 +165,6 @@ static unsigned char e0_keys[128] = {
0, 0, 0, 0, 0, 0, 0, 0 /* 0x78-0x7f */
};
static void mdelay( unsigned long t )
{
Wait_X_ms( t );
@@ -218,7 +217,6 @@ int pckbd_translate(unsigned char scancode, unsigned char *keycode,
{
static int prev_scancode = 0;
/* special prefix scancodes.. */
if (scancode == 0xe0 || scancode == 0xe1) {
prev_scancode = scancode;
@@ -318,8 +316,6 @@ char pckbd_unexpected_up(unsigned char keycode)
return 0200;
}
static void kb_wait(void)
{
unsigned long timeout = KBC_TIMEOUT;
@@ -341,7 +337,6 @@ static void kb_wait(void)
#endif
}
/*
* This reads the keyboard status port, and does the
* appropriate action.
@@ -389,7 +384,6 @@ static unsigned char handle_kbd_event(void)
return status;
}
void keyboard_interrupt( void )
{
handle_kbd_event();
@@ -595,7 +589,6 @@ static char * initialize_kbd(void)
kbd_wait_for_input();
}
kbd_write_output_w(KBD_CMD_ENABLE);
if (kbd_wait_for_input() != KBD_REPLY_ACK)
return "Enable keyboard: no ACK";
@@ -611,7 +604,6 @@ static char * initialize_kbd(void)
return NULL;
}
void pckbd_init_hw(void)
{
/* kbd_request_region(); */

View File

@@ -15,6 +15,9 @@
* MODIFICATION/HISTORY:
*
* $Log$
* Revision 1.3 2004/04/21 10:42:44 ralf
* Remove stray white spaces.
*
* Revision 1.2 2004/04/15 13:26:12 ralf
* Remove stray white spaces.
*
@@ -83,7 +86,6 @@ rtems_device_driver paux_close(
void *
);
rtems_device_driver paux_read(
rtems_device_major_number,
rtems_device_minor_number,

View File

@@ -74,7 +74,6 @@ static void mdelay( unsigned long t )
Wait_X_ms( t );
}
static void* termios_ttyp_paux = NULL;
static void
@@ -94,11 +93,9 @@ static int isr_is_on(const rtems_irq_connect_data *irq)
return BSP_irq_enabled_at_i8259s( irq->name );
}
static rtems_irq_connect_data ps2_isr_data = { AUX_IRQ,
ps2_mouse_interrupt, isr_on, isr_off, isr_is_on };
/*
* Wait for keyboard controller input buffer to drain.
*
@@ -161,7 +158,6 @@ static int do_acknowledge(unsigned char scancode)
return 1;
}
static inline void handle_mouse_event(unsigned char scancode)
{
if (mouse_reply_expected) {
@@ -228,7 +224,6 @@ static unsigned char handle_kbd_event(void)
return status;
}
static void ps2_mouse_interrupt()
{
handle_kbd_event();
@@ -404,7 +399,6 @@ static unsigned char get_from_queue(void)
return result;
}
static int queue_empty(void)
{
return queue->head == queue->tail;
@@ -439,7 +433,6 @@ static int open_aux()
}
queue->head = queue->tail = 0; /* Flush input queue */
status = BSP_install_rtems_irq_handler( &ps2_isr_data );
if( !status )
{
@@ -578,7 +571,6 @@ paux_initialize( rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* tty_initialize */
static int paux_last_close(int major, int minor, void *arg)
{
release_aux();
@@ -595,7 +587,6 @@ static int write_aux_echo( int minor, const char * buffer, int count )
return 0;
}
/*
* Some initialization if necessary
*/
@@ -607,7 +598,6 @@ paux_first_open( rtems_device_minor_number major,
return RTEMS_SUCCESSFUL;
}
/*
* paux device driver OPEN entry point
*/
@@ -645,7 +635,6 @@ paux_close(rtems_device_major_number major,
return (rtems_termios_close (arg));
}
/*
* paux device driver READ entry point.
* Read characters from the PS/2 mouse.
@@ -658,7 +647,6 @@ paux_read(rtems_device_major_number major,
return rtems_termios_read (arg);
} /* tty_read */
/*
* paux device driver WRITE entry point.
* Write characters to the PS/2 mouse.
@@ -675,7 +663,6 @@ paux_write(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* tty_write */
/*
* Handle ioctl request.
*/

View File

@@ -19,8 +19,6 @@
#undef KBD_IS_FOCUS_9000 /* We have the brain-damaged FOCUS-9000 keyboard */
#undef INITIALIZE_MOUSE /* Define if your PS/2 mouse needs initialization. */
#define KBD_INIT_TIMEOUT 1000 /* Timeout in ms for initializing the keyboard */
#define KBC_TIMEOUT 250 /* Timeout in ms for sending to keyboard controller */
#define KBD_TIMEOUT 1000 /* Timeout in ms for keyboard command acknowledge */

View File

@@ -18,6 +18,9 @@
* MODIFICATION/HISTORY:
*
* $Log$
* Revision 1.6 2004/04/21 10:42:44 ralf
* Remove stray white spaces.
*
* Revision 1.5 2000/12/05 16:37:38 joel
* 2000-12-01 Joel Sherrill <joel@OARcorp.com>
*
@@ -59,7 +62,6 @@ static void isr_on(const rtems_irq_connect_data *);
static void isr_off(const rtems_irq_connect_data *);
static int isr_is_on(const rtems_irq_connect_data *);
extern BSP_polling_getchar_function_type BSP_poll_char;
extern int BSPConsolePort;
@@ -162,7 +164,6 @@ serial_mouse_initialize(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* tty_initialize */
static int serial_mouse_last_close(int major, int minor, void *arg)
{
BSP_remove_rtems_irq_handler( &serial_mouse_isr_data );
@@ -220,7 +221,6 @@ serial_mouse_close(rtems_device_major_number major,
} /* tty_close */
/*
* TTY device driver READ entry point.
* Read characters from the tty device.
@@ -233,7 +233,6 @@ serial_mouse_read(rtems_device_major_number major,
return rtems_termios_read (arg);
} /* tty_read */
/*
* TTY device driver WRITE entry point.
* Write characters to the tty device.
@@ -286,8 +285,6 @@ serial_mouse_control(rtems_device_major_number major,
return serial_mouse_control_internal( BSP_UART_PORT, arg );
}
static int
conSetAttr(int port, int minor, const struct termios *t)
{

View File

@@ -15,6 +15,9 @@
* MODIFICATION/HISTORY:
*
* $Log$
* Revision 1.3 2004/04/21 10:42:44 ralf
* Remove stray white spaces.
*
* Revision 1.2 2004/04/15 13:26:12 ralf
* Remove stray white spaces.
*
@@ -58,7 +61,6 @@
extern "C" {
#endif
/* ttyS1 entry points */
rtems_device_driver serial_mouse_initialize(
rtems_device_major_number,
@@ -78,7 +80,6 @@ rtems_device_driver serial_mouse_control(
void *
);
/* serial_mouse entry points */
rtems_device_driver serial_mouse_close(
rtems_device_major_number,
@@ -86,7 +87,6 @@ rtems_device_driver serial_mouse_close(
void *
);
rtems_device_driver serial_mouse_read(
rtems_device_major_number,
rtems_device_minor_number,
@@ -99,7 +99,6 @@ rtems_device_driver serial_mouse_write(
void *
);
/* Select the mouse type: "ms","pc","ps2" */
#define MOUSE_TYPE "ms"
@@ -107,7 +106,6 @@ rtems_device_driver serial_mouse_write(
#define SERIAL_MOUSE_COM1 1
/* #define SERIAL_MOUSE_COM2 1 */
#define SERIAL_MOUSE_DRIVER_TABLE_ENTRY \
{ serial_mouse_initialize, serial_mouse_open, serial_mouse_close, \
serial_mouse_read, serial_mouse_write, serial_mouse_control }

View File

@@ -22,7 +22,6 @@
#define MODE_MAX 3
typedef int MODE; /* drawing mode*/
/* Define one and only one of the following to be nonzero*/
#define VGA_ET4000 0 /* TSENG LABS ET4000 chip 800x600*/
#define VGA_STANDARD 1 /* standard VGA 640x480*/
@@ -150,7 +149,6 @@ out_word(unsigned int p,unsigned int d)
outp(p + 1, (d >> 8) & 0xff);
}
/* Values for the data rotate register to implement drawing modes. */
static unsigned char mode_table[MODE_MAX + 1] = {
0x00, 0x18, 0x10, 0x08
@@ -168,7 +166,6 @@ setmode(MODE mode)
outp(GRVAL, mode_table[mode]);
}
#if VGA_ET4000
/* VGA 800x600 16-color graphics (BIOS mode 0x29).
@@ -268,7 +265,6 @@ static REGIO graphics_on[] = {
DONE, 0, 0, 0, 0
};
/* VGA 80x25 text (BIOS mode 3).
*/
static REGIO graph_off[] = {
@@ -368,7 +364,6 @@ static REGIO graph_off[] = {
#endif
#if VGA_STANDARD
/* VGA 640x480 16-color graphics (BIOS mode 0x12).
@@ -468,7 +463,6 @@ static REGIO graphics_on[] = {
{ DONE, 0, 0, 0, 0 }
};
/* VGA 80x25 text (BIOS mode 3).
*/
static REGIO graph_off[] = {
@@ -568,7 +562,6 @@ static REGIO graph_off[] = {
#endif
#if EGA_STANDARD
/* EGA 640x350 16-color graphics (BIOS mode 0x10).
@@ -668,7 +661,6 @@ static REGIO graphics_on[] = {
DONE, 0, 0, 0, 0
};
/* EGA 80x25 text (BIOS mode 3).
*/
static REGIO graph_off[] = {

View File

@@ -109,7 +109,6 @@ _kd_mksound(unsigned int hz, unsigned int ticks)
void (*kd_mksound)(unsigned int hz, unsigned int ticks) = _kd_mksound;
#define i (tmp.kb_index)
#define s (tmp.kb_table)
#define v (tmp.kb_value)
@@ -144,7 +143,6 @@ do_kdsk_ioctl(int cmd, struct kbentry *user_kbe, int perm, struct kbd_struct *kb
#undef s
#undef v
#define HZ 100
static inline int

View File

@@ -23,7 +23,6 @@
#include <libchip/ide_ctrl_cfg.h>
#include <libchip/ide_ctrl_io.h>
/*
* The following table configures the functions used for IDE drivers
* in this BSP.

View File

@@ -38,7 +38,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#ifndef __BSP_H_
#define __BSP_H_
@@ -211,7 +210,6 @@ void rtemsReboot(void); /* from 'exit.c' */
void Wait_X_ms(unsigned int timeToWait); /* from 'timer.c' */
/* Definitions for BSPConsolePort */
#define BSP_CONSOLE_PORT_CONSOLE (-1)
#define BSP_CONSOLE_PORT_COM1 (BSP_UART_COM1)

View File

@@ -25,7 +25,6 @@
/* In color */
#define V_COLOR 0xb8000
/*
* Video Option Byte location. It must be maintained
* by the BIOS.
@@ -72,7 +71,6 @@
#define OFF 0
#define ON 1
/*
* CRT Controller register offset definitions
*/

View File

@@ -64,7 +64,6 @@ BEGIN_CODE
EXTERN (debugPollingGetChar)
EXTERN (checkCPUtypeSetCr0)
/*
* In case this crashes on your machine and this is not due
* to video mode set by the loader, you may try to define

View File

@@ -30,7 +30,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#include <bsp.h>
#include <rtems/libio.h>
#include <rtems/libcsupport.h>
@@ -84,7 +83,6 @@ void bsp_pretasking_hook(void)
uint32_t topAddr, val;
int i;
if (rtemsFreeMemStart & (CPU_ALIGNMENT - 1)) /* not aligned => align it */
rtemsFreeMemStart = (rtemsFreeMemStart+CPU_ALIGNMENT) & ~(CPU_ALIGNMENT-1);
@@ -119,7 +117,6 @@ void bsp_pretasking_hook(void)
bsp_libc_init((void *)rtemsFreeMemStart, _heap_size, 0);
rtemsFreeMemStart += _heap_size; /* HEAP_SIZE in KBytes */
#ifdef RTEMS_DEBUG
rtems_debug_enable(RTEMS_DEBUG_ALL_MASK);
@@ -127,7 +124,6 @@ void bsp_pretasking_hook(void)
#endif /* RTEMS_DEBUG */
} /* bsp_pretasking_hook */
/*-------------------------------------------------------------------------+
| Function: bsp_start
| Description: Called before main is invoked.

View File

@@ -30,7 +30,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#include <stdio.h>
#include <bsp.h>
#include <rtems/libio.h>

View File

@@ -204,7 +204,6 @@ SYM (_Global_descriptor_table):
.word 0xffff, 0
.byte 0, 0x92, 0xcf, 0
/*---------------------------------------------------------------------------+
| Descriptor of GDT
+--------------------------------------------------------------------------*/
@@ -212,7 +211,6 @@ SYM (gdtdesc):
.word (3*8 - 1)
.long SYM (_Global_descriptor_table)
/*---------------------------------------------------------------------------+
| IDT itself
+---------------------------------------------------------------------------*/

View File

@@ -38,7 +38,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#include <stdlib.h>
#include <bsp.h>
@@ -90,7 +89,6 @@ rdtsc(void)
return result;
} /* rdtsc */
/*-------------------------------------------------------------------------+
| Function: Timer_exit
| Description: Timer cleanup routine at RTEMS exit. NOTE: This routine is
@@ -104,7 +102,6 @@ Timer_exit(void)
{
} /* Timer_exit */
/*-------------------------------------------------------------------------+
| Function: Timer_initialize
| Description: Timer initialization routine.
@@ -126,7 +123,6 @@ Timer_initialize(void)
Ttimer_val = rdtsc(); /* read starting time */
} /* Timer_initialize */
/*-------------------------------------------------------------------------+
| Function: Read_timer
| Description: Read hardware timer value.
@@ -156,7 +152,6 @@ Read_timer(void)
+--------------------------------------------------------------------------*/
#define US_PER_ISR 250 /* Number of micro-seconds per timer interruption */
/*-------------------------------------------------------------------------+
| Function: Timer_exit
| Description: Timer cleanup routine at RTEMS exit. NOTE: This routine is
@@ -178,7 +173,6 @@ timerOff(const rtems_raw_irq_connect_data* used)
outport_byte(TIMER_CNTR0, 0);
} /* Timer_exit */
static void
timerOn(const rtems_raw_irq_connect_data* used)
{
@@ -248,7 +242,6 @@ Timer_initialize(void)
Ttimer_val = 0;
} /* Timer_initialize */
/*-------------------------------------------------------------------------+
| Function: Read_timer
| Description: Read hardware timer value.
@@ -278,7 +271,6 @@ Read_timer(void)
#endif /* pentium */
/*-------------------------------------------------------------------------+
| Function: Empty_function
| Description: Empty function used in time tests.
@@ -291,7 +283,6 @@ rtems_status_code Empty_function(void)
return RTEMS_SUCCESSFUL;
} /* Empty function */
/*-------------------------------------------------------------------------+
| Function: Set_find_average_overhead
| Description: Set internal Timer_driver_Find_average_overhead flag value.
@@ -319,7 +310,6 @@ void loadTimerValue( unsigned short loadedValue )
outport_byte(TIMER_CNTR0, (loadedValue >> 8) & 0xff);
}
/*-------------------------------------------------------------------------+
| Description: Reads the current value of the timer, and converts the
| number of ticks to micro-seconds.

View File

@@ -30,7 +30,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#include <rtems/asm.h>
BEGIN_CODE

View File

@@ -32,7 +32,6 @@ static void usage(void)
return;
}
int main(int argc, char* argv[])
{
int c, verbose;
@@ -130,7 +129,6 @@ int main(int argc, char* argv[])
return 1;
}
/* Copy first image out and remember its length */
cnt = 0;
for(;;)
@@ -177,7 +175,6 @@ int main(int argc, char* argv[])
size1 = cnt;
}
/* Let us check agains overlapping */
if(!(addr1 >= (headerAddr + sizeof(buf)) || (headerAddr >= addr1+size1)))
{
@@ -199,7 +196,6 @@ int main(int argc, char* argv[])
return 1;
}
if(optind == (argc - 1))
{
imageCnt = 1;
@@ -364,7 +360,6 @@ writeHeader:
buf[0x23] = 4;
/* Load address */
buf[0x24] = addr2 & 0xff;
buf[0x25] = (addr2 >> 8) & 0xff;

View File

@@ -287,7 +287,6 @@ wd_rxDaemon (void *arg)
for (;;){
rtems_bsdnet_event_receive (INTERRUPT_EVENT,
RTEMS_WAIT|RTEMS_EVENT_ANY,
RTEMS_NO_TIMEOUT,
@@ -490,7 +489,6 @@ wd_stop (struct wd_softc *sc)
}
/*
* Show interface statistics
*/
@@ -606,7 +604,6 @@ rtems_wd_driver_attach (struct rtems_bsdnet_ifconfig *config, int attach)
else
mtu = ETHERMTU;
if (config->irno)
sc->irqInfo.name = config->irno;
else

View File

@@ -45,7 +45,6 @@ void init_remote_gdb( void )
/* Init GDB stub itself */
set_debug_traps();
printf( "Remote GDB: waiting remote connection....\n" );
/*

View File

@@ -14,7 +14,6 @@
#include <uart.h>
#include <assert.h>
int putDebugChar(int ch); /* write a single character */
int getDebugChar(void); /* read and return a single char */
@@ -55,7 +54,6 @@ int BSP_uart_isOn(const rtems_raw_irq_connect_data* used)
return BSP_irq_enabled_at_i8259s(used->idtIndex - BSP_IRQ_VECTOR_BASE);
}
/*
* In order to have a possibility to break into
* running program, one has to call this function
@@ -115,7 +113,6 @@ void i386_stub_glue_init_breakin(void)
return;
}
int
putDebugChar(int ch)
{

View File

@@ -464,7 +464,6 @@ hex (char ch)
return (-1);
}
/* scan for the sequence $<data>#<checksum> */
void
getpacket (char *buffer)
@@ -530,7 +529,6 @@ getpacket (char *buffer)
/* send the packet in buffer. */
void
putpacket (char *buffer)
{

View File

@@ -18,6 +18,9 @@
* MODIFICATION/HISTORY:
*
* $Log$
* Revision 1.6 2004/04/21 10:42:44 ralf
* Remove stray white spaces.
*
* Revision 1.5 2001/08/16 20:52:05 joel
* 2001-08-16 Mike Siers <mikes@poliac.com>
*
@@ -84,12 +87,10 @@ static void isr_on(const rtems_irq_connect_data *);
static void isr_off(const rtems_irq_connect_data *);
static int isr_is_on(const rtems_irq_connect_data *);
extern BSP_polling_getchar_function_type BSP_poll_char;
extern int BSPConsolePort;
extern void rtems_set_waiting_id_comx( int port, rtems_id id, rtems_event_set event );
/*
* Interrupt structure for tty1
*/
@@ -183,7 +184,6 @@ tty1_initialize(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* tty_initialize */
static int tty1_last_close(int major, int minor, void *arg)
{
BSP_remove_rtems_irq_handler( &tty1_isr_data );
@@ -255,7 +255,6 @@ tty_close(rtems_device_major_number major,
} /* tty_close */
/*
* TTY device driver READ entry point.
* Read characters from the tty device.
@@ -268,7 +267,6 @@ tty_read(rtems_device_major_number major,
return rtems_termios_read (arg);
} /* tty_read */
/*
* TTY device driver WRITE entry point.
* Write characters to the tty device.
@@ -299,8 +297,6 @@ static rtems_device_driver tty_control( int port, void *arg )
return RTEMS_SUCCESSFUL;
}
/*
* Handle ioctl request for ttyS1.
*/
@@ -313,7 +309,6 @@ tty1_control(rtems_device_major_number major,
return tty_control( BSP_UART_COM1, arg );
}
static int
conSetAttr(int port, int minor, const struct termios *t)
{
@@ -424,8 +419,6 @@ tty1_conSetAttr( int minor, const struct termios *t)
return conSetAttr( BSP_UART_COM1, minor, t );
}
/*
* TTY2 device driver INITIALIZE entry point.
*/
@@ -473,7 +466,6 @@ tty2_initialize(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* tty_initialize */
static int tty2_last_close(int major, int minor, void *arg)
{
BSP_remove_rtems_irq_handler( &tty2_isr_data );

View File

@@ -15,6 +15,9 @@
* MODIFICATION/HISTORY:
*
* $Log$
* Revision 1.3 2004/04/21 10:42:44 ralf
* Remove stray white spaces.
*
* Revision 1.2 2004/04/15 13:26:12 ralf
* Remove stray white spaces.
*
@@ -38,7 +41,6 @@
extern "C" {
#endif
/* ttyS1 entry points */
rtems_device_driver tty1_initialize(
rtems_device_major_number,
@@ -58,7 +60,6 @@ rtems_device_driver tty1_control(
void *
);
/* tty1 & tty2 shared entry points */
rtems_device_driver tty_close(
rtems_device_major_number,
@@ -66,7 +67,6 @@ rtems_device_driver tty_close(
void *
);
rtems_device_driver tty_read(
rtems_device_major_number,
rtems_device_minor_number,
@@ -79,8 +79,6 @@ rtems_device_driver tty_write(
void *
);
/* tty2 entry points */
rtems_device_driver tty2_initialize(
rtems_device_major_number,
@@ -100,19 +98,14 @@ rtems_device_driver tty2_control(
void *
);
#define TTY1_DRIVER_TABLE_ENTRY \
{ tty1_initialize, tty1_open, tty_close, \
tty_read, tty_write, tty1_control }
#define TTY2_DRIVER_TABLE_ENTRY \
{ tty2_initialize, tty2_open, tty_close, \
tty_read, tty_write, tty2_control }
#ifdef __cplusplus
}
#endif

View File

@@ -146,7 +146,6 @@ BSP_uart_init
/* 8-bit, no parity , 1 stop */
uwrite(uart, LCR, databits | parity | stopbits);
/* Set DTR, RTS and OUT2 high */
uwrite(uart, MCR, DTR | RTS | OUT_2);
@@ -354,7 +353,6 @@ BSP_uart_polled_status(int uart)
return BSP_UART_STATUS_ERROR;
}
/*
* Polled mode write function
*/
@@ -442,7 +440,6 @@ BSP_poll_char_via_serial()
return BSP_uart_polled_read(BSPConsolePort);
}
/* ================ Termios support =================*/
static volatile int termios_stopped_com1 = 0;
@@ -478,7 +475,6 @@ void uart_set_driver_handler( int port, void ( *handler )( void *, char *, int
}
}
/*
* Set channel parameters
*/
@@ -619,7 +615,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len)
return 0;
}
/* If there TX buffer is busy - something is royally screwed up */
assert((uread(BSP_UART_COM2, LSR) & THRE) != 0);
@@ -644,7 +639,6 @@ BSP_uart_termios_write_com2(int minor, const char *buf, int len)
return 0;
}
void
BSP_uart_termios_isr_com1(void)
{
@@ -836,7 +830,6 @@ BSP_uart_termios_isr_com2()
}
}
/* ================= GDB support ===================*/
static int sav[4] __attribute__ ((unused));
@@ -918,7 +911,6 @@ asm (" outb %al, $0x20");
asm (" movl sav, %eax"); /* Restore eax */
asm (" iret"); /* Done */
/*
* Interrupt service routine for COM2 - all,
* it does it check whether ^C is received

View File

@@ -174,5 +174,4 @@ extern int BSPBaseBaud;
}
#endif
#endif /* _BSPUART_H */

View File

@@ -64,7 +64,6 @@ int i386_set_idt_entry (const rtems_raw_irq_connect_data* irq)
unsigned limit;
unsigned int level;
i386_get_info_from_IDTR (&idt_entry_tbl, &limit);
/* Convert limit into number of entries */
@@ -241,7 +240,6 @@ int i386_set_gdt_entry (unsigned short segment_selector, unsigned base,
unsigned int limit_adjusted;
segment_descriptors* gdt_entry_tbl;
i386_get_info_from_GDTR (&gdt_entry_tbl, &gdt_limit);
if (segment_selector > limit) {

View File

@@ -11,7 +11,6 @@
* $Id$
*/
#include <bsp.h>
#include <irq.h>
#include <rtems/score/thread.h>
@@ -138,7 +137,6 @@ int BSP_irq_enabled_at_i8259s (const rtems_irq_symbolic_name irqLine)
return (~(i8259s_cache & mask));
}
/*-------------------------------------------------------------------------+
| Function: BSP_irq_ack_at_i8259s
| Description: Signal generic End Of Interrupt (EOI) to appropriate PIC.
@@ -204,7 +202,6 @@ static void make_copy_of_handlers ()
}
}
/*
* This function check that the value given for the irq line
* is valid.
@@ -263,7 +260,6 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
return 1;
}
int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
{
unsigned int level;

View File

@@ -60,9 +60,6 @@ typedef enum {
BSP_RT_TIMER3 = 10
} rtems_irq_symbolic_name;
/*
* Type definition for RTEMS managed interrupts
*/
@@ -140,9 +137,6 @@ typedef struct {
rtems_irq_prio* irqPrioTbl;
}rtems_irq_global_settings;
/*-------------------------------------------------------------------------+
| Function Prototypes.
+--------------------------------------------------------------------------*/

View File

@@ -130,7 +130,6 @@ nested:
movb ah, al
outb $PIC_SLAVE_IMR_IO_PORT
decl SYM (_ISR_Nest_level) /* one less ISR nest level */
/* If interrupts are nested, */
/* then dispatching is disabled */
@@ -149,7 +148,6 @@ nested:
/* while in interrupt handler? */
je .exit /* No, exit */
.bframe:
movl $0, SYM (_ISR_Signals_to_thread_executing)
/*
@@ -203,7 +201,6 @@ nested:
popl eax
iret
#define DISTINCT_INTERRUPT_ENTRY(_vector) \
.p2align 4 ; \
PUBLIC (rtems_irq_prologue_ ## _vector ) ; \

View File

@@ -26,5 +26,4 @@
#define PIC_EOSI 0x60 /* End of Specific Interrupt (EOSI) */
#define PIC_EOI 0x20 /* Generic End of Interrupt (EOI) */
#endif

View File

@@ -49,7 +49,6 @@ static void nop_func(){}
*/
static int not_connected() {return 0;}
static rtems_raw_irq_connect_data idtHdl[IDT_SIZE];
/*
@@ -100,8 +99,6 @@ static rtems_irq_prio irqPrioTable[BSP_IRQ_LINES_NUMBER]={
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
static interrupt_gate_descriptor idtEntry;
static rtems_irq_global_settings initial_config;
@@ -129,7 +126,6 @@ void rtems_irq_mngt_init()
while(1);
}
_CPU_ISR_Disable(level);
/*

View File

@@ -18,7 +18,6 @@
* is flat and that stack is big enough
*/
static int pcibInitialized = 0;
static unsigned int pcibEntry;
@@ -211,14 +210,10 @@ pcib_find_by_class(int classCode, int idx, int *sig)
return PCIB_ERR_SUCCESS;
}
#define PCI_MULTI_FUNCTION 0x80
#define PCI_MAX_DEVICES 16
#define PCI_MAX_FUNCTIONS 8
int
BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
int instance, int *pbus, int *pdev, int *pfun )
@@ -273,9 +268,6 @@ BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
return -1;
}
/*
* Generate Special Cycle
*/
@@ -306,7 +298,6 @@ pcib_special_cycle(int busNo, int data)
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
}
/*
* Read byte from config space
*/
@@ -344,7 +335,6 @@ pcib_conf_read8(int sig, int off, unsigned char *data)
return PCIB_ERR_SUCCESS;
}
/*
* Read word from config space
*/
@@ -382,7 +372,6 @@ pcib_conf_read16(int sig, int off, unsigned short *data)
return PCIB_ERR_SUCCESS;
}
/*
* Read dword from config space
*/
@@ -420,7 +409,6 @@ pcib_conf_read32(int sig, int off, unsigned int *data)
return PCIB_ERR_SUCCESS;
}
/*
* Write byte into config space
*/
@@ -483,8 +471,6 @@ pcib_conf_write16(int sig, int off, unsigned int data)
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
}
/*
* Write dword into config space
*/
@@ -516,7 +502,6 @@ pcib_conf_write32(int sig, int off, unsigned int data)
return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
}
static int
pcib_convert_err(int err)
{

View File

@@ -77,7 +77,6 @@ static rtems_irq_connect_data clockIrqData = {BSP_PERIODIC_TIMER,
ClockOff,
ClockIsOn};
rtems_device_driver Clock_initialize(
rtems_device_major_number major,
rtems_device_minor_number minor,

View File

@@ -31,7 +31,6 @@
| $Id$
+--------------------------------------------------------------------------*/
#include <string.h>
#include <bsp.h>
@@ -70,7 +69,6 @@
#define RTC_CENTURY 0x32 /* current century - increment in Dec99 */
/*-------------------------------------------------------------------------+
| Auxiliary Functions
+--------------------------------------------------------------------------*/
@@ -107,7 +105,6 @@ ytos(uint16_t y)
return ((y - 1970) * SECS_PER_REG_YEAR + (y - 1970 + 1) / 4 * SECS_PER_DAY);
} /* ytos */
/*-------------------------------------------------------------------------+
| Function: mtos
| Description: Convert months to seconds since January.
@@ -144,7 +141,6 @@ rtcin(uint8_t what)
return r;
} /* rtcin */
/*-------------------------------------------------------------------------+
| Functions
+--------------------------------------------------------------------------*/
@@ -175,7 +171,6 @@ init_rtc(void)
printf("RTC BIOS diagnostic error %b\n", s, RTCDG_BITS); */
} /* init_rtc */
/*-------------------------------------------------------------------------+
| Function: rtc_read
| Description: Read present time from RTC and return it.

View File

@@ -158,7 +158,6 @@ console_initialize(rtems_device_major_number major,
return RTEMS_SUCCESSFUL;
} /* console_initialize */
static int console_last_close(int major, int minor, void *arg)
{
BSP_remove_rtems_irq_handler (&console_isr_data);
@@ -225,7 +224,6 @@ console_close(rtems_device_major_number major,
} /* console_close */
/*-------------------------------------------------------------------------+
| Console device driver READ entry point.
+--------------------------------------------------------------------------+
@@ -247,7 +245,6 @@ console_read(rtems_device_major_number major,
} /* console_read */
/*-------------------------------------------------------------------------+
| Console device driver WRITE entry point.
+--------------------------------------------------------------------------+
@@ -262,8 +259,6 @@ console_write(rtems_device_major_number major,
} /* console_write */
/*
* Handle ioctl request.
*/

View File

@@ -11,7 +11,6 @@
* $Id$
*/
#ifndef __TS386_h
#define __TS386_h
@@ -99,7 +98,6 @@ extern void Wait_X_ms (unsigned);
#define MUST_WAIT_FOR_INTERRUTPT 0
#define Install_tm27_vector(handler) \
{ \
rtems_isr_entry dummy; \
@@ -147,7 +145,6 @@ extern void Wait_X_ms (unsigned);
#define Is_tx_ready( _status ) ( (_status) & 0x40 )
#define Is_rx_ready( _status ) ( (_status) & 0x01 )
/* Structures */

View File

@@ -47,7 +47,6 @@
#define OCW3MDOS 0x0020
#define OCW3SDOS 0x00A0
/* CONFIGURATION Registers */
#define DMACFG 0xF830
#define INTCFG 0xF832

View File

@@ -49,7 +49,6 @@
PUBLIC( SYM(_init_i386ex) )
.section .initial, "ax"
/*
@@ -273,7 +272,6 @@ SYM(InitTimer):
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
@@ -478,7 +476,6 @@ SYM (zero_bss):
cli # stops interrupts after hlt!
hlt # shutdown
.balign 4 # align tables to 4 byte boundary
SYM(IDTR): DESC3( SYM(Interrupt_descriptor_table), 0x07ff );
@@ -488,7 +485,6 @@ SYM(Interrupt_descriptor_table): /* Now in data section */
.word 0,0,0,0
.endr
/*
* Use the first (null) entry in the the GDT as a self-pointer for the GDTR.
* (looks like a common trick)

View File

@@ -78,7 +78,6 @@ void bsp_pretasking_hook(void)
bsp_libc_init((void *) heap_start, heap_size, 0);
#ifdef RTEMS_DEBUG
rtems_debug_enable( RTEMS_DEBUG_ALL_MASK );
#endif

Some files were not shown because too many files have changed in this diff Show More