From 4cd4c5a092693b414afcc18104c929599d65d531 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 22 Jun 1998 11:07:51 +0000 Subject: Moved set and get Register and Data type defininitions to serial.h. Cleaned up spacing. --- c/src/lib/libchip/serial/ns16550.c | 9 +-------- c/src/lib/libchip/serial/ns16550.h | 2 ++ c/src/lib/libchip/serial/ns16550_p.h | 1 - c/src/lib/libchip/serial/z85c30.c | 13 ++----------- 4 files changed, 5 insertions(+), 20 deletions(-) (limited to 'c/src/lib/libchip') diff --git a/c/src/lib/libchip/serial/ns16550.c b/c/src/lib/libchip/serial/ns16550.c index a975dbb736..372e572a57 100644 --- a/c/src/lib/libchip/serial/ns16550.c +++ b/c/src/lib/libchip/serial/ns16550.c @@ -69,20 +69,13 @@ console_fns ns16550_fns_polled = extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); -/* - * Types for get and set register routines - */ - -typedef unsigned8 (*getRegister_f)(unsigned32 port, unsigned8 register); -typedef void (*setRegister_f)( - unsigned32 port, unsigned8 reg, unsigned8 value); /* * Console Device Driver Entry Points */ static boolean ns16550_probe(int minor) { /* - * If the configuration dependant probe has located the device then + * If the configuration dependent probe has located the device then * assume it is there */ return(TRUE); diff --git a/c/src/lib/libchip/serial/ns16550.h b/c/src/lib/libchip/serial/ns16550.h index e797ba2244..cb01d20a85 100644 --- a/c/src/lib/libchip/serial/ns16550.h +++ b/c/src/lib/libchip/serial/ns16550.h @@ -24,12 +24,14 @@ extern "C" { /* * Driver function table */ + extern console_fns ns16550_fns; extern console_fns ns16550_fns_polled; /* * Flow control function tables */ + extern console_flow ns16550_flow_RTSCTS; extern console_flow ns16550_flow_DTRCTS; diff --git a/c/src/lib/libchip/serial/ns16550_p.h b/c/src/lib/libchip/serial/ns16550_p.h index f1baca9fe0..4f91ce6c83 100644 --- a/c/src/lib/libchip/serial/ns16550_p.h +++ b/c/src/lib/libchip/serial/ns16550_p.h @@ -37,7 +37,6 @@ typedef volatile struct _SP_READ_REGISTERS { unsigned char ScratchPad; } SP_READ_REGISTERS, *PSP_READ_REGISTERS; - #define NS16550_RECEIVE_BUFFER 0 #define NS16550_INTERRUPT_ENABLE 1 #define NS16550_INTERRUPT_ID 2 diff --git a/c/src/lib/libchip/serial/z85c30.c b/c/src/lib/libchip/serial/z85c30.c index 247ecf4406..e9fc83c462 100644 --- a/c/src/lib/libchip/serial/z85c30.c +++ b/c/src/lib/libchip/serial/z85c30.c @@ -84,15 +84,6 @@ console_fns z85c30_fns_polled = extern void set_vector( rtems_isr_entry, rtems_vector_number, int ); -/* - * Types for get and set register routines - */ - -typedef unsigned8 (*getRegister_f)(unsigned32 port, unsigned8 register); -typedef void (*setRegister_f)( - unsigned32 port, unsigned8 reg, unsigned8 value); -typedef unsigned8 (*getData_f)(unsigned32 port); -typedef void (*setData_f)(unsigned32 port, unsigned8 value); /* @@ -299,7 +290,7 @@ static void z85c30_write_polled( static boolean z85c30_probe(int minor) { /* - * If the configuration dependant probe has located the device then + * If the configuration dependent probe has located the device then * assume it is there */ @@ -507,7 +498,7 @@ static void z85c30_process( setReg = Console_Port_Tbl[minor].setRegister; getReg = Console_Port_Tbl[minor].getRegister; getData = Console_Port_Tbl[minor].getData; - getData = Console_Port_Tbl[minor].getData; + setData = Console_Port_Tbl[minor].setData; /* * Deal with any received characters -- cgit v1.2.3