diff options
| author | leo <leo@NetBSD.org> | 1996-02-22 10:10:44 +0000 |
|---|---|---|
| committer | leo <leo@NetBSD.org> | 1996-02-22 10:10:44 +0000 |
| commit | c9dfd5cb44e0e2730a3cff5fcb89ad1928856d2d (patch) | |
| tree | e4c1e4810cb1a3bbb93edecb0c9f41a8924a6c84 /sys/arch/atari | |
| parent | c86505a6a5873985ccbd9bd77760c2e0cb1e2ac8 (diff) | |
First bunch of changes due to stricter prototype checking.
Diffstat (limited to 'sys/arch/atari')
26 files changed, 312 insertions, 249 deletions
diff --git a/sys/arch/atari/atari/autoconf.c b/sys/arch/atari/atari/autoconf.c index 1c67416f72e..dd036dd2762 100644 --- a/sys/arch/atari/atari/autoconf.c +++ b/sys/arch/atari/atari/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.3 1996/01/06 20:10:41 leo Exp $ */ +/* $NetBSD: autoconf.c,v 1.4 1996/02/22 10:10:44 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -121,7 +121,7 @@ atari_config_found(pcfp, pdp, auxp, pfn) * basically this means start attaching the grfxx's that support * the console. Kinda hacky but it works. */ -int +void config_console() { struct cfdata *cf; diff --git a/sys/arch/atari/atari/disksubr.c b/sys/arch/atari/atari/disksubr.c index 71612b22ce3..df21df2c443 100644 --- a/sys/arch/atari/atari/disksubr.c +++ b/sys/arch/atari/atari/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.6 1996/02/19 09:05:31 leo Exp $ */ +/* $NetBSD: disksubr.c,v 1.7 1996/02/22 10:10:47 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -35,6 +35,7 @@ #endif #include <sys/param.h> +#include <sys/systm.h> #include <sys/buf.h> #include <ufs/ffs/fs.h> #include <sys/disklabel.h> @@ -49,12 +50,12 @@ #endif static void ck_label __P((struct disklabel *, struct cpu_disklabel *)); -static int bsd_label __P((dev_t, void (*)(), +static int bsd_label __P((dev_t, void (*)(struct buf *), struct disklabel *, u_int, u_int *)); -static int ahdi_label __P((dev_t, void (*)(), +static int ahdi_label __P((dev_t, void (*)(struct buf *), struct disklabel *, struct cpu_disklabel *)); static void ahdi_to_bsd __P((struct disklabel *, struct ahdi_ptbl *)); -static u_int ahdi_getparts __P((dev_t, void (*)(), u_int, +static u_int ahdi_getparts __P((dev_t, void (*)(struct buf *), u_int, u_int, u_int, struct ahdi_ptbl *)); /* @@ -87,6 +88,7 @@ bounds_check_with_label(bp, lp, wlabel) bp->b_flags |= B_ERROR; return(-1); } + maxsz = pp->p_size * (lp->d_secsize / DEV_BSIZE); sz = (bp->b_bcount + DEV_BSIZE - 1) >> DEV_BSHIFT; } else { @@ -134,7 +136,7 @@ bounds_check_with_label(bp, lp, wlabel) char * readdisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat)(); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; { @@ -245,7 +247,7 @@ setdisklabel(olp, nlp, openmask, clp) int writedisklabel(dev, strat, lp, clp) dev_t dev; - void (*strat)(); + void (*strat)(struct buf *); struct disklabel *lp; struct cpu_disklabel *clp; { @@ -302,7 +304,7 @@ writedisklabel(dev, strat, lp, clp) static int bsd_label(dev, strat, label, blkno, offset) dev_t dev; - void (*strat)(); + void (*strat)(struct buf *); struct disklabel *label; u_int blkno, *offset; @@ -405,7 +407,7 @@ ck_label(dl, cdl) int ahdi_label(dev, strat, dl, cdl) dev_t dev; - void (*strat)(); + void (*strat)(struct buf *); struct disklabel *dl; struct cpu_disklabel *cdl; { @@ -589,7 +591,7 @@ ahdi_to_bsd(dl, apt) static u_int ahdi_getparts(dev, strat, secpercyl, rsec, esec, apt) dev_t dev; - void (*strat)(); + void (*strat)(struct buf *); u_int secpercyl, rsec, esec; struct ahdi_ptbl *apt; diff --git a/sys/arch/atari/atari/dkbad.c b/sys/arch/atari/atari/dkbad.c index d426a362e83..8e70401183f 100644 --- a/sys/arch/atari/atari/dkbad.c +++ b/sys/arch/atari/atari/dkbad.c @@ -1,4 +1,4 @@ -/* $NetBSD: dkbad.c,v 1.1.1.1 1995/03/26 07:12:19 leo Exp $ */ +/* $NetBSD: dkbad.c,v 1.2 1996/02/22 10:10:49 leo Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -46,8 +46,10 @@ * Return -1 if not found. */ +int isbad(bt, cyl, trk, sec) register struct dkbad *bt; + int cyl, trk, sec; { register int i; register long blk, bblk; diff --git a/sys/arch/atari/atari/genassym.c b/sys/arch/atari/atari/genassym.c index fbb13c00396..740c11dd987 100644 --- a/sys/arch/atari/atari/genassym.c +++ b/sys/arch/atari/atari/genassym.c @@ -1,4 +1,4 @@ -/* $NetBSD: genassym.c,v 1.7 1996/02/02 19:42:29 mycroft Exp $ */ +/* $NetBSD: genassym.c,v 1.8 1996/02/22 10:10:50 leo Exp $ */ /* * Copyright (c) 1982, 1990 The Regents of the University of California. @@ -54,35 +54,36 @@ #include <machine/iomap.h> #include <machine/scu.h> -main() +#include <stdio.h> + +int +main(void) { register struct proc *p = (struct proc *)0; register struct vmmeter *vm = (struct vmmeter *)0; register struct user *up = (struct user *)0; - register struct rusage *rup = (struct rusage *)0; struct frame *frame = NULL; struct vmspace *vms = (struct vmspace *)0; pmap_t pmap = (pmap_t)0; struct pcb *pcb = (struct pcb *)0; struct mdproc *mdproc = (struct mdproc *)0; - register unsigned i; - printf("#define\tP_FORW %d\n", &p->p_forw); - printf("#define\tP_BACK %d\n", &p->p_back); - printf("#define\tP_VMSPACE %d\n", &p->p_vmspace); - printf("#define\tP_ADDR %d\n", &p->p_addr); - printf("#define\tP_PRIORITY %d\n", &p->p_priority); - printf("#define\tP_STAT %d\n", &p->p_stat); - printf("#define\tP_WCHAN %d\n", &p->p_wchan); - printf("#define\tP_MD %d\n", &p->p_md); - printf("#define\tP_PID %d\n", &p->p_pid); - printf("#define\tMD_REGS %d\n", &mdproc->md_regs); + printf("#define\tP_FORW %p\n", (void *)&p->p_forw); + printf("#define\tP_BACK %p\n", (void *)&p->p_back); + printf("#define\tP_VMSPACE %p\n", (void *)&p->p_vmspace); + printf("#define\tP_ADDR %p\n", (void *)&p->p_addr); + printf("#define\tP_PRIORITY %p\n", (void *)&p->p_priority); + printf("#define\tP_STAT %p\n", (void *)&p->p_stat); + printf("#define\tP_WCHAN %p\n", (void *)&p->p_wchan); + printf("#define\tP_MD %p\n", (void *)&p->p_md); + printf("#define\tP_PID %p\n", (void *)&p->p_pid); + printf("#define\tMD_REGS %p\n", (void *)&mdproc->md_regs); printf("#define\tSRUN %d\n", SRUN); - printf("#define\tPM_STCHG %d\n", &pmap->pm_stchanged); + printf("#define\tPM_STCHG %p\n", (void *)&pmap->pm_stchanged); - printf("#define\tVM_PMAP %d\n", &vms->vm_pmap); - printf("#define\tV_INTR %d\n", &vm->v_intr); + printf("#define\tVM_PMAP %p\n", (void *)&vms->vm_pmap); + printf("#define\tV_INTR %p\n", (void *)&vm->v_intr); printf("#define\tUPAGES %d\n", UPAGES); printf("#define\tUSPACE %d\n", USPACE); @@ -90,8 +91,9 @@ main() printf("#define\tPGSHIFT %d\n", PGSHIFT); printf("#define\tUSRSTACK %d\n", USRSTACK); - printf("#define\tU_PROF %d\n", &up->u_stats.p_prof); - printf("#define\tU_PROFSCALE %d\n", &up->u_stats.p_prof.pr_scale); + printf("#define\tU_PROF %p\n", (void *)&up->u_stats.p_prof); + printf("#define\tU_PROFSCALE %p\n", + (void *)&up->u_stats.p_prof.pr_scale); printf("#define\tT_BUSERR %d\n", T_BUSERR); printf("#define\tT_ADDRERR %d\n", T_ADDRERR); printf("#define\tT_ILLINST %d\n", T_ILLINST); @@ -140,19 +142,19 @@ main() printf("#define\tSG_NV %d\n", SG_NV); printf("#define\tSG_RW %d\n", SG_RW); printf("#define\tSG_FRAME %d\n", SG_FRAME); - printf("#define\tPCB_FLAGS %d\n", &pcb->pcb_flags); - printf("#define\tPCB_PS %d\n", &pcb->pcb_ps); - printf("#define\tPCB_USTP %d\n", &pcb->pcb_ustp); - printf("#define\tPCB_USP %d\n", &pcb->pcb_usp); - printf("#define\tPCB_REGS %d\n", pcb->pcb_regs); - printf("#define\tPCB_CMAP2 %d\n", &pcb->pcb_cmap2); - printf("#define\tPCB_ONFAULT %d\n", &pcb->pcb_onfault); - printf("#define\tPCB_FPCTX %d\n", &pcb->pcb_fpregs); + printf("#define\tPCB_FLAGS %p\n", (void *)&pcb->pcb_flags); + printf("#define\tPCB_PS %p\n", (void *)&pcb->pcb_ps); + printf("#define\tPCB_USTP %p\n", (void *)&pcb->pcb_ustp); + printf("#define\tPCB_USP %p\n", (void *)&pcb->pcb_usp); + printf("#define\tPCB_REGS %p\n", (void *)pcb->pcb_regs); + printf("#define\tPCB_CMAP2 %p\n", (void *)&pcb->pcb_cmap2); + printf("#define\tPCB_ONFAULT %p\n", (void *)&pcb->pcb_onfault); + printf("#define\tPCB_FPCTX %p\n", (void *)&pcb->pcb_fpregs); printf("#define\tSIZEOF_PCB %d\n", sizeof(struct pcb)); - printf("#define\tFR_SP %d\n", &frame->f_regs[15]); - printf("#define\tFR_HW %d\n", &frame->f_sr); - printf("#define\tFR_ADJ %d\n", &frame->f_stackadj); + printf("#define\tFR_SP %p\n", (void *)&frame->f_regs[15]); + printf("#define\tFR_HW %p\n", (void *)&frame->f_sr); + printf("#define\tFR_ADJ %p\n", (void *)&frame->f_stackadj); printf("#define\tSP %d\n", SP); printf("#define\tSYS_exit %d\n", SYS_exit); @@ -165,8 +167,8 @@ main() printf("#define\tMMU_68851 %d\n", MMU_68851); printf("#define\tMMU_68040 %d\n", MMU_68040); - printf("#define\tSOFTINT_ADDR %d\n", &SCU->sys_int); - printf("#define\tSYSMASK_ADDR %d\n", &SCU->sys_mask); + printf("#define\tSOFTINT_ADDR %p\n", (void *)&SCU->sys_int); + printf("#define\tSYSMASK_ADDR %p\n", (void *)&SCU->sys_mask); exit(0); } diff --git a/sys/arch/atari/atari/machdep.c b/sys/arch/atari/atari/machdep.c index 375429a11a7..7dfe8797cce 100644 --- a/sys/arch/atari/atari/machdep.c +++ b/sys/arch/atari/atari/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.18 1996/01/04 22:21:47 jtc Exp $ */ +/* $NetBSD: machdep.c,v 1.19 1996/02/22 10:10:51 leo Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -92,7 +92,8 @@ #include "ppp.h" static void call_sicallbacks __P((void)); -static void alloc_sicallback __P((void)); +static void identifycpu __P((void)); +static void netintr __P((void)); extern vm_offset_t avail_end; @@ -149,9 +150,7 @@ consinit() void cpu_startup() { - extern long Usrptsize; extern u_long boot_ttphysize, boot_stphysize; - extern struct map *useriomap; register unsigned i; register caddr_t v, firstaddr; int base, residual; @@ -161,7 +160,7 @@ cpu_startup() int opmapdebug = pmapdebug; #endif vm_offset_t minaddr, maxaddr; - vm_size_t size; + vm_size_t size = 0; /* * Initialize error message buffer (at end of core). @@ -338,11 +337,6 @@ again: nbuf, bufpages * CLBYTES); /* - * Set up CPU-specific registers, cache, etc. - */ - initcpu(); - - /* * Set up buffers, so they can be used to read disk labels. */ bufinit(); @@ -384,6 +378,7 @@ setregs(p, pack, stack, retval) char cpu_model[120]; extern char version[]; +static void identifycpu() { extern char *fpu_describe(); @@ -417,6 +412,7 @@ identifycpu() /* * machine dependent system variables. */ +int cpu_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) int *name; u_int namelen; @@ -823,6 +819,7 @@ unsigned dumpmag = 0x8fca0101; /* magic number for savecore */ int dumpsize = 0; /* also for savecore */ long dumplo = 0; +void dumpconf() { extern u_long boot_ttphysize, boot_stphysize; @@ -854,13 +851,14 @@ dumpsys() extern u_long boot_ttphysize, boot_ttphystart, boot_stphysize; daddr_t blkno; /* Current block to write */ - int (*dump)(); /* Dumping function */ + int (*dump) __P((dev_t, daddr_t, caddr_t, size_t)); + /* Dumping function */ u_long maddr; /* PA being dumped */ int segbytes; /* Number of bytes in this seg. */ int nbytes; /* Bytes left to dump */ int i, n, error; - msgbufmapped = 0; + error = msgbufmapped = 0; if (dumpdev == NODEV) return; /* @@ -987,10 +985,7 @@ void microtime(tvp) splx(s); } -initcpu() -{ -} - +void straytrap(pc, evec) int pc; u_short evec; @@ -1005,6 +1000,7 @@ u_short evec; } } +void straymfpint(pc, evec) int pc; u_short evec; @@ -1016,6 +1012,7 @@ u_short evec; /* * Simulated software interrupt handler */ +void softint() { if(ssir & SIR_NET) { @@ -1038,6 +1035,7 @@ softint() int *nofault; +int badbaddr(addr) register caddr_t addr; { @@ -1057,6 +1055,7 @@ badbaddr(addr) return(0); } +static void netintr() { #ifdef INET @@ -1114,23 +1113,6 @@ static int ncb; /* number of callback blocks allocated */ static int ncbd; /* number of callback blocks dynamically allocated */ #endif -static void alloc_sicallback() -{ - struct si_callback *si; - int s; - - si = (struct si_callback *)malloc(sizeof(*si), M_TEMP, M_NOWAIT); - if(si == NULL) - return; - s = splhigh(); - si->next = si_free; - si_free = si; - splx(s); -#ifdef DIAGNOSTIC - ++ncb; -#endif -} - void add_sicallback (function, rock1, rock2) void (*function) __P((void *rock1, void *rock2)); void *rock1, *rock2; @@ -1208,11 +1190,11 @@ static void call_sicallbacks() do { s = splhigh (); - if(si = si_callbacks) + if (si = si_callbacks) si_callbacks = si->next; splx(s); - if(si) { + if (si) { function = si->function; rock1 = si->rock1; rock2 = si->rock2; @@ -1222,9 +1204,9 @@ static void call_sicallbacks() splx(s); function(rock1, rock2); } - } while(si); + } while (si); #ifdef DIAGNOSTIC - if(ncbd) { + if (ncbd) { #ifdef DEBUG printf("call_sicallback: %d more dynamic structures %d total\n", ncbd, ncb); @@ -1249,6 +1231,7 @@ candbtimer() } #endif +void regdump(fp, sbytes) struct frame *fp; /* must not be register */ int sbytes; @@ -1293,7 +1276,7 @@ regdump(fp, sbytes) dumpmem(ptr, sz, ustack) register int *ptr; - int sz; + int sz, ustack; { register int i, val; extern char *hexstr(); @@ -1319,7 +1302,7 @@ dumpmem(ptr, sz, ustack) char * hexstr(val, len) - register int val; + register int val, len; { static char nbuf[9]; register int x, i; @@ -1344,12 +1327,15 @@ hexstr(val, len) * ZMAGIC always worked the `right' way (;-)) just ignore the missing * MID and proceed to new zmagic code ;-) */ +int cpu_exec_aout_makecmds(p, epp) struct proc *p; struct exec_package *epp; { int error = ENOEXEC; +#ifdef COMPAT_NOMID struct exec *execp = epp->ep_hdr; +#endif #ifdef COMPAT_NOMID if (!((execp->a_midmag >> 16) & 0x0fff) @@ -1361,8 +1347,6 @@ cpu_exec_aout_makecmds(p, epp) extern sunos_exec_aout_makecmds __P((struct proc *, struct exec_package *)); if ((error = sunos_exec_aout_makecmds(p, epp)) == 0) - return(0); - } #endif return(error); } diff --git a/sys/arch/atari/atari/mem.c b/sys/arch/atari/atari/mem.c index a07e040615d..d48b97da52f 100644 --- a/sys/arch/atari/atari/mem.c +++ b/sys/arch/atari/atari/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.4 1996/01/06 20:10:43 leo Exp $ */ +/* $NetBSD: mem.c,v 1.5 1996/02/22 10:10:53 leo Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -46,6 +46,7 @@ #include <sys/param.h> #include <sys/conf.h> +#include <sys/proc.h> #include <sys/buf.h> #include <sys/systm.h> #include <sys/uio.h> @@ -57,14 +58,19 @@ #include "nvr.h" +dev_type_open(mmopen); +dev_type_close(mmclose); +dev_type_mmap(mmmmap); + extern u_int lowram; caddr_t zeropage; /*ARGSUSED*/ int -mmopen(dev, flag, mode) - dev_t dev; - int flag, mode; +mmopen(dev, flag, mode, p) + dev_t dev; + int flag, mode; + struct proc *p; { return (0); @@ -72,9 +78,10 @@ mmopen(dev, flag, mode) /*ARGSUSED*/ int -mmclose(dev, flag, mode) - dev_t dev; - int flag, mode; +mmclose(dev, flag, mode, p) + dev_t dev; + int flag, mode; + struct proc *p; { return (0); diff --git a/sys/arch/atari/atari/misc.c b/sys/arch/atari/atari/misc.c index 9544c6f8859..51f046bd9d3 100644 --- a/sys/arch/atari/atari/misc.c +++ b/sys/arch/atari/atari/misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.3 1995/05/21 10:48:53 leo Exp $ */ +/* $NetBSD: misc.c,v 1.4 1996/02/22 10:10:54 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman (Atari modifications) @@ -35,6 +35,7 @@ #include <sys/types.h> #include <sys/param.h> +#include <sys/systm.h> #include <sys/queue.h> #include <atari/atari/misc.h> @@ -78,7 +79,6 @@ u_long size; void **phys_addr; { struct mem_node *mn, *new, *bfit; - void *mem; int s; if (size == 0) diff --git a/sys/arch/atari/atari/pmap.c b/sys/arch/atari/atari/pmap.c index 9a1ff4963ad..cc284943b1b 100644 --- a/sys/arch/atari/atari/pmap.c +++ b/sys/arch/atari/atari/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.8 1995/12/25 14:13:53 leo Exp $ */ +/* $NetBSD: pmap.c,v 1.9 1996/02/22 10:10:56 leo Exp $ */ /* * Copyright (c) 1991 Regents of the University of California. @@ -76,6 +76,7 @@ */ #include <sys/param.h> +#include <sys/systm.h> #include <sys/proc.h> #include <sys/malloc.h> #include <sys/msgbuf.h> @@ -228,6 +229,8 @@ static vm_size_t avail_remaining; boolean_t pmap_testbit __P((vm_offset_t, int)); void pmap_enter_ptpage __P((pmap_t, vm_offset_t)); extern vm_offset_t reserve_dumppages __P((vm_offset_t)); +static void pmap_changebit __P((vm_offset_t, int, boolean_t)); +static void atari_protection_init __P((void)); #ifdef MACHINE_NONCONTIG #define pmap_valid_page(pa) (pmap_initialized && pmap_isvalidphys(pa)) @@ -787,7 +790,7 @@ pmap_remove(pmap, sva, eva) register u_int *pte; register pv_entry_t pv, npv; pmap_t ptpmap; - int *ste, i, s, bits; + int *ste, s, bits; boolean_t flushcache = FALSE; #ifdef DEBUG u_int opte; @@ -1217,7 +1220,7 @@ pmap_enter(pmap, va, pa, prot, wired) * resident as long as there are valid mappings in them. * Hence, if a user page is wired, the PT page will be also. */ - if (wired && !pmap_pte_w(pte) || !wired && pmap_pte_w(pte)) { + if ((wired && !pmap_pte_w(pte)) || (!wired && pmap_pte_w(pte))){ #ifdef DEBUG if (pmapdebug & PDB_ENTER) printf("enter: wiring change -> %x\n", wired); @@ -1429,7 +1432,7 @@ pmap_change_wiring(pmap, va, wired) printf("pmap_change_wiring: invalid PTE for %x\n", va); } #endif - if (wired && !pmap_pte_w(pte) || !wired && pmap_pte_w(pte)) { + if ((wired && !pmap_pte_w(pte)) || (!wired && pmap_pte_w(pte))) { if (wired) pmap->pm_stats.wired_count++; else @@ -1836,7 +1839,7 @@ pmap_phys_address(ppn) * Miscellaneous support routines follow */ -/* static */ +static void atari_protection_init() { register int *kp, prot; @@ -1901,7 +1904,7 @@ pmap_testbit(pa, bit) return(FALSE); } -/* static */ +static void pmap_changebit(pa, bit, setem) register vm_offset_t pa; int bit; @@ -1988,7 +1991,6 @@ pmap_enter_ptpage(pmap, va) register pv_entry_t pv; u_int *ste; int s; - u_int sg_proto, *sg; #ifdef DEBUG if (pmapdebug & (PDB_FOLLOW|PDB_ENTER|PDB_PTPAGE)) @@ -2088,7 +2090,7 @@ pmap_enter_ptpage(pmap, va) kpt->kpt_next = kpt_used_list; kpt_used_list = kpt; ptpa = kpt->kpt_pa; - bzero(kpt->kpt_va, NBPG); + bzero((caddr_t)kpt->kpt_va, NBPG); pmap_enter(pmap, va, ptpa, VM_PROT_DEFAULT, TRUE); #ifdef DEBUG if (pmapdebug & (PDB_ENTER|PDB_PTPAGE)) diff --git a/sys/arch/atari/atari/stalloc.c b/sys/arch/atari/atari/stalloc.c index 057b40adaa4..48b06560623 100644 --- a/sys/arch/atari/atari/stalloc.c +++ b/sys/arch/atari/atari/stalloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: stalloc.c,v 1.3 1995/05/21 10:48:53 leo Exp $ */ +/* $NetBSD: stalloc.c,v 1.4 1996/02/22 10:10:54 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman (Atari modifications) @@ -35,6 +35,7 @@ #include <sys/types.h> #include <sys/param.h> +#include <sys/systm.h> #include <sys/queue.h> #include <atari/atari/misc.h> @@ -78,7 +79,6 @@ u_long size; void **phys_addr; { struct mem_node *mn, *new, *bfit; - void *mem; int s; if (size == 0) diff --git a/sys/arch/atari/atari/sys_machdep.c b/sys/arch/atari/atari/sys_machdep.c index c0e49eebb19..13ae029d2cf 100644 --- a/sys/arch/atari/atari/sys_machdep.c +++ b/sys/arch/atari/atari/sys_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: sys_machdep.c,v 1.4 1995/12/03 14:34:24 leo Exp $ */ +/* $NetBSD: sys_machdep.c,v 1.5 1996/02/22 10:10:58 leo Exp $ */ /* * Copyright (c) 1982, 1986 Regents of the University of California. @@ -119,6 +119,7 @@ vdoualarm(arg) /* XXX end should be */ /*ARGSUSED1*/ +int cachectl(req, addr, len) int req; caddr_t addr; @@ -230,6 +231,7 @@ cachectl(req, addr, len) */ /*ARGSUSED1*/ +int dma_cachectl(addr, len) caddr_t addr; int len; @@ -276,10 +278,12 @@ sys_sysarch(p, v, retval) void *v; register_t *retval; { +#ifdef notyet struct sys_sysarch_args /* { syscallarg(int) op; syscallarg(char*)parms; } */ *uap = v; +#endif return ENOSYS; } diff --git a/sys/arch/atari/atari/trap.c b/sys/arch/atari/atari/trap.c index e3692d99dae..38af4a91149 100644 --- a/sys/arch/atari/atari/trap.c +++ b/sys/arch/atari/atari/trap.c @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.11 1996/02/11 12:41:25 leo Exp $ */ +/* $NetBSD: trap.c,v 1.12 1996/02/22 10:11:00 leo Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -451,21 +451,22 @@ nogo: * System calls are broken out for efficiency. */ /*ARGSUSED*/ +void trap(type, code, v, frame) int type; u_int code, v; struct frame frame; { struct proc *p; - u_int ncode, ucode; + u_int ucode; u_quad_t sticks; - int i, s; + int i; #ifdef COMPAT_SUNOS extern struct emul emul_sunos; #endif p = curproc; - ucode = 0; + sticks = ucode = 0; cnt.v_trap++; if (USERMODE(frame.f_sr)) { @@ -693,6 +694,7 @@ trap(type, code, v, frame) /* * Process a system call. */ +void syscall(code, frame) register_t code; struct frame frame; @@ -863,6 +865,7 @@ child_return(p, frame) /* * Process a pending write back */ +int _write_back (wb, wb_sts, wb_data, wb_addr, wb_map) u_int wb; /* writeback type: 1, 2, or 3 */ u_int wb_sts; /* writeback status information */ @@ -871,7 +874,8 @@ _write_back (wb, wb_sts, wb_data, wb_addr, wb_map) vm_map_t wb_map; { u_int wb_extra_page = 0; - u_int wb_rc, mmusr; + u_int mmusr; + int wb_rc; void _wb_fault (); /* fault handler for write back */ #ifdef DEBUG @@ -963,21 +967,24 @@ _write_back (wb, wb_sts, wb_data, wb_addr, wb_map) switch(wb_sts & WBS_SZMASK) { case WBS_SIZE_BYTE : - asm volatile ("movec %0,dfc ; movesb %1,%2@" : : "d" (wb_sts & WBS_TMMASK), - "d" (wb_data), - "a" (wb_addr)); + asm volatile ("movec %0,dfc ; movesb %1,%2@" : : + "d" (wb_sts & WBS_TMMASK), + "d" (wb_data), + "a" (wb_addr)); break; case WBS_SIZE_WORD : - asm volatile ("movec %0,dfc ; movesw %1,%2@" : : "d" (wb_sts & WBS_TMMASK), - "d" (wb_data), - "a" (wb_addr)); + asm volatile ("movec %0,dfc ; movesw %1,%2@" : : + "d" (wb_sts & WBS_TMMASK), + "d" (wb_data), + "a" (wb_addr)); break; case WBS_SIZE_LONG : - asm volatile ("movec %0,dfc ; movesl %1,%2@" : : "d" (wb_sts & WBS_TMMASK), - "d" (wb_data), - "a" (wb_addr)); + asm volatile ("movec %0,dfc ; movesl %1,%2@" : : + "d" (wb_sts & WBS_TMMASK), + "d" (wb_data), + "a" (wb_addr)); break; } @@ -991,7 +998,8 @@ _write_back (wb, wb_sts, wb_data, wb_addr, wb_map) /* * fault handler for write back */ -void _wb_fault() +void +_wb_fault() { #ifdef DEBUG printf ("trap: writeback fault\n"); diff --git a/sys/arch/atari/atari/vm_machdep.c b/sys/arch/atari/atari/vm_machdep.c index 7aac9d67120..3a73c05d7c0 100644 --- a/sys/arch/atari/atari/vm_machdep.c +++ b/sys/arch/atari/atari/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.5 1996/02/05 02:07:06 christos Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.6 1996/02/22 10:11:01 leo Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -148,6 +148,7 @@ cpu_exit(p) * Both addresses are assumed to reside in the Sysmap, * and size must be a multiple of CLSIZE. */ +void pagemove(from, to, size) register caddr_t from, to; int size; @@ -199,6 +200,7 @@ physaccess(vaddr, paddr, size, prot) TBIAS(); } +void physunaccess(vaddr, size) caddr_t vaddr; register int size; @@ -298,6 +300,7 @@ cpu_coredump(p, vp, cred, chdr) * Look at _lev6intr in locore.s for more details. */ /*ARGSUSED*/ +void setredzone(pte, vaddr) u_int *pte; caddr_t vaddr; @@ -307,6 +310,7 @@ setredzone(pte, vaddr) /* * Convert kernel VA to physical address */ +vm_offset_t kvtop(addr) register caddr_t addr; { diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c index 3a89de52dc9..71b6266b6c3 100644 --- a/sys/arch/atari/dev/clock.c +++ b/sys/arch/atari/dev/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.8 1996/02/11 12:42:19 leo Exp $ */ +/* $NetBSD: clock.c,v 1.9 1996/02/22 10:11:19 leo Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -44,7 +44,9 @@ #include <sys/param.h> #include <sys/kernel.h> +#include <sys/systm.h> #include <sys/device.h> +#include <sys/cpu.h> #include <machine/psl.h> #include <machine/cpu.h> #include <machine/iomap.h> @@ -79,6 +81,8 @@ struct cfdriver clockcd = { DV_DULL, sizeof(struct device), NULL, 0 }; +void statintr __P((struct clockframe *)); + static u_long gettod __P((void)); static int settod __P((u_long)); @@ -177,6 +181,7 @@ void cpu_initclocks() #endif /* STATCLOCK */ } +void setstatclockrate(newhz) int newhz; { @@ -216,6 +221,7 @@ statintr(frame) * Returns number of usec since last recorded clock "tick" * (i.e. clock interrupt). */ +long clkread() { u_int delta; @@ -338,6 +344,7 @@ u_int regno, value; * Initialize the time of day register, based on the time base which is, e.g. * from a filesystem. */ +void inittodr(base) time_t base; { @@ -354,6 +361,7 @@ time_t base; time.tv_sec = timbuf; } +void resettodr() { if(settod(time.tv_sec) == 1) @@ -383,17 +391,17 @@ gettod() MC146818_GETTOD(RTC, &clkregs); splx(sps); - if(range_test(clkregs[MC_SEC], 0, 59)) + if(clkregs[MC_SEC] > 59) return(0); - if(range_test(clkregs[MC_MIN], 0, 59)) + if(clkregs[MC_MIN] > 59) return(0); - if(range_test(clkregs[MC_HOUR], 0, 23)) + if(clkregs[MC_HOUR] > 23) return(0); if(range_test(clkregs[MC_DOM], 1, 31)) return(0); if (range_test(clkregs[MC_MONTH], 1, 12)) return(0); - if(range_test(clkregs[MC_YEAR], 0, 2000 - GEMSTARTOFTIME)) + if(clkregs[MC_YEAR] > (2000 - GEMSTARTOFTIME)) return(0); clkregs[MC_YEAR] += GEMSTARTOFTIME; diff --git a/sys/arch/atari/dev/dma.c b/sys/arch/atari/dev/dma.c index decad0ce889..e3cd8f93554 100644 --- a/sys/arch/atari/dev/dma.c +++ b/sys/arch/atari/dev/dma.c @@ -1,4 +1,4 @@ -/* $NetBSD: dma.c,v 1.5 1995/11/06 21:13:38 leo Exp $ */ +/* $NetBSD: dma.c,v 1.6 1996/02/22 10:11:20 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -62,10 +62,10 @@ #define NDMA_DEV 10 /* Max 2 floppy's, 8 hard-disks */ typedef struct dma_entry { TAILQ_ENTRY(dma_entry) entries; /* List pointers */ - void (*call_func)(); /* Call when lock granted */ - void (*int_func)(); /* Call on DMA interrupt */ - void *softc; /* Arg. to int_func */ - int *lock_stat; /* status of DMA lock */ + void (*call_func)(void *); /* Call when lock granted */ + void (*int_func)(void *); /* Call on DMA interrupt */ + void *softc; /* Arg. to int_func */ + int *lock_stat; /* status of DMA lock */ } DMA_ENTRY; /* @@ -82,10 +82,14 @@ static TAILQ_HEAD(acthead, dma_entry) dma_active; static int must_init = 1; /* Must initialize */ +void cdmaint __P((int)); + +long sr; /* sr at time of interrupt */ static void cdmasoft __P((void)); static void init_queues __P((void)); -static void init_queues() +static void +init_queues() { int i; @@ -96,12 +100,13 @@ static void init_queues() TAILQ_INSERT_HEAD(&dma_free, &dmatable[i], entries); } -int st_dmagrab(int_func, call_func, softc, lock_stat, rcaller) -void (*int_func)(); -void (*call_func)(); -void *softc; -int *lock_stat; -int rcaller; +int +st_dmagrab(int_func, call_func, softc, lock_stat, rcaller) +dma_farg int_func; +dma_farg call_func; +void *softc; +int *lock_stat; +int rcaller; { int sps; DMA_ENTRY *req; @@ -193,8 +198,9 @@ st_dmawanted() return(dma_active.tqh_first->entries.tqe_next != NULL); } +void cdmaint(sr) -long sr; /* sr at time of interrupt */ +int sr; /* sr at time of interrupt */ { if(dma_active.tqh_first != NULL) { if(!BASEPRI(sr)) { @@ -209,11 +215,12 @@ long sr; /* sr at time of interrupt */ else printf("DMA interrupt discarded\n"); } -static void cdmasoft() +static void +cdmasoft() { - int s; - void (*int_func)(); - void *softc; + int s; + dma_farg int_func; + void *softc; /* * Prevent a race condition here. DMA might be freed while @@ -225,7 +232,7 @@ static void cdmasoft() int_func = dma_active.tqh_first->int_func; softc = dma_active.tqh_first->softc; } - else int_func = NULL; + else int_func = softc = NULL; splx(s); if(int_func != NULL) diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c index f55be39fcb8..970e45bef17 100644 --- a/sys/arch/atari/dev/fd.c +++ b/sys/arch/atari/dev/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.14 1996/02/02 18:05:52 mycroft Exp $ */ +/* $NetBSD: fd.c,v 1.15 1996/02/22 10:11:21 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -53,6 +53,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/buf.h> +#include <sys/proc.h> #include <sys/device.h> #include <sys/ioctl.h> #include <sys/fcntl.h> @@ -172,6 +173,17 @@ struct fd_types { typedef void (*FPV)(); /* + * {b,c}devsw[] function prototypes + */ +dev_type_open(Fdopen); +dev_type_close(fdclose); +dev_type_read(fdread); +dev_type_write(fdwrite); +dev_type_ioctl(fdioctl); +dev_type_size(fdsize); +dev_type_dump(fddump); + +/* * Private drive functions.... */ static void fdstart __P((struct fd_softc *)); @@ -236,8 +248,9 @@ void *auxp; extern struct cfdriver fdcd; struct fd_softc fdsoftc; - int i, nfound, first_found = 0; + int i, nfound, first_found; + nfound = first_found = 0; printf("\n"); fddeselect(); for(i = 0; i < NR_DRIVES; i++) { @@ -247,7 +260,8 @@ void *auxp; */ fdsoftc.unit = i; fdsoftc.flags = 0; - st_dmagrab(fdcint, fdtestdrv, &fdsoftc, &lock_stat, 0); + st_dmagrab((dma_farg)fdcint, (dma_farg)fdtestdrv, &fdsoftc, + &lock_stat, 0); st_dmafree(&fdsoftc, &lock_stat); if(!(fdsoftc.flags & FLPF_NOTRESP)) { @@ -301,7 +315,6 @@ struct device *pdp; struct cfdata *cfp; void *auxp; { - int unit = (int)auxp; return(1); } @@ -324,6 +337,7 @@ void *auxp; disk_attach(&sc->dkdev); } +int fdioctl(dev, cmd, addr, flag, p) dev_t dev; u_long cmd; @@ -332,7 +346,6 @@ caddr_t addr; struct proc *p; { struct fd_softc *sc; - void *data; sc = getsoftc(fdcd, DISKUNIT(dev)); @@ -358,9 +371,8 @@ struct proc *p; case DIOCWDINFO: case DIOCWLABEL: #endif /* notyet */ - default: - return(ENOTTY); } + return(ENOTTY); } /* @@ -371,6 +383,7 @@ struct proc *p; * partition 0: 360Kb * partition 1: 780Kb */ +int Fdopen(dev, flags, devtype, proc) dev_t dev; int flags, devtype; @@ -437,7 +450,8 @@ struct proc *proc; */ sc->flags |= FLPF_INOPEN|FLPF_GETSTAT; sps = splbio(); - st_dmagrab(fdcint, fdstatus, sc, &lock_stat, 0); + st_dmagrab((dma_farg)fdcint, (dma_farg)fdstatus, sc, + &lock_stat, 0); while(sc->flags & FLPF_GETSTAT) tsleep((caddr_t)sc, PRIBIO, "Fdopen", 0); splx(sps); @@ -466,8 +480,10 @@ struct proc *proc; #ifdef FLP_DEBUG printf("Fdopen open succeeded on type %d\n", sc->part); #endif + return (0); } +int fdclose(dev, flags, devtype, proc) dev_t dev; int flags, devtype; @@ -492,7 +508,7 @@ struct buf *bp; { struct fd_softc *sc; struct disklabel *lp; - int sps, nblocks; + int sps; sc = getsoftc(fdcd, DISKUNIT(bp->b_dev)); @@ -523,7 +539,8 @@ struct buf *bp; if (fd_state & FLP_MON) untimeout((FPV)fdmotoroff, (void*)sc); fd_state = FLP_IDLE; - st_dmagrab(fdcint, fdstart, sc, &lock_stat, 0); + st_dmagrab((dma_farg)fdcint, (dma_farg)fdstart, sc, + &lock_stat, 0); } splx(sps); @@ -539,7 +556,11 @@ done: * no dumps to floppy disks thank you. */ int -fddump(dev_t dev) +fddump(dev, blkno, va, size) +dev_t dev; +daddr_t blkno; +caddr_t va; +size_t size; { return(ENXIO); } @@ -555,17 +576,19 @@ dev_t dev; } int -fdread(dev, uio) +fdread(dev, uio, flags) dev_t dev; struct uio *uio; +int flags; { return(physio(fdstrategy, NULL, dev, B_READ, fdminphys, uio)); } int -fdwrite(dev, uio) +fdwrite(dev, uio, flags) dev_t dev; struct uio *uio; +int flags; { return(physio(fdstrategy, NULL, dev, B_WRITE, fdminphys, uio)); } @@ -679,7 +702,7 @@ register struct fd_softc *sc; #ifdef FLP_DEBUG printf("fddone: Staring job on unit %d\n", sc1->unit); #endif - st_dmagrab(fdcint, fdstart, sc1, &lock_stat, 0); + st_dmagrab((dma_farg)fdcint, (dma_farg)fdstart, sc1, &lock_stat, 0); } static int @@ -749,11 +772,11 @@ static void fd_xfer(sc) struct fd_softc *sc; { - register int head = 0; + register int head; register int track, sector, hbit; - int i; u_long phys_addr; + head = track = 0; switch(fd_state) { case FLP_XFER: /* @@ -1106,7 +1129,8 @@ struct fd_softc *sc; if(selected) { int tmp; - st_dmagrab(fdcint, fdmoff, sc, &tmp, 0); + st_dmagrab((dma_farg)fdcint, (dma_farg)fdmoff, + sc, &tmp, 0); } else fd_state = FLP_IDLE; break; @@ -1182,7 +1206,7 @@ static void fdtestdrv(fdsoftc) struct fd_softc *fdsoftc; { - int i, status; + int status; /* * Select the right unit and head. @@ -1217,7 +1241,7 @@ fdgetdisklabel(sc, dev) struct fd_softc *sc; dev_t dev; { - struct disklabel *lp, *dlp; + struct disklabel *lp; int part; /* diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c index 81f78e5577b..1b8eb49b434 100644 --- a/sys/arch/atari/dev/grf.c +++ b/sys/arch/atari/dev/grf.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf.c,v 1.6 1995/06/26 19:55:45 leo Exp $ */ +/* $NetBSD: grf.c,v 1.7 1996/02/22 10:11:23 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -366,14 +366,14 @@ struct proc *p; error = grfsinfo(dev, (struct grfdyninfo *) data); break; case GRFGETVMODE: - return(gp->g_mode(gp, GM_GRFGETVMODE, data)); + return(gp->g_mode(gp, GM_GRFGETVMODE, data, 0, 0)); case GRFSETVMODE: - error = gp->g_mode(gp, GM_GRFSETVMODE, data); + error = gp->g_mode(gp, GM_GRFSETVMODE, data, 0, 0); if (error == 0 && gp->g_itedev) ite_reinit(gp->g_itedev); break; case GRFGETNUMVM: - return(gp->g_mode(gp, GM_GRFGETNUMVM, data)); + return(gp->g_mode(gp, GM_GRFGETNUMVM, data, 0, 0)); /* * these are all hardware dependant, and have to be resolved * in the respective driver. @@ -447,7 +447,8 @@ grfon(dev) if (gp->g_itedev != NODEV) ite_off(gp->g_itedev, 3); - return(gp->g_mode(gp, (dev & GRFOVDEV) ? GM_GRFOVON : GM_GRFON)); + return(gp->g_mode(gp, (dev & GRFOVDEV) ? GM_GRFOVON : GM_GRFON, + NULL, 0, 0)); } int @@ -463,7 +464,8 @@ grfoff(dev) return(0); gp->g_flags &= ~GF_GRFON; - error = gp->g_mode(gp, (dev & GRFOVDEV) ? GM_GRFOVOFF : GM_GRFOFF); + error = gp->g_mode(gp, (dev & GRFOVDEV) ? GM_GRFOVOFF : GM_GRFOFF, + NULL, 0, 0); /* * Closely tied together no X's @@ -483,7 +485,7 @@ grfsinfo(dev, dyninfo) int error; gp = grfsp[GRFUNIT(dev)]; - error = gp->g_mode(gp, GM_GRFCONFIG, dyninfo); + error = gp->g_mode(gp, GM_GRFCONFIG, dyninfo, 0, 0); /* * Closely tied together no X's diff --git a/sys/arch/atari/dev/grfabs_tt.c b/sys/arch/atari/dev/grfabs_tt.c index 65d2a871585..04fdbb0c1ea 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.1 1995/08/20 18:17:34 leo Exp $ */ +/* $NetBSD: grfabs_tt.c,v 1.2 1996/02/22 10:11:25 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -38,6 +38,7 @@ #include <sys/queue.h> #include <sys/malloc.h> #include <sys/device.h> +#include <sys/systm.h> #include <machine/iomap.h> #include <machine/video.h> @@ -157,8 +158,6 @@ tt_free_view(v) view_t *v; { if(v) { - dmode_t *md = v->mode; - tt_remove_view(v); if (v->colormap != &gra_con_cmap) free(v->colormap, M_DEVBUF); @@ -304,7 +303,6 @@ alloc_bitmap(width, height, depth) u_long width, height; u_char depth; { - int i; u_long total_size, bm_size; void *hw_address; bmap_t *bm; diff --git a/sys/arch/atari/dev/grfvar.h b/sys/arch/atari/dev/grfvar.h index 121fd265bca..546b4291648 100644 --- a/sys/arch/atari/dev/grfvar.h +++ b/sys/arch/atari/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: grfvar.h,v 1.2 1995/05/28 19:45:38 leo Exp $ */ +/* $NetBSD: grfvar.h,v 1.3 1996/02/22 10:11:26 leo Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -58,14 +58,18 @@ struct grf_softc { dev_t g_grfdev; /* grf device number */ dev_t g_viewdev; /* view device number */ caddr_t g_data; /* device dependent data */ - int (*g_mode)(); + int (*g_mode) __P((struct grf_softc *, int, void *, + int, int)); int g_conpri; /* priority of ite as console */ - void (*g_iteinit)(); - void (*g_itedeinit)(); - void (*g_iteclear)(); - void (*g_iteputc)(); - void (*g_itecursor)(); - void (*g_itescroll)(); + void (*g_iteinit) __P((struct ite_softc *)); + void (*g_itedeinit) __P((struct ite_softc *)); + void (*g_iteclear) __P((struct ite_softc *, int, int, + int, int)); + void (*g_iteputc) __P((struct ite_softc *, int, int, + int, int)); + void (*g_itecursor) __P((struct ite_softc *, int)); + void (*g_itescroll) __P((struct ite_softc *, int, int, + int, int)); }; /* flags */ diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c index 3d29cc47bbe..ea9261134c3 100644 --- a/sys/arch/atari/dev/ite.c +++ b/sys/arch/atari/dev/ite.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite.c,v 1.7 1995/09/04 19:39:21 leo Exp $ */ +/* $NetBSD: ite.c,v 1.8 1996/02/22 10:11:27 leo Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -91,8 +91,11 @@ u_char cons_tabs[MAX_TABS]; struct ite_softc *kbd_ite; int kbd_init; +static void iteprecheckwrap __P((struct ite_softc *)); +static void itecheckwrap __P((struct ite_softc *)); + static char *index __P((const char *, int)); -static int inline atoi __P((const char *)); +static __inline__ int atoi __P((const char *)); static void ite_switch __P((int)); void iteputchar __P((int c, struct ite_softc *ip)); void ite_putstr __P((const u_char * s, int len, dev_t dev)); @@ -142,7 +145,6 @@ iteattach(pdp, dp, auxp) struct device *pdp, *dp; void *auxp; { - extern int hz; struct grf_softc *gp; struct ite_softc *ip; int s; @@ -439,7 +441,7 @@ itewrite(dev, uio, flag) return ((*linesw[tp->t_line].l_write) (tp, uio, flag)); } -int +void itestop(tp, flag) struct tty *tp; int flag; @@ -521,7 +523,7 @@ itestart(tp) struct clist *rbp; struct ite_softc *ip; u_char buf[ITEBURST]; - int s, len, n; + int s, len; ip = getitesp(tp->t_dev); @@ -591,7 +593,7 @@ ite_on(dev, flag) return (0); } -int +void ite_off(dev, flag) dev_t dev; int flag; @@ -733,7 +735,7 @@ enum caller caller; if(!up) key_mod ^= KBD_MOD_CAPS; splx(s); - return; + return -1; break; } if(mask) { @@ -1069,7 +1071,7 @@ enum caller caller; } /* helper functions, makes the code below more readable */ -static void inline +static __inline__ void ite_sendstr(str) char *str; { @@ -1094,7 +1096,7 @@ alignment_display(ip) SUBR_CURSOR(ip, DRAW_CURSOR); } -static void inline +static __inline__ void snap_cury(ip) struct ite_softc *ip; { @@ -1107,7 +1109,7 @@ snap_cury(ip) } } -static void inline +static __inline__ void ite_dnchar(ip, n) struct ite_softc *ip; int n; @@ -1125,7 +1127,7 @@ ite_dnchar(ip, n) SUBR_CURSOR(ip, DRAW_CURSOR); } -static void inline +static __inline__ void ite_inchar(ip, n) struct ite_softc *ip; int n; @@ -1143,7 +1145,7 @@ ite_inchar(ip, n) SUBR_CURSOR(ip, DRAW_CURSOR); } -static void inline +static __inline__ void ite_clrtoeol(ip) struct ite_softc *ip; { @@ -1156,7 +1158,7 @@ ite_clrtoeol(ip) } } -static void inline +static __inline__ void ite_clrtobol(ip) struct ite_softc *ip; { @@ -1166,7 +1168,7 @@ ite_clrtobol(ip) SUBR_CURSOR(ip, DRAW_CURSOR); } -static void inline +static __inline__ void ite_clrline(ip) struct ite_softc *ip; { @@ -1178,7 +1180,7 @@ ite_clrline(ip) -static void inline +static __inline__ void ite_clrtoeos(ip) struct ite_softc *ip; { @@ -1191,7 +1193,7 @@ ite_clrtoeos(ip) } } -static void inline +static __inline__ void ite_clrtobos(ip) struct ite_softc *ip; { @@ -1204,7 +1206,7 @@ ite_clrtobos(ip) } } -static void inline +static __inline__ void ite_clrscreen(ip) struct ite_softc *ip; { @@ -1215,7 +1217,7 @@ ite_clrscreen(ip) -static void inline +static __inline__ void ite_dnline(ip, n) struct ite_softc *ip; int n; @@ -1237,7 +1239,7 @@ ite_dnline(ip, n) SUBR_CURSOR(ip, DRAW_CURSOR); } -static void inline +static __inline__ void ite_inline(ip, n) struct ite_softc *ip; int n; @@ -1259,7 +1261,7 @@ ite_inline(ip, n) SUBR_CURSOR(ip, DRAW_CURSOR); } -static void inline +static __inline__ void ite_lf (ip) struct ite_softc *ip; { @@ -1274,7 +1276,7 @@ ite_lf (ip) clr_attr(ip, ATTR_INV); } -static void inline +static __inline__ void ite_crlf (ip) struct ite_softc *ip; { @@ -1282,7 +1284,7 @@ ite_crlf (ip) ite_lf (ip); } -static void inline +static __inline__ void ite_cr (ip) struct ite_softc *ip; { @@ -1293,7 +1295,7 @@ ite_cr (ip) } } -static void inline +static __inline__ void ite_rlf (ip) struct ite_softc *ip; { @@ -1308,7 +1310,7 @@ ite_rlf (ip) clr_attr(ip, ATTR_INV); } -static int inline +static __inline__ int atoi (cp) const char *cp; { @@ -1331,7 +1333,7 @@ index (cp, ch) -static int inline +static __inline__ int ite_argnum (ip) struct ite_softc *ip; { @@ -1349,11 +1351,11 @@ ite_argnum (ip) return n; } -static int inline +static __inline__ int ite_zargnum (ip) struct ite_softc *ip; { - char ch, *cp; + char ch; int n; /* convert argument string into number */ @@ -1367,17 +1369,6 @@ ite_zargnum (ip) return n; /* don't "n ? n : 1" here, <CSI>0m != <CSI>1m ! */ } -static int inline -strncmp (a, b, l) - const char *a, *b; - int l; -{ - for (;l--; a++, b++) - if (*a != *b) - return *a - *b; - return 0; -} - void ite_putstr(s, len, dev) const u_char *s; @@ -1417,7 +1408,6 @@ iteputchar(c, ip) if (ip->escape) { -doesc: switch (ip->escape) { case ESC: @@ -2322,6 +2312,7 @@ doesc: } } +static void iteprecheckwrap(ip) struct ite_softc *ip; { @@ -2338,6 +2329,7 @@ iteprecheckwrap(ip) } } +static void itecheckwrap(ip) struct ite_softc *ip; { diff --git a/sys/arch/atari/dev/ite_cc.c b/sys/arch/atari/dev/ite_cc.c index 676c499e061..2a30e696cb9 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.4 1995/05/28 19:45:39 leo Exp $ */ +/* $NetBSD: ite_cc.c,v 1.5 1996/02/22 10:11:29 leo Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -192,7 +192,7 @@ struct itewinsize *winsz; { struct view_size vs; ipriv_t *cci = ip->priv; - u_long fbp, i, j; + u_long i, j; int error = 0; view_t *view; @@ -279,10 +279,11 @@ struct proc *p; { struct winsize ws; struct itewinsize *is; - struct itebell *ib; int error = 0; - ipriv_t *cci = ip->priv; view_t *view = viewview(ip->grf->g_viewdev); +#if 0 /* LWP: notyet */ + struct itebell *ib; +#endif switch (cmd) { case ITEIOCGWINSZ: @@ -512,8 +513,6 @@ int dir, sx, count; if(dir == SCROLL_UP) { int dy = sy - count; - int height = ip->bottom_margin - sy + 1; - int i; cursor32(ip, ERASE_CURSOR); scrollbmap(bm, 0, dy*ip->font.height, bm->bytes_per_row >> 3, @@ -521,11 +520,7 @@ int dir, sx, count; 0, -(count*ip->font.height)); } else if(dir == SCROLL_DOWN) { - int dy = sy + count; - int height = ip->bottom_margin - dy + 1; - int i; - - cursor32(ip, ERASE_CURSOR); + cursor32(ip, ERASE_CURSOR); scrollbmap(bm, 0, sy*ip->font.height, bm->bytes_per_row >> 3, (ip->bottom_margin-sy+1)*ip->font.height, 0, count*ip->font.height); @@ -578,7 +573,6 @@ int dir, sx, count; static void scrollbmap (bmap_t *bm, u_short x, u_short y, u_short width, u_short height, short dx, short dy) { - u_short depth = bm->depth; u_short lwpr = bm->bytes_per_row >> 2; if(dx) { diff --git a/sys/arch/atari/dev/itevar.h b/sys/arch/atari/dev/itevar.h index 1607302db84..342057ba572 100644 --- a/sys/arch/atari/dev/itevar.h +++ b/sys/arch/atari/dev/itevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: itevar.h,v 1.2 1995/07/25 13:49:26 leo Exp $ */ +/* $NetBSD: itevar.h,v 1.3 1996/02/22 10:11:31 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman (Atari modifications) @@ -190,7 +190,7 @@ void itestart __P((struct tty *)); /* ite functions */ int ite_on __P((dev_t, int)); -int ite_off __P((dev_t, int)); +void ite_off __P((dev_t, int)); void ite_reinit __P((dev_t)); int ite_param __P((struct tty *, struct termios *)); void ite_reset __P((struct ite_softc *)); diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c index 32a80018a25..2add3b976ef 100644 --- a/sys/arch/atari/dev/kbd.c +++ b/sys/arch/atari/dev/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.5 1995/06/26 14:31:27 leo Exp $ */ +/* $NetBSD: kbd.c,v 1.6 1996/02/22 10:11:32 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -83,6 +83,16 @@ struct kbd_softc { static struct kbd_softc kbd_softc; +/* {b,c}devsw[] function prototypes */ +dev_type_open(kbdopen); +dev_type_close(kbdclose); +dev_type_read(kbdread); +dev_type_ioctl(kbdioctl); +dev_type_select(kbdselect); + +/* Interrupt handler */ +void kbdintr __P((int)); + void kbd_write __P((u_char *, int)); static void kbdsoft __P((void)); @@ -189,8 +199,6 @@ kbdenable() int kbdopen(dev_t dev, int flags, int mode, struct proc *p) { - int s, error; - if (kbd_softc.k_events.ev_io) return EBUSY; @@ -268,7 +276,7 @@ kbdselect (dev_t dev, int rw, struct proc *p) /* * Keyboard interrupt handler called straight from MFP at spl6. */ -int +void kbdintr(sr) int sr; /* sr at time of interrupt */ { @@ -413,7 +421,7 @@ static char sound[] = { 0xF8,0x10,0x10,0x10,0x00,0x20,0x03 }; -int +void kbdbell() { register int i, sps; diff --git a/sys/arch/atari/dev/view.c b/sys/arch/atari/dev/view.c index 09dbaf75244..6056c20d290 100644 --- a/sys/arch/atari/dev/view.c +++ b/sys/arch/atari/dev/view.c @@ -1,4 +1,4 @@ -/* $NetBSD: view.c,v 1.6 1995/08/17 20:32:50 leo Exp $ */ +/* $NetBSD: view.c,v 1.7 1996/02/22 10:11:34 leo Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -38,6 +38,7 @@ * a interface to graphics. */ #include <sys/param.h> +#include <sys/systm.h> #include <sys/proc.h> #include <sys/ioctl.h> #include <sys/file.h> @@ -61,7 +62,7 @@ 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 (); +int viewprobe __P((void)); struct view_softc views[NVIEW]; static int view_inited; @@ -75,6 +76,7 @@ int view_default_depth = 1; /* * functions for probeing. */ +void viewattach(cnt) int cnt; { @@ -83,6 +85,7 @@ viewattach(cnt) } /* this function is called early to set up a display. */ +int viewprobe() { int i; diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c index b58ec39f31f..ee8644eaf2c 100644 --- a/sys/arch/atari/dev/zs.c +++ b/sys/arch/atari/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.14 1996/01/23 09:35:15 leo Exp $ */ +/* $NetBSD: zs.c,v 1.15 1996/02/22 10:11:37 leo Exp $ */ /* * Copyright (c) 1995 L. Weppelman (Atari modifications) @@ -176,6 +176,13 @@ struct cfdriver zscd = { NULL, "zs", (cfmatch_t)zsmatch, zsattach, DV_TTY, sizeof(struct zs_softc), NULL, 0 }; +/* {b,c}devsw[] function prototypes */ +dev_type_open(zsopen); +dev_type_close(zsclose); +dev_type_read(zsread); +dev_type_write(zswrite); +dev_type_ioctl(zsioctl); + /* Interrupt handlers. */ int zshard __P((long)); static int zssoft __P((long)); @@ -192,7 +199,6 @@ static int zsparam __P((struct tty *, struct termios *)); static int zsbaudrate __P((int, int, int *, int *, int *, int *)); /* Routines purely local to this driver. */ -static void zs_reset __P((volatile struct zschan *, int, int)); static int zs_modem __P((struct zs_chanstate *, int, int)); static void zs_loadchannelregs __P((volatile struct zschan *, u_char *)); @@ -221,7 +227,6 @@ void *aux; register struct zs_softc *zi; register struct zs_chanstate *cs; register volatile struct zsdevice *addr; - register struct tty *tp; char tmp; addr = (struct zsdevice *)AD_SCC; @@ -817,7 +822,7 @@ struct proc *p; break; } case TIOCSFLAGS: { - int userbits, driverbits = 0; + int userbits = 0; error = suser(p->p_ucred, &p->p_acflag); if(error != 0) diff --git a/sys/arch/atari/include/dma.h b/sys/arch/atari/include/dma.h index 9e6f6659c78..822fd1d8223 100644 --- a/sys/arch/atari/include/dma.h +++ b/sys/arch/atari/include/dma.h @@ -1,4 +1,4 @@ -/* $NetBSD: dma.h,v 1.7 1995/07/11 18:27:31 leo Exp $ */ +/* $NetBSD: dma.h,v 1.8 1996/02/22 10:11:41 leo Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -94,7 +94,9 @@ struct dma { #define DMA_LOCK_GRANT 2 /* DMA lock granted */ #ifdef _KERNEL -int st_dmagrab __P((void (*)(), void (*)(), void *, int *, int)); +typedef void (*dma_farg)(void*); + +int st_dmagrab __P((dma_farg, dma_farg, void *, int *, int)); void st_dmafree __P((void *, int *)); int st_dmawanted __P((void)); void st_dmaaddr_set __P((caddr_t)); diff --git a/sys/arch/atari/include/param.h b/sys/arch/atari/include/param.h index ca836dd5902..128e255acf7 100644 --- a/sys/arch/atari/include/param.h +++ b/sys/arch/atari/include/param.h @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.10 1996/01/07 22:30:41 leo Exp $ */ +/* $NetBSD: param.h,v 1.11 1996/02/22 10:11:43 leo Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -205,6 +205,7 @@ #define splx(s) (s & PSL_IPL ? _spl_no_check(s) : spl0()) #ifdef _KERNEL +int spl0 __P((void)); void delay __P((int)); #define DELAY(n) delay(n) |
