diff options
| author | nyan <nyan@FreeBSD.org> | 2002-09-29 11:41:48 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2002-09-29 11:41:48 +0000 |
| commit | 58532be08079c953325129e4a732ef24194da909 (patch) | |
| tree | f391404242337595634d2d23fcc9e8f7c1be38ad /sys | |
| parent | 478888efb1a3bebed80df32ba9c515300996c972 (diff) | |
| download | FreeBSD-src-58532be08079c953325129e4a732ef24194da909.zip FreeBSD-src-58532be08079c953325129e4a732ef24194da909.tar.gz | |
Merged from sys/dev/sio/sio.c revisions 1.380 and 1.381.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/cbus/sio.c | 17 | ||||
| -rw-r--r-- | sys/pc98/pc98/sio.c | 17 |
2 files changed, 16 insertions, 18 deletions
diff --git a/sys/pc98/cbus/sio.c b/sys/pc98/cbus/sio.c index 6d8c7d6..46da835 100644 --- a/sys/pc98/cbus/sio.c +++ b/sys/pc98/cbus/sio.c @@ -175,6 +175,8 @@ #define COM_ISMULTIPORT(flags) ((flags) & 0x01) #define COM_MPMASTER(flags) (((flags) >> 8) & 0x0ff) #define COM_NOTAST4(flags) ((flags) & 0x04) +#else +#define COM_ISMULTIPORT(flags) (0) #endif /* COM_MULTIPORT */ #define COM_CONSOLE(flags) ((flags) & 0x10) @@ -188,6 +190,7 @@ #define COM_NOPROBE(flags) ((flags) & COM_C_NOPROBE) #define COM_C_IIR_TXRDYBUG (0x80000) #define COM_IIR_TXRDYBUG(flags) ((flags) & COM_C_IIR_TXRDYBUG) +#define COM_NOSCR(flags) ((flags) & 0x100000) #define COM_FIFOSIZE(flags) (((flags) & 0xff000000) >> 24) #define sio_getreg(com, off) \ @@ -1586,12 +1589,8 @@ sioattach(dev, xrid, rclk) #ifndef PC98 -#ifdef COM_MULTIPORT - if (!COM_ISMULTIPORT(flags) && !COM_IIR_TXRDYBUG(flags)) -#else - if (!COM_IIR_TXRDYBUG(flags)) -#endif - { + if (!COM_ISMULTIPORT(flags) && + !COM_IIR_TXRDYBUG(flags) && !COM_NOSCR(flags)) { u_char scr; u_char scr1; u_char scr2; @@ -2454,7 +2453,7 @@ sioinput(com) #endif } -void +static void siointr(arg) void *arg; { @@ -4380,7 +4379,7 @@ siocncheckc(dev) } -int +static int siocngetc(dev) dev_t dev; { @@ -4407,7 +4406,7 @@ siocngetc(dev) return (c); } -void +static void siocnputc(dev, c) dev_t dev; int c; diff --git a/sys/pc98/pc98/sio.c b/sys/pc98/pc98/sio.c index 6d8c7d6..46da835 100644 --- a/sys/pc98/pc98/sio.c +++ b/sys/pc98/pc98/sio.c @@ -175,6 +175,8 @@ #define COM_ISMULTIPORT(flags) ((flags) & 0x01) #define COM_MPMASTER(flags) (((flags) >> 8) & 0x0ff) #define COM_NOTAST4(flags) ((flags) & 0x04) +#else +#define COM_ISMULTIPORT(flags) (0) #endif /* COM_MULTIPORT */ #define COM_CONSOLE(flags) ((flags) & 0x10) @@ -188,6 +190,7 @@ #define COM_NOPROBE(flags) ((flags) & COM_C_NOPROBE) #define COM_C_IIR_TXRDYBUG (0x80000) #define COM_IIR_TXRDYBUG(flags) ((flags) & COM_C_IIR_TXRDYBUG) +#define COM_NOSCR(flags) ((flags) & 0x100000) #define COM_FIFOSIZE(flags) (((flags) & 0xff000000) >> 24) #define sio_getreg(com, off) \ @@ -1586,12 +1589,8 @@ sioattach(dev, xrid, rclk) #ifndef PC98 -#ifdef COM_MULTIPORT - if (!COM_ISMULTIPORT(flags) && !COM_IIR_TXRDYBUG(flags)) -#else - if (!COM_IIR_TXRDYBUG(flags)) -#endif - { + if (!COM_ISMULTIPORT(flags) && + !COM_IIR_TXRDYBUG(flags) && !COM_NOSCR(flags)) { u_char scr; u_char scr1; u_char scr2; @@ -2454,7 +2453,7 @@ sioinput(com) #endif } -void +static void siointr(arg) void *arg; { @@ -4380,7 +4379,7 @@ siocncheckc(dev) } -int +static int siocngetc(dev) dev_t dev; { @@ -4407,7 +4406,7 @@ siocngetc(dev) return (c); } -void +static void siocnputc(dev, c) dev_t dev; int c; |
