summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev
diff options
context:
space:
mode:
authorleo <leo@NetBSD.org>1996-04-18 08:51:11 +0000
committerleo <leo@NetBSD.org>1996-04-18 08:51:11 +0000
commitb3fadef7e070025c61ceaca0cbdd8ab39f26e682 (patch)
treef5130d0569ee6105da1fa92a2c0808123361cd5c /sys/arch/atari/dev
parent7a8c8f8a5c113b8893b33a92c4c6fee9ef391a1e (diff)
Yet more prototyping and -Wall fixes.
Diffstat (limited to 'sys/arch/atari/dev')
-rw-r--r--sys/arch/atari/dev/atari5380.c10
-rw-r--r--sys/arch/atari/dev/fd.c5
-rw-r--r--sys/arch/atari/dev/grf.c39
-rw-r--r--sys/arch/atari/dev/grfabs_tt.c16
-rw-r--r--sys/arch/atari/dev/ite.c28
-rw-r--r--sys/arch/atari/dev/ite_cc.c14
-rw-r--r--sys/arch/atari/dev/itevar.h22
-rw-r--r--sys/arch/atari/dev/kbd.c9
-rw-r--r--sys/arch/atari/dev/lpt.c12
-rw-r--r--sys/arch/atari/dev/md_root.c7
-rw-r--r--sys/arch/atari/dev/nvram.c6
-rw-r--r--sys/arch/atari/dev/rd_root.c7
-rw-r--r--sys/arch/atari/dev/view.c43
-rw-r--r--sys/arch/atari/dev/viewvar.h12
-rw-r--r--sys/arch/atari/dev/zs.c4
15 files changed, 139 insertions, 95 deletions
diff --git a/sys/arch/atari/dev/atari5380.c b/sys/arch/atari/dev/atari5380.c
index 0d36c0c9146..b1a31ee9264 100644
--- a/sys/arch/atari/dev/atari5380.c
+++ b/sys/arch/atari/dev/atari5380.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.11 1996/04/12 09:05:31 leo Exp $ */
+/* $NetBSD: atari5380.c,v 1.12 1996/04/18 08:51:50 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -880,7 +880,7 @@ machine_match(struct device *pdp, void *match, void *auxp,
static u_char *
alloc_bounceb(u_long len)
{
- u_long tmp;
+ void *tmp;
return((u_char *)alloc_stmem(len, &tmp));
}
@@ -900,7 +900,8 @@ scsi_ctrl(int sr)
if (GET_5380_REG(NCR5380_DMSTAT) & SC_IRQ_SET) {
scsi_idisable();
if (!BASEPRI(sr))
- add_sicallback(ncr_ctrl_intr, cur_softc, 0);
+ add_sicallback((si_farg)ncr_ctrl_intr,
+ (void *)cur_softc, 0);
else {
spl1();
ncr_ctrl_intr(cur_softc);
@@ -919,7 +920,8 @@ scsi_dma(int sr)
if ((reqp = connected) && (reqp->dr_flag & DRIVER_IN_DMA)) {
scsi_idisable();
if (!BASEPRI(sr))
- add_sicallback(ncr_dma_intr, cur_softc, 0);
+ add_sicallback((si_farg)ncr_dma_intr,
+ (void *)cur_softc, 0);
else {
spl1();
ncr_dma_intr(cur_softc);
diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c
index 6bb9493e235..3fb06a8d092 100644
--- a/sys/arch/atari/dev/fd.c
+++ b/sys/arch/atari/dev/fd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.19 1996/04/12 09:05:35 leo Exp $ */
+/* $NetBSD: fd.c,v 1.20 1996/04/18 08:51:52 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -68,6 +68,7 @@
#include <machine/mfp.h>
#include <machine/dma.h>
#include <machine/video.h>
+#include <machine/cpu.h>
#include <atari/dev/ym2149reg.h>
#include <atari/dev/fdreg.h>
@@ -740,7 +741,7 @@ int drive, head, dense;
}
if(i != selected) {
selected = i;
- ym2149_fd_select(i ^ PA_FDSEL);
+ ym2149_fd_select((i ^ PA_FDSEL));
}
return(spinning);
}
diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c
index 7478e2b9bad..8f2690dc027 100644
--- a/sys/arch/atari/dev/grf.c
+++ b/sys/arch/atari/dev/grf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grf.c,v 1.9 1996/03/20 08:17:48 leo Exp $ */
+/* $NetBSD: grf.c,v 1.10 1996/04/18 08:51:54 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -82,11 +82,11 @@
#define ite_reinit(d)
#endif
-int grfopen __P((dev_t, int, int, struct proc *));
-int grfclose __P((dev_t, int));
-int grfioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-int grfselect __P((dev_t, int));
-int grfmmap __P((dev_t, int, int));
+dev_type_open(grfopen);
+dev_type_close(grfclose);
+dev_type_ioctl(grfioctl);
+dev_type_select(grfselect);
+dev_type_mmap(grfmmap);
int grfon __P((dev_t));
int grfoff __P((dev_t));
@@ -155,7 +155,7 @@ void *match, *auxp;
/*
* XXX: console init opens view 0
*/
- if(viewopen(0, 0))
+ if(viewopen(0, 0, 0, NULL))
return(0);
cfdata_gbus = cfp;
}
@@ -183,7 +183,7 @@ void *auxp;
* Skip opening view[0] when we this is the console.
*/
if(!did_cons || (i > 0))
- if(viewopen(i, 0))
+ if(viewopen(i, 0, 0, NULL))
break;
config_found(dp, (void*)&i, grfbusprint);
}
@@ -327,9 +327,11 @@ grfopen(dev, flags, devtype, p)
/*ARGSUSED*/
int
-grfclose(dev, flags)
- dev_t dev;
- int flags;
+grfclose(dev, flags, mode, p)
+ dev_t dev;
+ int flags;
+ int mode;
+ struct proc *p;
{
struct grf_softc *gp;
@@ -406,9 +408,10 @@ struct proc *p;
/*ARGSUSED*/
int
-grfselect(dev, rw)
- dev_t dev;
- int rw;
+grfselect(dev, rw, p)
+ dev_t dev;
+ int rw;
+ struct proc *p;
{
if (rw == FREAD)
return(0);
@@ -514,14 +517,14 @@ struct grf_softc *gp;
gi = &gp->g_display;
- viewioctl(gp->g_viewdev, VIOCGBMAP, &bm, 0, -1);
+ viewioctl(gp->g_viewdev, VIOCGBMAP, (caddr_t)&bm, 0, NOPROC);
gp->g_data = (caddr_t) 0xDeadBeaf; /* not particularly clean.. */
gi->gd_fbaddr = bm.hw_address;
gi->gd_fbsize = bm.depth*bm.bytes_per_row*bm.rows;
- if(viewioctl(gp->g_viewdev, VIOCGSIZE, &vs, 0, -1)) {
+ if(viewioctl(gp->g_viewdev, VIOCGSIZE, (caddr_t)&vs, 0, NOPROC)) {
/*
* fill in some default values...
* XXX: Should _never_ happen
@@ -561,10 +564,10 @@ void *arg;
* Get in sync with view, ite might have changed it.
*/
grf_viewsync(gp);
- viewioctl(gp->g_viewdev, VIOCDISPLAY, NULL, 0, -1);
+ viewioctl(gp->g_viewdev, VIOCDISPLAY, NULL, 0, NOPROC);
return(0);
case GM_GRFOFF:
- viewioctl(gp->g_viewdev, VIOCREMOVE, NULL, 0, -1);
+ viewioctl(gp->g_viewdev, VIOCREMOVE, NULL, 0, NOPROC);
return(0);
case GM_GRFCONFIG:
default:
diff --git a/sys/arch/atari/dev/grfabs_tt.c b/sys/arch/atari/dev/grfabs_tt.c
index 520566aed7b..c526132fc87 100644
--- a/sys/arch/atari/dev/grfabs_tt.c
+++ b/sys/arch/atari/dev/grfabs_tt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: grfabs_tt.c,v 1.3 1996/04/12 09:05:40 leo Exp $ */
+/* $NetBSD: grfabs_tt.c,v 1.4 1996/04/18 08:51:57 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -72,13 +72,13 @@ struct grfabs_sw tt_vid_sw = {
};
static dmode_t vid_modes[] = {
- { { NULL, NULL }, "sthigh", { 640, 400 }, 1, RES_STHIGH, &tt_vid_sw },
- { { NULL, NULL }, "tthigh", { 1280, 960 }, 1, RES_TTHIGH, &tt_vid_sw },
- { { NULL, NULL }, "stmid", { 640, 200 }, 2, RES_STMID , &tt_vid_sw },
- { { NULL, NULL }, "stlow", { 320, 200 }, 4, RES_STLOW , &tt_vid_sw },
- { { NULL, NULL }, "ttmid", { 640, 480 }, 4, RES_TTMID , &tt_vid_sw },
- { { NULL, NULL }, "ttlow", { 320, 480 }, 8, RES_TTLOW , &tt_vid_sw },
- { { NULL, NULL }, NULL, }
+ { { NULL, NULL }, "sthigh", { 640, 400 }, 1, {RES_STHIGH}, &tt_vid_sw },
+ { { NULL, NULL }, "tthigh", { 1280, 960 }, 1, {RES_TTHIGH}, &tt_vid_sw },
+ { { NULL, NULL }, "stmid", { 640, 200 }, 2, {RES_STMID }, &tt_vid_sw },
+ { { NULL, NULL }, "stlow", { 320, 200 }, 4, {RES_STLOW }, &tt_vid_sw },
+ { { NULL, NULL }, "ttmid", { 640, 480 }, 4, {RES_TTMID }, &tt_vid_sw },
+ { { NULL, NULL }, "ttlow", { 320, 480 }, 8, {RES_TTLOW }, &tt_vid_sw },
+ { { NULL, NULL }, NULL, }
};
/*
diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c
index a6e029b09eb..797a118893e 100644
--- a/sys/arch/atari/dev/ite.c
+++ b/sys/arch/atari/dev/ite.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.11 1996/03/20 12:41:50 leo Exp $ */
+/* $NetBSD: ite.c,v 1.12 1996/04/18 08:51:59 leo Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -59,8 +59,12 @@
#include <sys/proc.h>
#include <dev/cons.h>
+#include <machine/cpu.h>
+
#include <atari/atari/kdassert.h>
+#include <atari/dev/event_var.h>
#include <atari/dev/kbdmap.h>
+#include <atari/dev/kbdvar.h>
#include <atari/dev/iteioctl.h>
#include <atari/dev/itevar.h>
#include <atari/dev/grfioctl.h>
@@ -126,17 +130,6 @@ void iteattach __P((struct device *, struct device *, void *));
int itematch __P((struct device *, void *, void *));
/*
- * Standard character device functions.
- */
-dev_type_open(iteopen);
-dev_type_close(iteclose);
-dev_type_read(iteread);
-dev_type_write(itewrite);
-dev_type_ioctl(iteioctl);
-dev_type_tty(itetty);
-dev_type_stop(itestop);
-
-/*
* Console specific types.
*/
dev_type_cnprobe(itecnprobe);
@@ -679,7 +672,7 @@ int unit;
/*
* Now make it visible
*/
- viewioctl(ip->grf->g_viewdev, VIOCDISPLAY, NULL, 0, -1);
+ viewioctl(ip->grf->g_viewdev, VIOCDISPLAY, NULL, 0, NOPROC);
}
/* XXX called after changes made in underlying grf layer. */
@@ -861,7 +854,7 @@ enum caller caller;
/* And now the old stuff. */
/* these are used to implement repeating keys.. */
-static u_char last_char;
+static u_int last_char;
static u_char tout_pending;
/*ARGSUSED*/
@@ -871,7 +864,8 @@ void *arg;
{
tout_pending = 0;
if(last_char)
- add_sicallback(ite_filter, last_char, ITEFILT_REPEATER);
+ add_sicallback((si_farg)ite_filter, (void *)last_char,
+ (void *)ITEFILT_REPEATER);
}
void
@@ -905,7 +899,7 @@ enum caller caller;
* to not allow a key-up event to get thru before a repeat for
* the key-down, we remove any outstanding callout requests..
*/
- rem_sicallback(ite_filter);
+ rem_sicallback((si_farg)ite_filter);
/*
@@ -1037,7 +1031,7 @@ enum caller caller;
/* handle dead keys */
if (key.mode & KBD_MODE_DEAD) {
/* if entered twice, send accent itself */
- if (last_dead == key.mode & KBD_MODE_ACCMASK)
+ if (last_dead == (key.mode & KBD_MODE_ACCMASK))
last_dead = 0;
else {
last_dead = key.mode & KBD_MODE_ACCMASK;
diff --git a/sys/arch/atari/dev/ite_cc.c b/sys/arch/atari/dev/ite_cc.c
index 2a30e696cb9..10627097e6f 100644
--- a/sys/arch/atari/dev/ite_cc.c
+++ b/sys/arch/atari/dev/ite_cc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_cc.c,v 1.5 1996/02/22 10:11:29 leo Exp $ */
+/* $NetBSD: ite_cc.c,v 1.6 1996/04/18 08:52:02 leo Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -146,7 +146,7 @@ register struct ite_softc *ip;
struct itewinsize wsz;
ipriv_t *cci;
- if(cci = ip->priv)
+ if((cci = ip->priv) != NULL)
return;
#if defined(KFONT_8X8)
@@ -202,7 +202,8 @@ struct itewinsize *winsz;
vs.height = winsz->height;
vs.depth = winsz->depth;
- error = viewioctl(ip->grf->g_viewdev, VIOCSSIZE, &vs, 0, -1);
+ error = viewioctl(ip->grf->g_viewdev, VIOCSSIZE, (caddr_t)&vs, 0,
+ NOPROC);
view = viewview(ip->grf->g_viewdev);
/*
@@ -347,10 +348,11 @@ struct proc *p;
case VIOCSCMAP:
case VIOCGCMAP:
/*
- * XXX watchout for that -1 its not really the kernel talking
- * XXX these two commands don't use the proc pointer though
+ * XXX watchout for that NOPROC. its not really the kernel
+ * XXX talking these two commands don't use the proc pointer
+ * XXX though.
*/
- error = viewioctl(ip->grf->g_viewdev, cmd, addr, flag, -1);
+ error = viewioctl(ip->grf->g_viewdev, cmd, addr, flag, NOPROC);
break;
default:
error = -1;
diff --git a/sys/arch/atari/dev/itevar.h b/sys/arch/atari/dev/itevar.h
index 9caaa1976b7..506af999d03 100644
--- a/sys/arch/atari/dev/itevar.h
+++ b/sys/arch/atari/dev/itevar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: itevar.h,v 1.4 1996/03/20 13:11:56 leo Exp $ */
+/* $NetBSD: itevar.h,v 1.5 1996/04/18 08:52:04 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman (Atari modifications)
@@ -168,6 +168,8 @@ enum tab_size { TABSIZE = 8 };
#define attrtest(ip, attr) 0
#define attrset(ip, attr)
+#ifdef _KERNEL
+
struct proc;
struct consdev;
struct termios;
@@ -182,6 +184,17 @@ void ite_cnfinish __P((struct ite_softc *));
/* standard ite device entry points. */
void iteinit __P((dev_t));
+/*
+ * Standard character device functions.
+ */
+dev_type_open(iteopen);
+dev_type_close(iteclose);
+dev_type_read(iteread);
+dev_type_write(itewrite);
+dev_type_ioctl(iteioctl);
+dev_type_tty(itetty);
+dev_type_stop(itestop);
+
/* ite functions */
int ite_on __P((dev_t, int));
void ite_off __P((dev_t, int));
@@ -191,4 +204,11 @@ void ite_reset __P((struct ite_softc *));
int ite_cnfilter __P((u_int, enum caller));
void ite_filter __P((u_int ,enum caller));
+/* ite_cc functions */
+int grfcc_cnprobe __P((void));
+void grfcc_iteinit __P((struct grf_softc *));
+int ite_grf_ioctl __P((struct ite_softc *, u_long, caddr_t, int,
+ struct proc *));
+#endif /* _KERNEL */
+
#endif /* _ITEVAR_H */
diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c
index 340424e9c82..3af9742fc76 100644
--- a/sys/arch/atari/dev/kbd.c
+++ b/sys/arch/atari/dev/kbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.9 1996/04/12 08:37:03 leo Exp $ */
+/* $NetBSD: kbd.c,v 1.10 1996/04/18 08:52:06 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -77,7 +77,7 @@ dev_type_select(kbdselect);
/* Interrupt handler */
void kbdintr __P((int));
-static void kbdsoft __P((void));
+static void kbdsoft __P((void *, void *));
static void kbdattach __P((struct device *, struct device *, void *));
static int kbdmatch __P((struct device *, void *, void *));
static int kbd_write_poll __P((u_char *, int));
@@ -307,7 +307,7 @@ int sr; /* sr at time of interrupt */
add_sicallback(kbdsoft, 0, 0);
} else {
spl1();
- kbdsoft();
+ kbdsoft(NULL, NULL);
}
}
}
@@ -316,7 +316,8 @@ int sr; /* sr at time of interrupt */
* Keyboard soft interrupt handler
*/
void
-kbdsoft()
+kbdsoft(junk1, junk2)
+void *junk1, *junk2;
{
int s;
u_char code;
diff --git a/sys/arch/atari/dev/lpt.c b/sys/arch/atari/dev/lpt.c
index c6403f599fe..1791350d466 100644
--- a/sys/arch/atari/dev/lpt.c
+++ b/sys/arch/atari/dev/lpt.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.1 1996/03/27 10:21:05 leo Exp $ */
+/* $NetBSD: lpt.c,v 1.2 1996/04/18 08:52:07 leo Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman
@@ -201,8 +201,8 @@ lptopen(dev, flag, mode, p)
}
/* wait 1/4 second, give up if we get a signal */
- if (error = tsleep((caddr_t)sc, LPTPRI | PCATCH, "lptopen",
- STEP) != EWOULDBLOCK) {
+ if ((error = tsleep((caddr_t)sc, LPTPRI | PCATCH, "lptopen",
+ STEP)) != EWOULDBLOCK) {
sc->sc_state = 0;
return error;
}
@@ -325,8 +325,8 @@ pushbytes(sc)
(void) lptintr();
splx(s);
}
- if (error = tsleep((caddr_t)sc, LPTPRI | PCATCH,
- "lptwrite2", 0))
+ if ((error = tsleep((caddr_t)sc, LPTPRI | PCATCH,
+ "lptwrite2", 0)) != 0)
return error;
}
}
@@ -347,7 +347,7 @@ lptwrite(dev, uio, flags)
size_t n;
int error = 0;
- while (n = min(LPT_BSIZE, uio->uio_resid)) {
+ while ((n = min(LPT_BSIZE, uio->uio_resid)) > 0) {
uiomove(sc->sc_cp = sc->sc_inbuf->b_data, n, uio);
sc->sc_count = n;
error = pushbytes(sc);
diff --git a/sys/arch/atari/dev/md_root.c b/sys/arch/atari/dev/md_root.c
index 672e39d3656..777baa5692c 100644
--- a/sys/arch/atari/dev/md_root.c
+++ b/sys/arch/atari/dev/md_root.c
@@ -1,4 +1,4 @@
-/* $NetBSD: md_root.c,v 1.2 1996/03/27 10:13:09 leo Exp $ */
+/* $NetBSD: md_root.c,v 1.3 1996/04/18 08:52:09 leo Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -91,8 +91,11 @@ struct read_info {
static int loaddisk __P((struct rd_conf *, dev_t ld_dev, struct proc *));
static int ramd_norm_read __P((struct read_info *));
+
+#ifdef support_compression
static int cpy_uncompressed __P((caddr_t, int, struct read_info *));
static int rd_compressed __P((caddr_t, int, struct read_info *));
+#endif
/*
* This is called during autoconfig.
@@ -177,7 +180,7 @@ struct proc *proc;
/*
* Open device and try to get some statistics.
*/
- if(error = bdp->d_open(ld_dev, FREAD | FNONBLOCK, 0, proc))
+ if((error = bdp->d_open(ld_dev, FREAD | FNONBLOCK, 0, proc)) != 0)
return(error);
if(bdp->d_ioctl(ld_dev, DIOCGDINFO, (caddr_t)&dl, FREAD, proc) == 0) {
/* Read on a cylinder basis */
diff --git a/sys/arch/atari/dev/nvram.c b/sys/arch/atari/dev/nvram.c
index 431c19e9f87..376007e7286 100644
--- a/sys/arch/atari/dev/nvram.c
+++ b/sys/arch/atari/dev/nvram.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nvram.c,v 1.2 1996/03/17 01:26:54 thorpej Exp $ */
+/* $NetBSD: nvram.c,v 1.3 1996/04/18 08:52:08 leo Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,6 +44,7 @@
#include <sys/uio.h>
#include <machine/iomap.h>
+#include <machine/cpu.h>
#include <atari/dev/clockreg.h>
#include <atari/dev/nvramvar.h>
@@ -130,6 +131,7 @@ int byteno;
#if NNVR > 0
+int
nvram_uio(uio)
struct uio *uio;
{
@@ -167,7 +169,7 @@ struct uio *uio;
for (i = 0, p = buf; i < nleft; i++, p++)
*p = mc146818_read(RTC, offset + i);
}
- if (i = uiomove(buf, nleft, uio))
+ if ((i = uiomove(buf, nleft, uio)) != 0)
return (i);
if (uio->uio_rw == UIO_WRITE) {
for (i = 0, p = buf; i < nleft; i++, p++)
diff --git a/sys/arch/atari/dev/rd_root.c b/sys/arch/atari/dev/rd_root.c
index 1dc31c10434..bc9ffe718f2 100644
--- a/sys/arch/atari/dev/rd_root.c
+++ b/sys/arch/atari/dev/rd_root.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rd_root.c,v 1.2 1996/03/27 10:13:09 leo Exp $ */
+/* $NetBSD: rd_root.c,v 1.3 1996/04/18 08:52:09 leo Exp $ */
/*
* Copyright (c) 1996 Leo Weppelman.
@@ -91,8 +91,11 @@ struct read_info {
static int loaddisk __P((struct rd_conf *, dev_t ld_dev, struct proc *));
static int ramd_norm_read __P((struct read_info *));
+
+#ifdef support_compression
static int cpy_uncompressed __P((caddr_t, int, struct read_info *));
static int rd_compressed __P((caddr_t, int, struct read_info *));
+#endif
/*
* This is called during autoconfig.
@@ -177,7 +180,7 @@ struct proc *proc;
/*
* Open device and try to get some statistics.
*/
- if(error = bdp->d_open(ld_dev, FREAD | FNONBLOCK, 0, proc))
+ if((error = bdp->d_open(ld_dev, FREAD | FNONBLOCK, 0, proc)) != 0)
return(error);
if(bdp->d_ioctl(ld_dev, DIOCGDINFO, (caddr_t)&dl, FREAD, proc) == 0) {
/* Read on a cylinder basis */
diff --git a/sys/arch/atari/dev/view.c b/sys/arch/atari/dev/view.c
index 6056c20d290..92a52b10e5c 100644
--- a/sys/arch/atari/dev/view.c
+++ b/sys/arch/atari/dev/view.c
@@ -1,4 +1,4 @@
-/* $NetBSD: view.c,v 1.7 1996/02/22 10:11:34 leo Exp $ */
+/* $NetBSD: view.c,v 1.8 1996/04/18 08:52:11 leo Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -45,6 +45,7 @@
#include <sys/device.h>
#include <sys/malloc.h>
#include <sys/queue.h>
+#include <sys/conf.h>
#include <machine/cpu.h>
#include <atari/dev/grfabs_reg.h>
#include <atari/dev/viewioctl.h>
@@ -57,13 +58,6 @@ static int view_setsize __P((struct view_softc *, struct view_size *));
static int view_get_colormap __P((struct view_softc *, colormap_t *));
static int view_set_colormap __P((struct view_softc *, colormap_t *));
-void viewclose __P((dev_t, int));
-int viewioctl __P((dev_t, u_long, caddr_t, int, struct proc *));
-int viewopen __P((dev_t, int));
-int viewmmap __P((dev_t, int, int));
-
-int viewprobe __P((void));
-
struct view_softc views[NVIEW];
static int view_inited;
@@ -76,6 +70,8 @@ int view_default_depth = 1;
/*
* functions for probeing.
*/
+void viewattach __P((int));
+
void
viewattach(cnt)
int cnt;
@@ -281,9 +277,12 @@ colormap_t *ucm;
*/
/*ARGSUSED*/
-int viewopen(dev, flags)
-dev_t dev;
-int flags;
+int
+viewopen(dev, flags, mode, p)
+dev_t dev;
+int flags;
+int mode;
+struct proc *p;
{
dimen_t size;
struct view_softc *vu;
@@ -314,21 +313,24 @@ int flags;
}
/*ARGSUSED*/
-void
-viewclose (dev, flags)
- dev_t dev;
- int flags;
+int
+viewclose (dev, flags, mode, p)
+ dev_t dev;
+ int flags;
+ int mode;
+ struct proc *p;
{
struct view_softc *vu;
vu = &views[minor(dev)];
if ((vu->flags & VUF_OPEN) == 0)
- return;
+ return (0); /* XXX not open? */
view_remove (vu);
grf_free_view (vu->view);
vu->flags = 0;
vu->view = NULL;
+ return (0);
}
@@ -364,7 +366,7 @@ struct proc *p;
case VIOCGBMAP:
bm = (bmap_t *)data;
bcopy(vu->view->bitmap, bm, sizeof(bmap_t));
- if ((int)p != -1) {
+ if (p != NOPROC) {
bm->plane = NULL;
bm->hw_address = NULL;
}
@@ -406,9 +408,10 @@ int off, prot;
/*ARGSUSED*/
int
-viewselect(dev, rw)
-dev_t dev;
-int rw;
+viewselect(dev, rw, p)
+dev_t dev;
+int rw;
+struct proc *p;
{
if(rw == FREAD)
return(0);
diff --git a/sys/arch/atari/dev/viewvar.h b/sys/arch/atari/dev/viewvar.h
index 3c4b7c59de4..92e453b2eaf 100644
--- a/sys/arch/atari/dev/viewvar.h
+++ b/sys/arch/atari/dev/viewvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: viewvar.h,v 1.2 1995/05/28 19:45:43 leo Exp $ */
+/* $NetBSD: viewvar.h,v 1.3 1996/04/18 08:52:12 leo Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -37,6 +37,8 @@
* refered to by open/close/ioctl. This device serves as
* a interface to graphics. */
+#define NOPROC ((struct proc *)-1) /* XXX */
+
struct view_softc {
struct view_size size;
view_t *view;
@@ -60,4 +62,12 @@ enum view_unit_flags {
#ifdef _KERNEL
view_t *viewview __P((dev_t));
+int viewprobe __P((void));
+
+dev_type_close(viewclose);
+dev_type_ioctl(viewioctl);
+dev_type_open(viewopen);
+dev_type_mmap(viewmmap);
+dev_type_select(viewselect);
+
#endif /* _KERNEL */
diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c
index 262a202d8a6..05b6d375198 100644
--- a/sys/arch/atari/dev/zs.c
+++ b/sys/arch/atari/dev/zs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.18 1996/03/27 10:08:35 leo Exp $ */
+/* $NetBSD: zs.c,v 1.19 1996/04/18 08:52:14 leo Exp $ */
/*
* Copyright (c) 1995 L. Weppelman (Atari modifications)
@@ -564,7 +564,7 @@ long sr;
}
else if(!cb_scheduled) {
cb_scheduled++;
- add_sicallback(zssoft, 0, 0);
+ add_sicallback((si_farg)zssoft, 0, 0);
}
}
return(intflags & 2);