From 424e23ee48533fdaa4cefd2670cb7a9ec6c61488 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 22 Jun 1998 10:17:14 +0000 Subject: spacing changes --- c/src/lib/libchip/serial/mc68681.c | 3 ++ c/src/lib/libchip/serial/mc68681_p.h | 2 ++ c/src/lib/libchip/serial/serial.h | 62 ++++++++++++++++++------------------ c/src/libchip/serial/mc68681.c | 3 ++ c/src/libchip/serial/mc68681_p.h | 2 ++ c/src/libchip/serial/serial.h | 62 ++++++++++++++++++------------------ 6 files changed, 72 insertions(+), 62 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libchip/serial/mc68681.c b/c/src/lib/libchip/serial/mc68681.c index 2b249e2dcd..5461484a7a 100644 --- a/c/src/lib/libchip/serial/mc68681.c +++ b/c/src/lib/libchip/serial/mc68681.c @@ -28,6 +28,7 @@ /* * Flow control is only supported when using interrupts */ + console_flow mc68681_flow_RTSCTS = { mc68681_negate_RTS, /* deviceStopRemoteTx */ @@ -76,6 +77,7 @@ typedef void (*setRegister_f)( /* * Console Device Driver Entry Points */ + static boolean mc68681_probe(int minor) { /* @@ -182,6 +184,7 @@ static int mc68681_close( /* * mc68681_write_polled */ + static void mc68681_write_polled( int minor, char cChar diff --git a/c/src/lib/libchip/serial/mc68681_p.h b/c/src/lib/libchip/serial/mc68681_p.h index 2f9fa483f7..13af0dc553 100644 --- a/c/src/lib/libchip/serial/mc68681_p.h +++ b/c/src/lib/libchip/serial/mc68681_p.h @@ -17,6 +17,8 @@ #ifdef __cplusplus extern "C" { #endif + + typedef struct _mc68681_context { unsigned8 ucModemCtrl; diff --git a/c/src/lib/libchip/serial/serial.h b/c/src/lib/libchip/serial/serial.h index b1cedae080..046652ce6a 100644 --- a/c/src/lib/libchip/serial/serial.h +++ b/c/src/lib/libchip/serial/serial.h @@ -25,54 +25,54 @@ #include typedef struct _console_fns { - boolean (*deviceProbe)(int minor); - int (*deviceFirstOpen)(int major, int minor, void *arg); - int (*deviceLastClose)(int major, int minor, void *arg); - int (*deviceRead)(int minor); - int (*deviceWrite)(int minor, const char *buf, int len); - void (*deviceInitialize)(int minor); - void (*deviceWritePolled)(int minor, char cChar); - int deviceOutputUsesInterrupts; + boolean (*deviceProbe)(int minor); + int (*deviceFirstOpen)(int major, int minor, void *arg); + int (*deviceLastClose)(int major, int minor, void *arg); + int (*deviceRead)(int minor); + int (*deviceWrite)(int minor, const char *buf, int len); + void (*deviceInitialize)(int minor); + void (*deviceWritePolled)(int minor, char cChar); + int deviceOutputUsesInterrupts; } console_fns; typedef struct _console_flow { - int (*deviceStopRemoteTx)(int minor); - int (*deviceStartRemoteTx)(int minor); + int (*deviceStopRemoteTx)(int minor); + int (*deviceStartRemoteTx)(int minor); } console_flow; typedef struct _console_tbl { - char *sDeviceName; - console_fns *pDeviceFns; - boolean (*deviceProbe)(int minor); - console_flow *pDeviceFlow; - unsigned32 ulMargin; - unsigned32 ulHysteresis; - void *pDeviceParams; - unsigned32 ulCtrlPort1; - unsigned32 ulCtrlPort2; - unsigned32 ulDataPort; + char *sDeviceName; + console_fns *pDeviceFns; + boolean (*deviceProbe)(int minor); + console_flow *pDeviceFlow; + unsigned32 ulMargin; + unsigned32 ulHysteresis; + void *pDeviceParams; + unsigned32 ulCtrlPort1; + unsigned32 ulCtrlPort2; + unsigned32 ulDataPort; unsigned8 (*getRegister)(unsigned32 port, unsigned8 register); void (*setRegister)( unsigned32 port, unsigned8 reg, unsigned8 value); unsigned8 (*getData)(unsigned32 port); void (*setData)(unsigned32 port, unsigned8 value); unsigned32 ulClock; - unsigned int ulIntVector; + unsigned int ulIntVector; } console_tbl; typedef struct _console_data { - void *termios_data; - volatile boolean bActive; - volatile Ring_buffer_t TxBuffer; - /* - * This field may be used for any purpose required by the driver - */ - void *pDeviceContext; + void *termios_data; + volatile boolean bActive; + volatile Ring_buffer_t TxBuffer; + /* + * This field may be used for any purpose required by the driver + */ + void *pDeviceContext; } console_data; -extern console_tbl Console_Port_Tbl[]; -extern console_data Console_Port_Data[]; -extern unsigned long Console_Port_Count; +extern console_tbl Console_Port_Tbl[]; +extern console_data Console_Port_Data[]; +extern unsigned long Console_Port_Count; #endif /* end of include file */ diff --git a/c/src/libchip/serial/mc68681.c b/c/src/libchip/serial/mc68681.c index 2b249e2dcd..5461484a7a 100644 --- a/c/src/libchip/serial/mc68681.c +++ b/c/src/libchip/serial/mc68681.c @@ -28,6 +28,7 @@ /* * Flow control is only supported when using interrupts */ + console_flow mc68681_flow_RTSCTS = { mc68681_negate_RTS, /* deviceStopRemoteTx */ @@ -76,6 +77,7 @@ typedef void (*setRegister_f)( /* * Console Device Driver Entry Points */ + static boolean mc68681_probe(int minor) { /* @@ -182,6 +184,7 @@ static int mc68681_close( /* * mc68681_write_polled */ + static void mc68681_write_polled( int minor, char cChar diff --git a/c/src/libchip/serial/mc68681_p.h b/c/src/libchip/serial/mc68681_p.h index 2f9fa483f7..13af0dc553 100644 --- a/c/src/libchip/serial/mc68681_p.h +++ b/c/src/libchip/serial/mc68681_p.h @@ -17,6 +17,8 @@ #ifdef __cplusplus extern "C" { #endif + + typedef struct _mc68681_context { unsigned8 ucModemCtrl; diff --git a/c/src/libchip/serial/serial.h b/c/src/libchip/serial/serial.h index b1cedae080..046652ce6a 100644 --- a/c/src/libchip/serial/serial.h +++ b/c/src/libchip/serial/serial.h @@ -25,54 +25,54 @@ #include typedef struct _console_fns { - boolean (*deviceProbe)(int minor); - int (*deviceFirstOpen)(int major, int minor, void *arg); - int (*deviceLastClose)(int major, int minor, void *arg); - int (*deviceRead)(int minor); - int (*deviceWrite)(int minor, const char *buf, int len); - void (*deviceInitialize)(int minor); - void (*deviceWritePolled)(int minor, char cChar); - int deviceOutputUsesInterrupts; + boolean (*deviceProbe)(int minor); + int (*deviceFirstOpen)(int major, int minor, void *arg); + int (*deviceLastClose)(int major, int minor, void *arg); + int (*deviceRead)(int minor); + int (*deviceWrite)(int minor, const char *buf, int len); + void (*deviceInitialize)(int minor); + void (*deviceWritePolled)(int minor, char cChar); + int deviceOutputUsesInterrupts; } console_fns; typedef struct _console_flow { - int (*deviceStopRemoteTx)(int minor); - int (*deviceStartRemoteTx)(int minor); + int (*deviceStopRemoteTx)(int minor); + int (*deviceStartRemoteTx)(int minor); } console_flow; typedef struct _console_tbl { - char *sDeviceName; - console_fns *pDeviceFns; - boolean (*deviceProbe)(int minor); - console_flow *pDeviceFlow; - unsigned32 ulMargin; - unsigned32 ulHysteresis; - void *pDeviceParams; - unsigned32 ulCtrlPort1; - unsigned32 ulCtrlPort2; - unsigned32 ulDataPort; + char *sDeviceName; + console_fns *pDeviceFns; + boolean (*deviceProbe)(int minor); + console_flow *pDeviceFlow; + unsigned32 ulMargin; + unsigned32 ulHysteresis; + void *pDeviceParams; + unsigned32 ulCtrlPort1; + unsigned32 ulCtrlPort2; + unsigned32 ulDataPort; unsigned8 (*getRegister)(unsigned32 port, unsigned8 register); void (*setRegister)( unsigned32 port, unsigned8 reg, unsigned8 value); unsigned8 (*getData)(unsigned32 port); void (*setData)(unsigned32 port, unsigned8 value); unsigned32 ulClock; - unsigned int ulIntVector; + unsigned int ulIntVector; } console_tbl; typedef struct _console_data { - void *termios_data; - volatile boolean bActive; - volatile Ring_buffer_t TxBuffer; - /* - * This field may be used for any purpose required by the driver - */ - void *pDeviceContext; + void *termios_data; + volatile boolean bActive; + volatile Ring_buffer_t TxBuffer; + /* + * This field may be used for any purpose required by the driver + */ + void *pDeviceContext; } console_data; -extern console_tbl Console_Port_Tbl[]; -extern console_data Console_Port_Data[]; -extern unsigned long Console_Port_Count; +extern console_tbl Console_Port_Tbl[]; +extern console_data Console_Port_Data[]; +extern unsigned long Console_Port_Count; #endif /* end of include file */ -- cgit v1.2.3