Corrected spacing and added headers.

This commit is contained in:
Joel Sherrill
1998-07-25 17:19:45 +00:00
parent 8739322c10
commit cae05041f2
2 changed files with 56 additions and 34 deletions

View File

@@ -32,20 +32,18 @@
/* /*
* Flow control is only supported when using interrupts * Flow control is only supported when using interrupts
*/ */
console_flow ns16550_flow_RTSCTS =
{ console_flow ns16550_flow_RTSCTS = {
ns16550_negate_RTS, /* deviceStopRemoteTx */ ns16550_negate_RTS, /* deviceStopRemoteTx */
ns16550_assert_RTS /* deviceStartRemoteTx */ ns16550_assert_RTS /* deviceStartRemoteTx */
}; };
console_flow ns16550_flow_DTRCTS = console_flow ns16550_flow_DTRCTS = {
{
ns16550_negate_DTR, /* deviceStopRemoteTx */ ns16550_negate_DTR, /* deviceStopRemoteTx */
ns16550_assert_DTR /* deviceStartRemoteTx */ ns16550_assert_DTR /* deviceStartRemoteTx */
}; };
console_fns ns16550_fns = console_fns ns16550_fns = {
{
libchip_serial_default_probe, /* deviceProbe */ libchip_serial_default_probe, /* deviceProbe */
ns16550_open, /* deviceFirstOpen */ ns16550_open, /* deviceFirstOpen */
NULL, /* deviceLastClose */ NULL, /* deviceLastClose */
@@ -57,8 +55,7 @@ console_fns ns16550_fns =
TRUE /* deviceOutputUsesInterrupts */ TRUE /* deviceOutputUsesInterrupts */
}; };
console_fns ns16550_fns_polled = console_fns ns16550_fns_polled = {
{
libchip_serial_default_probe, /* deviceProbe */ libchip_serial_default_probe, /* deviceProbe */
ns16550_open, /* deviceFirstOpen */ ns16550_open, /* deviceFirstOpen */
ns16550_close, /* deviceLastClose */ ns16550_close, /* deviceLastClose */
@@ -72,6 +69,10 @@ console_fns ns16550_fns_polled =
extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
/*
* ns16550_init
*/
NS16550_STATIC void ns16550_init(int minor) NS16550_STATIC void ns16550_init(int minor)
{ {
unsigned32 pNS16550; unsigned32 pNS16550;
@@ -131,6 +132,10 @@ NS16550_STATIC void ns16550_init(int minor)
ucTrash = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER ); ucTrash = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER );
} }
/*
* ns16550_open
*/
NS16550_STATIC int ns16550_open( NS16550_STATIC int ns16550_open(
int major, int major,
int minor, int minor,
@@ -148,6 +153,10 @@ NS16550_STATIC int ns16550_open(
return(RTEMS_SUCCESSFUL); return(RTEMS_SUCCESSFUL);
} }
/*
* ns16550_close
*/
NS16550_STATIC int ns16550_close( NS16550_STATIC int ns16550_close(
int major, int major,
int minor, int minor,
@@ -210,9 +219,11 @@ NS16550_STATIC void ns16550_write_polled(
/* /*
* These routines provide control of the RTS and DTR lines * These routines provide control of the RTS and DTR lines
*/ */
/* /*
* ns16550_assert_RTS * ns16550_assert_RTS
*/ */
NS16550_STATIC int ns16550_assert_RTS(int minor) NS16550_STATIC int ns16550_assert_RTS(int minor)
{ {
unsigned32 pNS16550; unsigned32 pNS16550;
@@ -238,6 +249,7 @@ NS16550_STATIC int ns16550_assert_RTS(int minor)
/* /*
* ns16550_negate_RTS * ns16550_negate_RTS
*/ */
NS16550_STATIC int ns16550_negate_RTS(int minor) NS16550_STATIC int ns16550_negate_RTS(int minor)
{ {
unsigned32 pNS16550; unsigned32 pNS16550;
@@ -264,9 +276,11 @@ NS16550_STATIC int ns16550_negate_RTS(int minor)
* These flow control routines utilise a connection from the local DTR * These flow control routines utilise a connection from the local DTR
* line to the remote CTS line * line to the remote CTS line
*/ */
/* /*
* ns16550_assert_DTR * ns16550_assert_DTR
*/ */
NS16550_STATIC int ns16550_assert_DTR(int minor) NS16550_STATIC int ns16550_assert_DTR(int minor)
{ {
unsigned32 pNS16550; unsigned32 pNS16550;
@@ -411,16 +425,9 @@ NS16550_STATIC int ns16550_set_attributes(
} }
/* /*
* ns16550_isr * ns16550_process
* *
* This routine is the console interrupt handler for COM1 and COM2 * This routine is the console interrupt handler for A port.
*
* Input parameters:
* vector - vector number
*
* Output parameters: NONE
*
* Return values: NONE
*/ */
NS16550_STATIC void ns16550_process( NS16550_STATIC void ns16550_process(
@@ -493,6 +500,10 @@ NS16550_STATIC void ns16550_process(
} while((ucInterruptId&0xf)!=0x1); } while((ucInterruptId&0xf)!=0x1);
} }
/*
* ns16550_isr
*/
NS16550_STATIC rtems_isr ns16550_isr( NS16550_STATIC rtems_isr ns16550_isr(
rtems_vector_number vector rtems_vector_number vector
) )

View File

@@ -32,20 +32,18 @@
/* /*
* Flow control is only supported when using interrupts * Flow control is only supported when using interrupts
*/ */
console_flow ns16550_flow_RTSCTS =
{ console_flow ns16550_flow_RTSCTS = {
ns16550_negate_RTS, /* deviceStopRemoteTx */ ns16550_negate_RTS, /* deviceStopRemoteTx */
ns16550_assert_RTS /* deviceStartRemoteTx */ ns16550_assert_RTS /* deviceStartRemoteTx */
}; };
console_flow ns16550_flow_DTRCTS = console_flow ns16550_flow_DTRCTS = {
{
ns16550_negate_DTR, /* deviceStopRemoteTx */ ns16550_negate_DTR, /* deviceStopRemoteTx */
ns16550_assert_DTR /* deviceStartRemoteTx */ ns16550_assert_DTR /* deviceStartRemoteTx */
}; };
console_fns ns16550_fns = console_fns ns16550_fns = {
{
libchip_serial_default_probe, /* deviceProbe */ libchip_serial_default_probe, /* deviceProbe */
ns16550_open, /* deviceFirstOpen */ ns16550_open, /* deviceFirstOpen */
NULL, /* deviceLastClose */ NULL, /* deviceLastClose */
@@ -57,8 +55,7 @@ console_fns ns16550_fns =
TRUE /* deviceOutputUsesInterrupts */ TRUE /* deviceOutputUsesInterrupts */
}; };
console_fns ns16550_fns_polled = console_fns ns16550_fns_polled = {
{
libchip_serial_default_probe, /* deviceProbe */ libchip_serial_default_probe, /* deviceProbe */
ns16550_open, /* deviceFirstOpen */ ns16550_open, /* deviceFirstOpen */
ns16550_close, /* deviceLastClose */ ns16550_close, /* deviceLastClose */
@@ -72,6 +69,10 @@ console_fns ns16550_fns_polled =
extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); extern void set_vector( rtems_isr_entry, rtems_vector_number, int );
/*
* ns16550_init
*/
NS16550_STATIC void ns16550_init(int minor) NS16550_STATIC void ns16550_init(int minor)
{ {
unsigned32 pNS16550; unsigned32 pNS16550;
@@ -131,6 +132,10 @@ NS16550_STATIC void ns16550_init(int minor)
ucTrash = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER ); ucTrash = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER );
} }
/*
* ns16550_open
*/
NS16550_STATIC int ns16550_open( NS16550_STATIC int ns16550_open(
int major, int major,
int minor, int minor,
@@ -148,6 +153,10 @@ NS16550_STATIC int ns16550_open(
return(RTEMS_SUCCESSFUL); return(RTEMS_SUCCESSFUL);
} }
/*
* ns16550_close
*/
NS16550_STATIC int ns16550_close( NS16550_STATIC int ns16550_close(
int major, int major,
int minor, int minor,
@@ -210,9 +219,11 @@ NS16550_STATIC void ns16550_write_polled(
/* /*
* These routines provide control of the RTS and DTR lines * These routines provide control of the RTS and DTR lines
*/ */
/* /*
* ns16550_assert_RTS * ns16550_assert_RTS
*/ */
NS16550_STATIC int ns16550_assert_RTS(int minor) NS16550_STATIC int ns16550_assert_RTS(int minor)
{ {
unsigned32 pNS16550; unsigned32 pNS16550;
@@ -238,6 +249,7 @@ NS16550_STATIC int ns16550_assert_RTS(int minor)
/* /*
* ns16550_negate_RTS * ns16550_negate_RTS
*/ */
NS16550_STATIC int ns16550_negate_RTS(int minor) NS16550_STATIC int ns16550_negate_RTS(int minor)
{ {
unsigned32 pNS16550; unsigned32 pNS16550;
@@ -264,9 +276,11 @@ NS16550_STATIC int ns16550_negate_RTS(int minor)
* These flow control routines utilise a connection from the local DTR * These flow control routines utilise a connection from the local DTR
* line to the remote CTS line * line to the remote CTS line
*/ */
/* /*
* ns16550_assert_DTR * ns16550_assert_DTR
*/ */
NS16550_STATIC int ns16550_assert_DTR(int minor) NS16550_STATIC int ns16550_assert_DTR(int minor)
{ {
unsigned32 pNS16550; unsigned32 pNS16550;
@@ -411,16 +425,9 @@ NS16550_STATIC int ns16550_set_attributes(
} }
/* /*
* ns16550_isr * ns16550_process
* *
* This routine is the console interrupt handler for COM1 and COM2 * This routine is the console interrupt handler for A port.
*
* Input parameters:
* vector - vector number
*
* Output parameters: NONE
*
* Return values: NONE
*/ */
NS16550_STATIC void ns16550_process( NS16550_STATIC void ns16550_process(
@@ -493,6 +500,10 @@ NS16550_STATIC void ns16550_process(
} while((ucInterruptId&0xf)!=0x1); } while((ucInterruptId&0xf)!=0x1);
} }
/*
* ns16550_isr
*/
NS16550_STATIC rtems_isr ns16550_isr( NS16550_STATIC rtems_isr ns16550_isr(
rtems_vector_number vector rtems_vector_number vector
) )