diff options
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/mem.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/cx.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/cy.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/pcvt/pcvt_drv.c | 6 | ||||
| -rw-r--r-- | sys/i386/isa/rc.c | 2 | ||||
| -rw-r--r-- | sys/i386/isa/si.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/sio.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/spigot.c | 1 | ||||
| -rw-r--r-- | sys/i386/isa/syscons.c | 8 | ||||
| -rw-r--r-- | sys/i386/isa/wd.c | 6 |
10 files changed, 20 insertions, 21 deletions
diff --git a/sys/i386/i386/mem.c b/sys/i386/i386/mem.c index 5702d87..d1f89cb 100644 --- a/sys/i386/i386/mem.c +++ b/sys/i386/i386/mem.c @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $Id: mem.c,v 1.23 1995/12/08 11:13:25 julian Exp $ + * $Id: mem.c,v 1.24 1995/12/08 23:20:02 phk Exp $ */ /* @@ -72,7 +72,7 @@ static d_open_t mmopen; static d_close_t mmclose; -static d_rdwr_t mmrw; +static d_read_t mmrw; static d_ioctl_t mmioctl; static d_mmap_t memmmap; diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c index 8e72dda..86b5ade 100644 --- a/sys/i386/isa/cx.c +++ b/sys/i386/isa/cx.c @@ -84,8 +84,8 @@ static d_read_t cxread; static d_write_t cxwrite; static d_ioctl_t cxioctl; static d_stop_t cxstop; +static d_devtotty_t cxdevtotty; static d_select_t cxselect; -static d_ttycv_t cxdevtotty; # define CDEV_MAJOR 42 diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index bc078cc..fe37485 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.24 1995/12/08 11:14:04 julian Exp $ + * $Id: cy.c,v 1.25 1995/12/08 23:20:24 phk Exp $ */ #include "cy.h" @@ -368,7 +368,7 @@ static d_read_t cyread; static d_write_t cywrite; static d_ioctl_t cyioctl; static d_stop_t cystop; -static d_ttycv_t cydevtotty; +static d_devtotty_t cydevtotty; #define CDEV_MAJOR 48 static struct cdevsw cy_cdevsw = diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index dca8922..6e5529e 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -109,10 +109,10 @@ static char vt_description[]; static d_open_t pcopen; static d_close_t pcclose; -static d_rdwr_t pcread; -static d_rdwr_t pcwrite; +static d_read_t pcread; +static d_write_t pcwrite; static d_ioctl_t pcioctl; -static d_ttycv_t pcdevtotty; +static d_devtotty_t pcdevtotty; static d_mmap_t pcmmap; static struct cdevsw pcdevsw = { diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 71d4fc0..2c26c31 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -106,7 +106,7 @@ static d_read_t rcread; static d_write_t rcwrite; static d_ioctl_t rcioctl; static d_stop_t rcstop; -static d_ttycv_t rcdevtotty; +static d_devtotty_t rcdevtotty; #define CDEV_MAJOR 63 static struct cdevsw rc_cdevsw = diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index 9fe26bb..5cc1e18 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id: si.c,v 1.24 1995/12/08 23:20:41 phk Exp $ + * $Id: si.c,v 1.25 1995/12/10 13:39:12 phk Exp $ */ #ifndef lint @@ -119,7 +119,7 @@ static d_read_t siread; static d_write_t siwrite; static d_ioctl_t siioctl; static d_stop_t sistop; -static d_ttycv_t sidevtotty; +static d_devtotty_t sidevtotty; #define CDEV_MAJOR 68 static struct cdevsw si_cdevsw = diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index b3a01b9..fa5941c 100644 --- a/sys/i386/isa/sio.c +++ b/sys/i386/isa/sio.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)com.c 7.5 (Berkeley) 5/16/91 - * $Id: sio.c,v 1.126 1995/12/08 23:20:44 phk Exp $ + * $Id: sio.c,v 1.127 1995/12/10 13:39:13 phk Exp $ */ #include "sio.h" @@ -305,7 +305,7 @@ static d_read_t sioread; static d_write_t siowrite; static d_ioctl_t sioioctl; static d_stop_t siostop; -static d_ttycv_t siodevtotty; +static d_devtotty_t siodevtotty; #define CDEV_MAJOR 28 static struct cdevsw sio_cdevsw = diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c index ccfabe3..c3e1139 100644 --- a/sys/i386/isa/spigot.c +++ b/sys/i386/isa/spigot.c @@ -101,7 +101,6 @@ struct isa_driver spigotdriver = {spigot_probe, spigot_attach, "spigot"}; static d_open_t spigot_open; static d_close_t spigot_close; -static d_rdwr_t spigot_rw; static d_read_t spigot_read; static d_write_t spigot_write; static d_ioctl_t spigot_ioctl; diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 6c3634d..dc628c7 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.135 1995/12/08 11:15:28 julian Exp $ + * $Id: syscons.c,v 1.136 1995/12/10 13:39:18 phk Exp $ */ #include "sc.h" @@ -158,10 +158,10 @@ struct isa_driver scdriver = { static d_open_t scopen; static d_close_t scclose; -static d_rdwr_t scread; -static d_rdwr_t scwrite; +static d_read_t scread; +static d_write_t scwrite; static d_ioctl_t scioctl; -static d_ttycv_t scdevtotty; +static d_devtotty_t scdevtotty; static d_mmap_t scmmap; static struct cdevsw scdevsw = { diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index f9fe93f..3cdfeac 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.97 1995/12/08 11:15:43 julian Exp $ + * $Id: wd.c,v 1.98 1995/12/08 23:20:52 phk Exp $ */ /* TODO: @@ -303,10 +303,10 @@ struct isa_driver wdcdriver = { static d_open_t wdopen; static d_close_t wdclose; +static d_strategy_t wdstrategy; static d_ioctl_t wdioctl; static d_dump_t wddump; -static d_size_t wdsize; -static d_strategy_t wdstrategy; +static d_psize_t wdsize; #define CDEV_MAJOR 3 #define BDEV_MAJOR 0 |
