aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/cy
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1999-09-28 11:45:31 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1999-09-28 11:45:31 +0000
commit1ab305ef608dc3a8a8bc426b615e6b81bd7f5a05 (patch)
tree78e614a9d8df297bbfd1f6032918394d497d7e7e /sys/dev/cy
parent340b1ef5450ecb74273a36b438c177af7f1d40b0 (diff)
Notes
Diffstat (limited to 'sys/dev/cy')
-rw-r--r--sys/dev/cy/cy.c20
-rw-r--r--sys/dev/cy/cy_isa.c20
2 files changed, 2 insertions, 38 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 472544a00f912..041b4ddef8236 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -132,7 +132,6 @@
#define sioopen cyopen
#define siopoll cypoll
#define sioprobe cyprobe
-#define sioread cyread
#define siosettimeout cysettimeout
#define siosetwater cysetwater
#define comstop cystop
@@ -367,7 +366,6 @@ struct isa_driver siodriver = {
static d_open_t sioopen;
static d_close_t sioclose;
-static d_read_t sioread;
static d_write_t siowrite;
static d_ioctl_t sioioctl;
@@ -375,7 +373,7 @@ static d_ioctl_t sioioctl;
static struct cdevsw sio_cdevsw = {
/* open */ sioopen,
/* close */ sioclose,
- /* read */ sioread,
+ /* read */ ttyread,
/* write */ siowrite,
/* ioctl */ sioioctl,
/* poll */ ttypoll,
@@ -940,22 +938,6 @@ comhardclose(com)
}
static int
-sioread(dev, uio, flag)
- dev_t dev;
- struct uio *uio;
- int flag;
-{
- int mynor;
- struct tty *tp;
-
- mynor = minor(dev);
- if (mynor & CONTROL_MASK)
- return (ENODEV);
- tp = com_addr(MINOR_TO_UNIT(mynor))->tp;
- return ((*linesw[tp->t_line].l_read)(tp, uio, flag));
-}
-
-static int
siowrite(dev, uio, flag)
dev_t dev;
struct uio *uio;
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 472544a00f912..041b4ddef8236 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -132,7 +132,6 @@
#define sioopen cyopen
#define siopoll cypoll
#define sioprobe cyprobe
-#define sioread cyread
#define siosettimeout cysettimeout
#define siosetwater cysetwater
#define comstop cystop
@@ -367,7 +366,6 @@ struct isa_driver siodriver = {
static d_open_t sioopen;
static d_close_t sioclose;
-static d_read_t sioread;
static d_write_t siowrite;
static d_ioctl_t sioioctl;
@@ -375,7 +373,7 @@ static d_ioctl_t sioioctl;
static struct cdevsw sio_cdevsw = {
/* open */ sioopen,
/* close */ sioclose,
- /* read */ sioread,
+ /* read */ ttyread,
/* write */ siowrite,
/* ioctl */ sioioctl,
/* poll */ ttypoll,
@@ -940,22 +938,6 @@ comhardclose(com)
}
static int
-sioread(dev, uio, flag)
- dev_t dev;
- struct uio *uio;
- int flag;
-{
- int mynor;
- struct tty *tp;
-
- mynor = minor(dev);
- if (mynor & CONTROL_MASK)
- return (ENODEV);
- tp = com_addr(MINOR_TO_UNIT(mynor))->tp;
- return ((*linesw[tp->t_line].l_read)(tp, uio, flag));
-}
-
-static int
siowrite(dev, uio, flag)
dev_t dev;
struct uio *uio;