diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-06-23 14:54:09 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1998-06-23 14:54:09 +0000 |
| commit | 8a2d4f2bb9926cb87ec849360738be8115e15375 (patch) | |
| tree | 1822aad7569f63c1ad86fc8bbe6b49144ab32989 /c/src | |
| parent | Added initial part of iniitialization. (diff) | |
| download | rtems-8a2d4f2bb9926cb87ec849360738be8115e15375.tar.bz2 | |
Added NULL entry for setAttributes.
Diffstat (limited to 'c/src')
| -rw-r--r-- | c/src/lib/libchip/serial/ns16550.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libchip/serial/serial.h | 1 | ||||
| -rw-r--r-- | c/src/lib/libchip/serial/z85c30.c | 2 | ||||
| -rw-r--r-- | c/src/libchip/serial/ns16550.c | 6 | ||||
| -rw-r--r-- | c/src/libchip/serial/serial.h | 1 | ||||
| -rw-r--r-- | c/src/libchip/serial/z85c30.c | 2 |
6 files changed, 14 insertions, 4 deletions
diff --git a/c/src/lib/libchip/serial/ns16550.c b/c/src/lib/libchip/serial/ns16550.c index 372e572a57..4314aff9f8 100644 --- a/c/src/lib/libchip/serial/ns16550.c +++ b/c/src/lib/libchip/serial/ns16550.c @@ -52,6 +52,7 @@ console_fns ns16550_fns = ns16550_write_support_int, /* deviceWrite */ ns16550_initialize_interrupts, /* deviceInitialize */ ns16550_write_polled, /* deviceWritePolled */ + NULL, /* deviceSetAttributes */ FALSE, /* deviceOutputUsesInterrupts */ }; @@ -64,6 +65,7 @@ console_fns ns16550_fns_polled = ns16550_write_support_polled, /* deviceWrite */ ns16550_init, /* deviceInitialize */ ns16550_write_polled, /* deviceWritePolled */ + NULL, /* deviceSetAttributes */ FALSE, /* deviceOutputUsesInterrupts */ }; @@ -598,8 +600,8 @@ static int ns16550_inbyte_nonblocking_polled( ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS); if(ucLineStatus & SP_LSR_RDY) { cChar = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER); - return((int)cChar); + return (int)cChar; } else { - return(-1); + return -1; } } diff --git a/c/src/lib/libchip/serial/serial.h b/c/src/lib/libchip/serial/serial.h index 30c610e8ee..e2c1f76f51 100644 --- a/c/src/lib/libchip/serial/serial.h +++ b/c/src/lib/libchip/serial/serial.h @@ -42,6 +42,7 @@ typedef struct _console_fns { int (*deviceWrite)(int minor, const char *buf, int len); void (*deviceInitialize)(int minor); void (*deviceWritePolled)(int minor, char cChar); + int (*deviceSetAttributes)(int minor, const struct termios *t); int deviceOutputUsesInterrupts; } console_fns; diff --git a/c/src/lib/libchip/serial/z85c30.c b/c/src/lib/libchip/serial/z85c30.c index e9fc83c462..8fa9966d19 100644 --- a/c/src/lib/libchip/serial/z85c30.c +++ b/c/src/lib/libchip/serial/z85c30.c @@ -67,6 +67,7 @@ console_fns z85c30_fns = z85c30_write_support_int, /* deviceWrite */ z85c30_initialize_interrupts, /* deviceInitialize */ z85c30_write_polled, /* deviceWritePolled */ + NULL, /* deviceSetAttributes */ FALSE, /* deviceOutputUsesInterrupts */ }; @@ -79,6 +80,7 @@ console_fns z85c30_fns_polled = z85c30_write_support_polled, /* deviceWrite */ z85c30_init, /* deviceInitialize */ z85c30_write_polled, /* deviceWritePolled */ + NULL, /* deviceSetAttributes */ FALSE, /* deviceOutputUsesInterrupts */ }; diff --git a/c/src/libchip/serial/ns16550.c b/c/src/libchip/serial/ns16550.c index 372e572a57..4314aff9f8 100644 --- a/c/src/libchip/serial/ns16550.c +++ b/c/src/libchip/serial/ns16550.c @@ -52,6 +52,7 @@ console_fns ns16550_fns = ns16550_write_support_int, /* deviceWrite */ ns16550_initialize_interrupts, /* deviceInitialize */ ns16550_write_polled, /* deviceWritePolled */ + NULL, /* deviceSetAttributes */ FALSE, /* deviceOutputUsesInterrupts */ }; @@ -64,6 +65,7 @@ console_fns ns16550_fns_polled = ns16550_write_support_polled, /* deviceWrite */ ns16550_init, /* deviceInitialize */ ns16550_write_polled, /* deviceWritePolled */ + NULL, /* deviceSetAttributes */ FALSE, /* deviceOutputUsesInterrupts */ }; @@ -598,8 +600,8 @@ static int ns16550_inbyte_nonblocking_polled( ucLineStatus = (*getReg)(pNS16550, NS16550_LINE_STATUS); if(ucLineStatus & SP_LSR_RDY) { cChar = (*getReg)(pNS16550, NS16550_RECEIVE_BUFFER); - return((int)cChar); + return (int)cChar; } else { - return(-1); + return -1; } } diff --git a/c/src/libchip/serial/serial.h b/c/src/libchip/serial/serial.h index 30c610e8ee..e2c1f76f51 100644 --- a/c/src/libchip/serial/serial.h +++ b/c/src/libchip/serial/serial.h @@ -42,6 +42,7 @@ typedef struct _console_fns { int (*deviceWrite)(int minor, const char *buf, int len); void (*deviceInitialize)(int minor); void (*deviceWritePolled)(int minor, char cChar); + int (*deviceSetAttributes)(int minor, const struct termios *t); int deviceOutputUsesInterrupts; } console_fns; diff --git a/c/src/libchip/serial/z85c30.c b/c/src/libchip/serial/z85c30.c index e9fc83c462..8fa9966d19 100644 --- a/c/src/libchip/serial/z85c30.c +++ b/c/src/libchip/serial/z85c30.c @@ -67,6 +67,7 @@ console_fns z85c30_fns = z85c30_write_support_int, /* deviceWrite */ z85c30_initialize_interrupts, /* deviceInitialize */ z85c30_write_polled, /* deviceWritePolled */ + NULL, /* deviceSetAttributes */ FALSE, /* deviceOutputUsesInterrupts */ }; @@ -79,6 +80,7 @@ console_fns z85c30_fns_polled = z85c30_write_support_polled, /* deviceWrite */ z85c30_init, /* deviceInitialize */ z85c30_write_polled, /* deviceWritePolled */ + NULL, /* deviceSetAttributes */ FALSE, /* deviceOutputUsesInterrupts */ }; |