diff options
Diffstat (limited to 'sys/arch/atari')
57 files changed, 617 insertions, 617 deletions
diff --git a/sys/arch/atari/dev/atari5380.c b/sys/arch/atari/dev/atari5380.c index 5bea80d6870..3495a3d1ea3 100644 --- a/sys/arch/atari/dev/atari5380.c +++ b/sys/arch/atari/dev/atari5380.c @@ -1,4 +1,4 @@ -/* $NetBSD: atari5380.c,v 1.47 2009/01/24 02:02:38 tsutsui Exp $ */ +/* $NetBSD: atari5380.c,v 1.48 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.47 2009/01/24 02:02:38 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.48 2009/03/14 14:45:56 dsl Exp $"); #include "opt_atariscsi.h" @@ -104,12 +104,12 @@ __KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.47 2009/01/24 02:02:38 tsutsui Exp $ /* fails on older atari's */ #define ENABLE_NCR5380(sc) cur_softc = sc; -static u_char *alloc_bounceb __P((u_long)); -static void free_bounceb __P((u_char *)); -static int machine_match __P((struct device *, void *, void *, - struct cfdriver *)); - void scsi_ctrl __P((int)); - void scsi_dma __P((int)); +static u_char *alloc_bounceb(u_long); +static void free_bounceb(u_char *); +static int machine_match(struct device *, void *, void *, + struct cfdriver *); + void scsi_ctrl(int); + void scsi_dma(int); /* * Functions that do nothing on the atari @@ -118,7 +118,7 @@ static int machine_match __P((struct device *, void *, void *, #if defined(TT_SCSI) -void ncr5380_drq_intr __P((int)); +void ncr5380_drq_intr(int); /* * Define all the things we need of the DMA-controller @@ -224,18 +224,18 @@ static struct ncr_softc *cur_softc; * Prototype functions defined below */ #ifdef NO_TTRAM_DMA -static int tt_wrong_dma_range __P((SC_REQ *, struct dma_chain *)); +static int tt_wrong_dma_range(SC_REQ *, struct dma_chain *); #endif -static void scsi_tt_init __P((struct ncr_softc *)); -static u_char get_tt_5380_reg __P((u_short)); -static void set_tt_5380_reg __P((u_short, u_short)); -static void scsi_tt_dmasetup __P((SC_REQ *, u_int, u_char)); -static int tt_poll_edma __P((SC_REQ *)); -static u_char *ptov __P((SC_REQ *, u_long*)); -static int tt_get_dma_result __P((SC_REQ *, u_long *)); - void scsi_tt_ienable __P((void)); - void scsi_tt_idisable __P((void)); - void scsi_tt_clr_ipend __P((void)); +static void scsi_tt_init(struct ncr_softc *); +static u_char get_tt_5380_reg(u_short); +static void set_tt_5380_reg(u_short, u_short); +static void scsi_tt_dmasetup(SC_REQ *, u_int, u_char); +static int tt_poll_edma(SC_REQ *); +static u_char *ptov(SC_REQ *, u_long*); +static int tt_get_dma_result(SC_REQ *, u_long *); + void scsi_tt_ienable(void); + void scsi_tt_idisable(void); + void scsi_tt_clr_ipend(void); /* * Define these too, so we can use them locally... @@ -676,21 +676,21 @@ extern int *nofault; /* * Prototype functions defined below */ -static void scsi_falcon_init __P((struct ncr_softc *)); -static u_char get_falcon_5380_reg __P((u_short)); -static void set_falcon_5380_reg __P((u_short, u_short)); -static int falcon_wrong_dma_range __P((SC_REQ *, struct dma_chain *)); -static void fal1_dma __P((u_int, u_int, SC_REQ *)); -static void scsi_falcon_dmasetup __P((SC_REQ *, u_int, u_char)); -static int falcon_poll_edma __P((SC_REQ *)); -static int falcon_get_dma_result __P((SC_REQ *, u_long *)); - int falcon_can_access_5380 __P((void)); - void scsi_falcon_clr_ipend __P((void)); - void scsi_falcon_idisable __P((void)); - void scsi_falcon_ienable __P((void)); - int scsi_falcon_ipending __P((void)); - int falcon_claimed_dma __P((void)); - void falcon_reconsider_dma __P((void)); +static void scsi_falcon_init(struct ncr_softc *); +static u_char get_falcon_5380_reg(u_short); +static void set_falcon_5380_reg(u_short, u_short); +static int falcon_wrong_dma_range(SC_REQ *, struct dma_chain *); +static void fal1_dma(u_int, u_int, SC_REQ *); +static void scsi_falcon_dmasetup(SC_REQ *, u_int, u_char); +static int falcon_poll_edma(SC_REQ *); +static int falcon_get_dma_result(SC_REQ *, u_long *); + int falcon_can_access_5380(void); + void scsi_falcon_clr_ipend(void); + void scsi_falcon_idisable(void); + void scsi_falcon_ienable(void); + int scsi_falcon_ipending(void); + int falcon_claimed_dma(void); + void falcon_reconsider_dma(void); static void scsi_falcon_init(sc) @@ -958,22 +958,22 @@ falcon_can_access_5380() /* * The prototypes first... */ -static void scsi_mach_init __P((struct ncr_softc *)); - void scsi_ienable __P((void)); - void scsi_idisable __P((void)); - void scsi_clr_ipend __P((void)); - int scsi_ipending __P((void)); - void scsi_dma_setup __P((SC_REQ *, u_int, u_char)); - int wrong_dma_range __P((SC_REQ *, struct dma_chain *)); - int poll_edma __P((SC_REQ *)); - int get_dma_result __P((SC_REQ *, u_long *)); - int can_access_5380 __P((void)); +static void scsi_mach_init(struct ncr_softc *); + void scsi_ienable(void); + void scsi_idisable(void); + void scsi_clr_ipend(void); + int scsi_ipending(void); + void scsi_dma_setup(SC_REQ *, u_int, u_char); + int wrong_dma_range(SC_REQ *, struct dma_chain *); + int poll_edma(SC_REQ *); + int get_dma_result(SC_REQ *, u_long *); + int can_access_5380(void); /* * Register access will be done through the following 2 function pointers. */ -static u_char (*get_5380_reg) __P((u_short)); -static void (*set_5380_reg) __P((u_short, u_short)); +static u_char (*get_5380_reg)(u_short); +static void (*set_5380_reg)(u_short, u_short); #define GET_5380_REG (*get_5380_reg) #define SET_5380_REG (*set_5380_reg) diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c index b00d03cac7a..578392982c3 100644 --- a/sys/arch/atari/dev/clock.c +++ b/sys/arch/atari/dev/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.42 2008/11/04 16:43:47 abs Exp $ */ +/* $NetBSD: clock.c,v 1.43 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1982, 1990 The Regents of the University of California. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.42 2008/11/04 16:43:47 abs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.43 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -149,8 +149,8 @@ dev_type_close(rtcclose); dev_type_read(rtcread); dev_type_write(rtcwrite); -static void clockattach __P((struct device *, struct device *, void *)); -static int clockmatch __P((struct device *, struct cfdata *, void *)); +static void clockattach(struct device *, struct device *, void *); +static int clockmatch(struct device *, struct cfdata *, void *); CFATTACH_DECL(clock, sizeof(struct clock_softc), clockmatch, clockattach, NULL, NULL); @@ -162,9 +162,9 @@ const struct cdevsw rtc_cdevsw = { nostop, notty, nopoll, nommap, nokqfilter, }; -void statintr __P((struct clockframe)); +void statintr(struct clockframe); -static int twodigits __P((char *, int)); +static int twodigits(char *, int); static int divisor; /* Systemclock divisor */ diff --git a/sys/arch/atari/dev/dma.c b/sys/arch/atari/dev/dma.c index 0a94ca84d84..10345b5aa48 100644 --- a/sys/arch/atari/dev/dma.c +++ b/sys/arch/atari/dev/dma.c @@ -1,4 +1,4 @@ -/* $NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $ */ +/* $NetBSD: dma.c,v 1.19 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.18 2007/03/04 05:59:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.19 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,9 +88,9 @@ static TAILQ_HEAD(acthead, dma_entry) dma_active; static int must_init = 1; /* Must initialize */ -int cdmaint __P((void *, int)); +int cdmaint(void *, int); -static void st_dma_init __P((void)); +static void st_dma_init(void); static void st_dma_init() diff --git a/sys/arch/atari/dev/event_var.h b/sys/arch/atari/dev/event_var.h index d4eaa16fad1..3afedfeacb0 100644 --- a/sys/arch/atari/dev/event_var.h +++ b/sys/arch/atari/dev/event_var.h @@ -1,4 +1,4 @@ -/* $NetBSD: event_var.h,v 1.7 2008/03/01 14:16:49 rmind Exp $ */ +/* $NetBSD: event_var.h,v 1.8 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1992, 1993 @@ -73,11 +73,11 @@ struct evvar { psignal((ev)->ev_io, SIGIO); \ } -void ev_init __P((struct evvar *)); -void ev_fini __P((struct evvar *)); -int ev_read __P((struct evvar *, struct uio *, int)); -int ev_poll __P((struct evvar *, int, struct lwp *)); -int ev_kqfilter __P((struct evvar *, struct knote *)); +void ev_init(struct evvar *); +void ev_fini(struct evvar *); +int ev_read(struct evvar *, struct uio *, int); +int ev_poll(struct evvar *, int, struct lwp *); +int ev_kqfilter(struct evvar *, struct knote *); /* * PEVENT is set just above PSOCK, which is just above TTIPRI, on the diff --git a/sys/arch/atari/dev/fd.c b/sys/arch/atari/dev/fd.c index 32f375418d3..51faecc57f6 100644 --- a/sys/arch/atari/dev/fd.c +++ b/sys/arch/atari/dev/fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.63 2009/01/13 13:35:51 yamt Exp $ */ +/* $NetBSD: fd.c,v 1.64 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -49,7 +49,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.63 2009/01/13 13:35:51 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.64 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -194,7 +194,7 @@ static short def_type = 0; /* Reflects config-switches */ #define FLP_DEFTYPE 1 /* 720Kb, reasonable default */ #define FLP_TYPE(dev) ( DISKPART(dev) == 0 ? def_type : DISKPART(dev) - 1 ) -typedef void (*FPV) __P((void *)); +typedef void (*FPV)(void *); dev_type_open(fdopen); dev_type_close(fdclose); @@ -206,24 +206,24 @@ dev_type_strategy(fdstrategy); /* * Private drive functions.... */ -static void fdstart __P((struct fd_softc *)); -static void fddone __P((struct fd_softc *)); -static void fdstatus __P((struct fd_softc *)); -static void fd_xfer __P((struct fd_softc *)); -static void fdcint __P((struct fd_softc *)); -static int fd_xfer_ok __P((struct fd_softc *)); -static void fdmotoroff __P((struct fd_softc *)); -static void fdminphys __P((struct buf *)); -static void fdtestdrv __P((struct fd_softc *)); -static void fdgetdefaultlabel __P((struct fd_softc *, struct disklabel *, - int)); -static int fdgetdisklabel __P((struct fd_softc *, dev_t)); -static int fdselect __P((int, int, int)); -static void fddeselect __P((void)); -static void fdmoff __P((struct fd_softc *)); - u_char read_fdreg __P((u_short)); - void write_fdreg __P((u_short, u_short)); - u_char read_dmastat __P((void)); +static void fdstart(struct fd_softc *); +static void fddone(struct fd_softc *); +static void fdstatus(struct fd_softc *); +static void fd_xfer(struct fd_softc *); +static void fdcint(struct fd_softc *); +static int fd_xfer_ok(struct fd_softc *); +static void fdmotoroff(struct fd_softc *); +static void fdminphys(struct buf *); +static void fdtestdrv(struct fd_softc *); +static void fdgetdefaultlabel(struct fd_softc *, struct disklabel *, + int); +static int fdgetdisklabel(struct fd_softc *, dev_t); +static int fdselect(int, int, int); +static void fddeselect(void); +static void fdmoff(struct fd_softc *); + u_char read_fdreg(u_short); + void write_fdreg(u_short, u_short); + u_char read_dmastat(void); extern inline u_char read_fdreg(u_short regno) { @@ -250,7 +250,7 @@ extern inline u_char read_dmastat(void) * Note: This location _must_ be read as an u_short. Failure to do so * will return garbage! */ -static u_short rd_cfg_switch __P((void)); +static u_short rd_cfg_switch(void); static u_short rd_cfg_switch(void) { return(*((u_short*)AD_CFG_SWITCH)); @@ -267,9 +267,9 @@ static u_short rd_cfg_switch(void) */ extern struct cfdriver fd_cd; -static int fdcmatch __P((struct device *, struct cfdata *, void *)); -static int fdcprint __P((void *, const char *)); -static void fdcattach __P((struct device *, struct device *, void *)); +static int fdcmatch(struct device *, struct cfdata *, void *); +static int fdcprint(void *, const char *); +static void fdcattach(struct device *, struct device *, void *); CFATTACH_DECL(fdc, sizeof(struct device), fdcmatch, fdcattach, NULL, NULL); @@ -359,8 +359,8 @@ const char *pnp; return(UNCONF); } -static int fdmatch __P((struct device *, struct cfdata *, void *)); -static void fdattach __P((struct device *, struct device *, void *)); +static int fdmatch(struct device *, struct cfdata *, void *); +static void fdattach(struct device *, struct device *, void *); struct dkdriver fddkdriver = { fdstrategy }; diff --git a/sys/arch/atari/dev/grf.c b/sys/arch/atari/dev/grf.c index 20bc515c27f..6cc14491bf9 100644 --- a/sys/arch/atari/dev/grf.c +++ b/sys/arch/atari/dev/grf.c @@ -1,4 +1,4 @@ -/* $NetBSD: grf.c,v 1.36 2007/03/04 05:59:40 christos Exp $ */ +/* $NetBSD: grf.c,v 1.37 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -85,7 +85,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.36 2007/03/04 05:59:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.37 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -123,13 +123,13 @@ __KERNEL_RCSID(0, "$NetBSD: grf.c,v 1.36 2007/03/04 05:59:40 christos Exp $"); #define ite_reinit(d) #endif -int grfon __P((dev_t)); -int grfoff __P((dev_t)); -int grfsinfo __P((dev_t, struct grfdyninfo *)); +int grfon(dev_t); +int grfoff(dev_t); +int grfsinfo(dev_t, struct grfdyninfo *); -int grfbusprint __P((void *auxp, const char *)); -int grfbusmatch __P((struct device *, struct cfdata *, void *)); -void grfbusattach __P((struct device *, struct device *, void *)); +int grfbusprint(void *auxp, const char *); +int grfbusmatch(struct device *, struct cfdata *, void *); +void grfbusattach(struct device *, struct device *, void *); /* * pointers to grf drivers device structs diff --git a/sys/arch/atari/dev/grfabs.c b/sys/arch/atari/dev/grfabs.c index b2cafa78bdc..091ed254aa3 100644 --- a/sys/arch/atari/dev/grfabs.c +++ b/sys/arch/atari/dev/grfabs.c @@ -1,4 +1,4 @@ -/* $NetBSD: grfabs.c,v 1.13 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: grfabs.c,v 1.14 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.13 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.14 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: grfabs.c,v 1.13 2005/12/11 12:16:54 christos Exp $") /* * Function decls */ -static dmode_t *get_best_display_mode __P((dimen_t *, int, dmode_t *)); +static dmode_t *get_best_display_mode(dimen_t *, int, dmode_t *); /* * List of available graphic modes diff --git a/sys/arch/atari/dev/grfabs_et.c b/sys/arch/atari/dev/grfabs_et.c index aaf0d80d4f7..a9056a20e57 100644 --- a/sys/arch/atari/dev/grfabs_et.c +++ b/sys/arch/atari/dev/grfabs_et.c @@ -1,4 +1,4 @@ -/* $NetBSD: grfabs_et.c,v 1.27 2007/03/06 14:40:25 tsutsui Exp $ */ +/* $NetBSD: grfabs_et.c,v 1.28 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.27 2007/03/06 14:40:25 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.28 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/queue.h> @@ -92,15 +92,15 @@ __KERNEL_RCSID(0, "$NetBSD: grfabs_et.c,v 1.27 2007/03/06 14:40:25 tsutsui Exp $ /* * Function decls */ -static void init_view __P((view_t *, bmap_t *, dmode_t *, box_t *)); -static colormap_t *alloc_colormap __P((dmode_t *)); -static void et_display_view __P((view_t *)); -static view_t *et_alloc_view __P((dmode_t *, dimen_t *, u_char)); -static void et_free_view __P((view_t *)); -static void et_loadmode __P((struct grfvideo_mode *, et_sv_reg_t *)); -static void et_remove_view __P((view_t *)); -static void et_save_view __P((view_t *)); -static int et_use_colormap __P((view_t *, colormap_t *)); +static void init_view(view_t *, bmap_t *, dmode_t *, box_t *); +static colormap_t *alloc_colormap(dmode_t *); +static void et_display_view(view_t *); +static view_t *et_alloc_view(dmode_t *, dimen_t *, u_char); +static void et_free_view(view_t *); +static void et_loadmode(struct grfvideo_mode *, et_sv_reg_t *); +static void et_remove_view(view_t *); +static void et_save_view(view_t *); +static int et_use_colormap(view_t *, colormap_t *); /* * Our function switch table diff --git a/sys/arch/atari/dev/grfabs_et.h b/sys/arch/atari/dev/grfabs_et.h index c6976d6fbac..2dc5eeb9491 100644 --- a/sys/arch/atari/dev/grfabs_et.h +++ b/sys/arch/atari/dev/grfabs_et.h @@ -1,4 +1,4 @@ -/* $NetBSD: grfabs_et.h,v 1.1 1996/10/11 21:02:48 leo Exp $ */ +/* $NetBSD: grfabs_et.h,v 1.2 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -57,7 +57,7 @@ typedef struct { /* actually longer... */ } save_area_t; -void et_hwrest __P((et_sv_reg_t *)); -void et_hwsave __P((et_sv_reg_t *)); -int et_probe_card __P((void)); -void et_probe_video __P((MODES *)); +void et_hwrest(et_sv_reg_t *); +void et_hwsave(et_sv_reg_t *); +int et_probe_card(void); +void et_probe_video(MODES *); diff --git a/sys/arch/atari/dev/grfabs_fal.c b/sys/arch/atari/dev/grfabs_fal.c index eb606234532..30e46d5ba62 100644 --- a/sys/arch/atari/dev/grfabs_fal.c +++ b/sys/arch/atari/dev/grfabs_fal.c @@ -1,4 +1,4 @@ -/* $NetBSD: grfabs_fal.c,v 1.18 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: grfabs_fal.c,v 1.19 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Thomas Gerner. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.18 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.19 2009/03/14 14:45:56 dsl Exp $"); #ifdef FALCON_VIDEO /* @@ -57,18 +57,18 @@ __KERNEL_RCSID(0, "$NetBSD: grfabs_fal.c,v 1.18 2005/12/11 12:16:54 christos Exp /* * Function decls */ -static void init_view __P((view_t *, bmap_t *, dmode_t *, box_t *)); -static bmap_t *alloc_bitmap __P((u_long, u_long, u_char)); -static colormap_t *alloc_colormap __P((dmode_t *)); -static void free_bitmap __P((bmap_t *)); -static void falcon_display_view __P((view_t *)); -static view_t *falcon_alloc_view __P((dmode_t *, dimen_t *, u_char)); -static void falcon_free_view __P((view_t *)); -static void falcon_remove_view __P((view_t *)); -static void falcon_save_view __P((view_t *)); -static int falcon_use_colormap __P((view_t *, colormap_t *)); -static void falcon_detect __P((dmode_t *)); -static struct videl *falcon_getreg __P((u_short)); +static void init_view(view_t *, bmap_t *, dmode_t *, box_t *); +static bmap_t *alloc_bitmap(u_long, u_long, u_char); +static colormap_t *alloc_colormap(dmode_t *); +static void free_bitmap(bmap_t *); +static void falcon_display_view(view_t *); +static view_t *falcon_alloc_view(dmode_t *, dimen_t *, u_char); +static void falcon_free_view(view_t *); +static void falcon_remove_view(view_t *); +static void falcon_save_view(view_t *); +static int falcon_use_colormap(view_t *, colormap_t *); +static void falcon_detect(dmode_t *); +static struct videl *falcon_getreg(u_short); /* * Our function switch table @@ -307,7 +307,7 @@ dmode_t *dm; } u_long falcon_needs_vbl; -void falcon_display_switch __P((void)); +void falcon_display_switch(void); static void falcon_display_view(v) diff --git a/sys/arch/atari/dev/grfabs_fal.h b/sys/arch/atari/dev/grfabs_fal.h index abef3363cdb..ce73d5d8151 100644 --- a/sys/arch/atari/dev/grfabs_fal.h +++ b/sys/arch/atari/dev/grfabs_fal.h @@ -1,4 +1,4 @@ -/* $NetBSD: grfabs_fal.h,v 1.3 1996/09/16 06:43:34 leo Exp $ */ +/* $NetBSD: grfabs_fal.h,v 1.4 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Thomas Gerner. @@ -79,5 +79,5 @@ struct videl { ((((0x00000070 & (v)) * 0xff / 0x7) << 4) & 0x0000ff00) |\ (0x00000007 & (v)) * 0xff / 0x7) -void falcon_probe_video __P((MODES *)); +void falcon_probe_video(MODES *); #endif /* _GRFABS_FAL_H */ diff --git a/sys/arch/atari/dev/grfabs_reg.h b/sys/arch/atari/dev/grfabs_reg.h index e37428de773..38658dd6fb3 100644 --- a/sys/arch/atari/dev/grfabs_reg.h +++ b/sys/arch/atari/dev/grfabs_reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: grfabs_reg.h,v 1.13 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: grfabs_reg.h,v 1.14 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -142,12 +142,12 @@ enum colormap_type { #define MAKE_GREY_ENTRY(l) (l & 0xff) struct grfabs_sw { - void (*display_view) __P((view_t*)); - view_t * (*alloc_view) __P((dmode_t *, dimen_t *, u_char)); - void (*free_view) __P((view_t *)); - void (*remove_view) __P((view_t *)); - void (*save_view) __P((view_t *)); - int (*use_colormap) __P((view_t *, colormap_t *)); + void (*display_view)(view_t*); + view_t * (*alloc_view)(dmode_t *, dimen_t *, u_char); + void (*free_view)(view_t *); + void (*remove_view)(view_t *); + void (*save_view)(view_t *); + int (*use_colormap)(view_t *, colormap_t *); }; /* display mode */ @@ -181,7 +181,7 @@ typedef LIST_HEAD(modelist, display_mode) MODES; /* * Prototype for the probe function */ -typedef void (*grf_probe_t) __P((MODES *)); +typedef void (*grf_probe_t)(MODES *); /* * Common variables @@ -194,14 +194,14 @@ extern u_long gra_def_color16[16]; /* * Prototypes: */ -int grfabs_probe __P((grf_probe_t)); -view_t *grf_alloc_view __P((dmode_t *d, dimen_t *dim, u_char depth)); -dmode_t *grf_get_best_mode __P((dimen_t *dim, u_char depth)); -void grf_display_view __P((view_t *v)); -void grf_remove_view __P((view_t *v)); -void grf_free_view __P((view_t *v)); -int grf_get_colormap __P((view_t *, colormap_t *)); -int grf_use_colormap __P((view_t *, colormap_t *)); -void grf_save_view __P((view_t *v)); +int grfabs_probe(grf_probe_t); +view_t *grf_alloc_view(dmode_t *d, dimen_t *dim, u_char depth); +dmode_t *grf_get_best_mode(dimen_t *dim, u_char depth); +void grf_display_view(view_t *v); +void grf_remove_view(view_t *v); +void grf_free_view(view_t *v); +int grf_get_colormap(view_t *, colormap_t *); +int grf_use_colormap(view_t *, colormap_t *); +void grf_save_view(view_t *v); #endif /* _GRFABS_REG_H */ diff --git a/sys/arch/atari/dev/grfabs_tt.c b/sys/arch/atari/dev/grfabs_tt.c index 04b2e50a60d..d326750be6e 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.15 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: grfabs_tt.c,v 1.16 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.15 2005/12/11 12:16:54 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.16 2009/03/14 14:45:56 dsl Exp $"); #ifdef TT_VIDEO /* @@ -56,16 +56,16 @@ __KERNEL_RCSID(0, "$NetBSD: grfabs_tt.c,v 1.15 2005/12/11 12:16:54 christos Exp /* * Function decls */ -static void init_view __P((view_t *, bmap_t *, dmode_t *, box_t *)); -static bmap_t *alloc_bitmap __P((u_long, u_long, u_char)); -static colormap_t *alloc_colormap __P((dmode_t *)); -static void free_bitmap __P((bmap_t *)); -static void tt_display_view __P((view_t *)); -static view_t *tt_alloc_view __P((dmode_t *, dimen_t *, u_char)); -static void tt_free_view __P((view_t *)); -static void tt_remove_view __P((view_t *)); -static void tt_save_view __P((view_t *)); -static int tt_use_colormap __P((view_t *, colormap_t *)); +static void init_view(view_t *, bmap_t *, dmode_t *, box_t *); +static bmap_t *alloc_bitmap(u_long, u_long, u_char); +static colormap_t *alloc_colormap(dmode_t *); +static void free_bitmap(bmap_t *); +static void tt_display_view(view_t *); +static view_t *tt_alloc_view(dmode_t *, dimen_t *, u_char); +static void tt_free_view(view_t *); +static void tt_remove_view(view_t *); +static void tt_save_view(view_t *); +static int tt_use_colormap(view_t *, colormap_t *); /* * Our function switch table diff --git a/sys/arch/atari/dev/grfabs_tt.h b/sys/arch/atari/dev/grfabs_tt.h index 5e9f4564a8b..f935c524313 100644 --- a/sys/arch/atari/dev/grfabs_tt.h +++ b/sys/arch/atari/dev/grfabs_tt.h @@ -1,4 +1,4 @@ -/* $NetBSD: grfabs_tt.h,v 1.1 1996/09/16 06:50:34 leo Exp $ */ +/* $NetBSD: grfabs_tt.h,v 1.2 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -44,5 +44,5 @@ (((0x000000f0 & (v)) * 0xff / 0xf) << 4) |\ (0x0000000f & (v)) * 0xff / 0xf) -void tt_probe_video __P((MODES *)); +void tt_probe_video(MODES *); #endif /* _GRFABS_TT_H */ diff --git a/sys/arch/atari/dev/grfvar.h b/sys/arch/atari/dev/grfvar.h index b3e03540698..d9220355925 100644 --- a/sys/arch/atari/dev/grfvar.h +++ b/sys/arch/atari/dev/grfvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: grfvar.h,v 1.10 2007/03/04 05:59:40 christos Exp $ */ +/* $NetBSD: grfvar.h,v 1.11 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -101,18 +101,18 @@ struct grf_softc { dev_t g_grfdev; /* grf device number */ dev_t g_viewdev; /* view device number */ void * g_data; /* device dependent data */ - int (*g_mode) __P((struct grf_softc *, int, void *, - int, int)); + int (*g_mode)(struct grf_softc *, int, void *, + int, int); int g_conpri; /* priority of ite as console */ - 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)); + void (*g_iteinit)(struct ite_softc *); + void (*g_itedeinit)(struct ite_softc *); + void (*g_iteclear)(struct ite_softc *, int, int, + int, int); + void (*g_iteputc)(struct ite_softc *, int, int, + int, int); + void (*g_itecursor)(struct ite_softc *, int); + void (*g_itescroll)(struct ite_softc *, int, int, + int, int); }; /* flags */ @@ -145,8 +145,8 @@ struct grf_softc { #ifdef _KERNEL -int grf_mode __P((struct grf_softc *, int, void *, int, int)); -void grf_viewsync __P((struct grf_softc *)); +int grf_mode(struct grf_softc *, int, void *, int, int); +void grf_viewsync(struct grf_softc *); extern struct grf_softc *grfsp[]; /* XXX */ #endif /* _KERNEL */ diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c index fddb5596147..cdf2f873b20 100644 --- a/sys/arch/atari/dev/hdfd.c +++ b/sys/arch/atari/dev/hdfd.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdfd.c,v 1.65 2009/01/13 13:35:51 yamt Exp $ */ +/* $NetBSD: hdfd.c,v 1.66 2009/03/14 14:45:56 dsl Exp $ */ /*- * Copyright (c) 1996 Leo Weppelman @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.65 2009/01/13 13:35:51 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.66 2009/03/14 14:45:56 dsl Exp $"); #include "opt_ddb.h" @@ -151,7 +151,7 @@ void fddma_intr(void); void * fddmaaddr = NULL; int fddmalen = 0; -extern void mfp_hdfd_nf __P((void)), mfp_hdfd_fifo __P((void)); +extern void mfp_hdfd_nf(void)), mfp_hdfd_fifo(void); /* * Argument to fdcintr..... @@ -201,9 +201,9 @@ struct fdc_softc { }; /* controller driver configuration */ -int fdcprobe __P((struct device *, struct cfdata *, void *)); -int fdprint __P((void *, const char *)); -void fdcattach __P((struct device *, struct device *, void *)); +int fdcprobe(struct device *, struct cfdata *, void *); +int fdprint(void *, const char *); +void fdcattach(struct device *, struct device *, void *); CFATTACH_DECL(fdc, sizeof(struct fdc_softc), fdcprobe, fdcattach, NULL, NULL); @@ -278,8 +278,8 @@ struct fd_softc { }; /* floppy driver configuration */ -int fdprobe __P((struct device *, struct cfdata *, void *)); -void fdattach __P((struct device *, struct device *, void *)); +int fdprobe(struct device *, struct cfdata *, void *); +void fdattach(struct device *, struct device *, void *); CFATTACH_DECL(hdfd, sizeof(struct fd_softc), fdprobe, fdattach, NULL, NULL); @@ -295,30 +295,30 @@ const struct cdevsw fd_cdevsw = { nostop, notty, nopoll, nommap, nokqfilter, D_DISK }; -void fdstart __P((struct fd_softc *)); +void fdstart(struct fd_softc *); struct dkdriver fddkdriver = { fdstrategy }; -void fd_set_motor __P((struct fdc_softc *fdc, int reset)); -void fd_motor_off __P((void *arg)); -void fd_motor_on __P((void *arg)); -int fdcresult __P((struct fdc_softc *fdc)); -int out_fdc __P((u_char x)); -void fdc_ctrl_intr __P((struct clockframe)); -void fdcstart __P((struct fdc_softc *fdc)); -void fdcstatus __P((struct device *dv, int n, const char *s)); -void fdctimeout __P((void *arg)); -void fdcpseudointr __P((void *arg)); -int fdcintr __P((void *)); -void fdcretry __P((struct fdc_softc *fdc)); -void fdfinish __P((struct fd_softc *fd, struct buf *bp)); -int fdformat __P((dev_t, struct ne7_fd_formb *, struct proc *)); - -static void fdgetdisklabel __P((struct fd_softc *, dev_t)); -static void fdgetdefaultlabel __P((struct fd_softc *, struct disklabel *, - int)); - -inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t)); +void fd_set_motor(struct fdc_softc *fdc, int reset); +void fd_motor_off(void *arg); +void fd_motor_on(void *arg); +int fdcresult(struct fdc_softc *fdc); +int out_fdc(u_char x); +void fdc_ctrl_intr(struct clockframe); +void fdcstart(struct fdc_softc *fdc); +void fdcstatus(struct device *dv, int n, const char *s); +void fdctimeout(void *arg); +void fdcpseudointr(void *arg); +int fdcintr(void *); +void fdcretry(struct fdc_softc *fdc); +void fdfinish(struct fd_softc *fd, struct buf *bp); +int fdformat(dev_t, struct ne7_fd_formb *, struct proc *); + +static void fdgetdisklabel(struct fd_softc *, dev_t); +static void fdgetdefaultlabel(struct fd_softc *, struct disklabel *, + int); + +inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t); int fdcprobe(parent, cfp, aux) @@ -337,7 +337,7 @@ fdcprobe(parent, cfp, aux) if (!atari_realconfig) return 0; - if ((mb_tag = mb_alloc_bus_space_tag()) == NULL) + if ((mb_tag = mb_alloc_bus_space_tag() == NULL) return 0; if (bus_space_map(mb_tag, FD_IOBASE, FD_IOSIZE, 0, &handle)) { diff --git a/sys/arch/atari/dev/ite.c b/sys/arch/atari/dev/ite.c index 28b05298e02..c9471762906 100644 --- a/sys/arch/atari/dev/ite.c +++ b/sys/arch/atari/dev/ite.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite.c,v 1.59 2008/06/11 14:35:53 tsutsui Exp $ */ +/* $NetBSD: ite.c,v 1.60 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.59 2008/06/11 14:35:53 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.60 2009/03/14 14:45:56 dsl Exp $"); #include "opt_ddb.h" @@ -142,38 +142,38 @@ u_char cons_tabs[MAX_TABS]; struct ite_softc *kbd_ite; int kbd_init; -static inline int atoi __P((const char *)); -static inline int ite_argnum __P((struct ite_softc *)); -static inline int ite_zargnum __P((struct ite_softc *)); -static inline void ite_cr __P((struct ite_softc *)); -static inline void ite_crlf __P((struct ite_softc *)); -static inline void ite_clrline __P((struct ite_softc *)); -static inline void ite_clrscreen __P((struct ite_softc *)); -static inline void ite_clrtobos __P((struct ite_softc *)); -static inline void ite_clrtobol __P((struct ite_softc *)); -static inline void ite_clrtoeol __P((struct ite_softc *)); -static inline void ite_clrtoeos __P((struct ite_softc *)); -static inline void ite_dnchar __P((struct ite_softc *, int)); -static inline void ite_inchar __P((struct ite_softc *, int)); -static inline void ite_inline __P((struct ite_softc *, int)); -static inline void ite_lf __P((struct ite_softc *)); -static inline void ite_dnline __P((struct ite_softc *, int)); -static inline void ite_rlf __P((struct ite_softc *)); -static inline void ite_sendstr __P((const char *)); -static inline void snap_cury __P((struct ite_softc *)); - -static void alignment_display __P((struct ite_softc *)); -static struct ite_softc *getitesp __P((dev_t)); -static void itecheckwrap __P((struct ite_softc *)); -static void iteprecheckwrap __P((struct ite_softc *)); -static void itestart __P((struct tty *)); -static void ite_switch __P((int)); -static void repeat_handler __P((void *)); - -void iteputchar __P((int c, struct ite_softc *ip)); -void ite_putstr __P((const u_char * s, int len, dev_t dev)); -void iteattach __P((struct device *, struct device *, void *)); -int itematch __P((struct device *, struct cfdata *, void *)); +static inline int atoi(const char *); +static inline int ite_argnum(struct ite_softc *); +static inline int ite_zargnum(struct ite_softc *); +static inline void ite_cr(struct ite_softc *); +static inline void ite_crlf(struct ite_softc *); +static inline void ite_clrline(struct ite_softc *); +static inline void ite_clrscreen(struct ite_softc *); +static inline void ite_clrtobos(struct ite_softc *); +static inline void ite_clrtobol(struct ite_softc *); +static inline void ite_clrtoeol(struct ite_softc *); +static inline void ite_clrtoeos(struct ite_softc *); +static inline void ite_dnchar(struct ite_softc *, int); +static inline void ite_inchar(struct ite_softc *, int); +static inline void ite_inline(struct ite_softc *, int); +static inline void ite_lf(struct ite_softc *); +static inline void ite_dnline(struct ite_softc *, int); +static inline void ite_rlf(struct ite_softc *); +static inline void ite_sendstr(const char *); +static inline void snap_cury(struct ite_softc *); + +static void alignment_display(struct ite_softc *); +static struct ite_softc *getitesp(dev_t); +static void itecheckwrap(struct ite_softc *); +static void iteprecheckwrap(struct ite_softc *); +static void itestart(struct tty *); +static void ite_switch(int); +static void repeat_handler(void *); + +void iteputchar(int c, struct ite_softc *ip); +void ite_putstr(const u_char * s, int len, dev_t dev); +void iteattach(struct device *, struct device *, void *); +int itematch(struct device *, struct cfdata *, void *); /* * Console specific types. diff --git a/sys/arch/atari/dev/ite_cc.c b/sys/arch/atari/dev/ite_cc.c index c4390d6de36..e254f8dc696 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.27 2007/03/04 05:59:40 christos Exp $ */ +/* $NetBSD: ite_cc.c,v 1.28 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.27 2007/03/04 05:59:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_cc.c,v 1.28 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -90,24 +90,24 @@ static ipriv_t con_ipriv; extern font_info font_info_8x8; extern font_info font_info_8x16; -static void view_init __P((struct ite_softc *)); -static void view_deinit __P((struct ite_softc *)); -static int itecc_ioctl __P((struct ite_softc *, u_long, void *, int, - struct lwp *)); -static int ite_newsize __P((struct ite_softc *, struct itewinsize *)); -static void cursor32 __P((struct ite_softc *, int)); -static void putc8 __P((struct ite_softc *, int, int, int, int)); -static void clear8 __P((struct ite_softc *, int, int, int, int)); -static void scroll8 __P((struct ite_softc *, int, int, int, int)); -static void scrollbmap __P((bmap_t *, u_short, u_short, u_short, u_short, - short, short)); +static void view_init(struct ite_softc *); +static void view_deinit(struct ite_softc *); +static int itecc_ioctl(struct ite_softc *, u_long, void *, int, + struct lwp *); +static int ite_newsize(struct ite_softc *, struct itewinsize *); +static void cursor32(struct ite_softc *, int); +static void putc8(struct ite_softc *, int, int, int, int); +static void clear8(struct ite_softc *, int, int, int, int); +static void scroll8(struct ite_softc *, int, int, int, int); +static void scrollbmap(bmap_t *, u_short, u_short, u_short, u_short, + short, short); /* * grfcc config stuff */ -void grfccattach __P((struct device *, struct device *, void *)); -int grfccmatch __P((struct device *, struct cfdata *, void *)); -int grfccprint __P((void *, const char *)); +void grfccattach(struct device *, struct device *, void *); +int grfccmatch(struct device *, struct cfdata *, void *); +int grfccprint(void *, const char *); CFATTACH_DECL(grfcc, sizeof(struct grf_softc), grfccmatch, grfccattach, NULL, NULL); @@ -121,10 +121,10 @@ static struct cfdata *cfdata_grf = NULL; * Probe functions we can use: */ #ifdef TT_VIDEO -void tt_probe_video __P((MODES *)); +void tt_probe_video(MODES *); #endif /* TT_VIDEO */ #ifdef FALCON_VIDEO -void falcon_probe_video __P((MODES *)); +void falcon_probe_video(MODES *); #endif /* FALCON_VIDEO */ int diff --git a/sys/arch/atari/dev/ite_et.c b/sys/arch/atari/dev/ite_et.c index 1fd39ca6709..8fabd644e61 100644 --- a/sys/arch/atari/dev/ite_et.c +++ b/sys/arch/atari/dev/ite_et.c @@ -1,4 +1,4 @@ -/* $NetBSD: ite_et.c,v 1.20 2007/03/04 05:59:40 christos Exp $ */ +/* $NetBSD: ite_et.c,v 1.21 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.20 2007/03/04 05:59:40 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ite_et.c,v 1.21 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -79,25 +79,25 @@ static u_char etconscolors[3][3] = { /* background, foreground, hilite */ extern font_info font_info_8x8; extern font_info font_info_8x16; -static void grfet_iteinit __P((struct grf_softc *)); -static void view_init __P((struct ite_softc *)); -static void view_deinit __P((struct ite_softc *)); -static int iteet_ioctl __P((struct ite_softc *, u_long, void *, int, - struct lwp *)); -static int ite_newsize __P((struct ite_softc *, struct itewinsize *)); -static void et_inittextmode __P((struct ite_softc *, et_sv_reg_t *, int)); -void et_cursor __P((struct ite_softc *ip, int flag)); -void et_clear __P((struct ite_softc *ip, int sy, int sx, int h, int w)); -void et_putc __P((struct ite_softc *ip, int c, int dy, int dx, int mode)); -void et_scroll __P((struct ite_softc *ip, int sy, int sx, int count, - int dir)); +static void grfet_iteinit(struct grf_softc *); +static void view_init(struct ite_softc *); +static void view_deinit(struct ite_softc *); +static int iteet_ioctl(struct ite_softc *, u_long, void *, int, + struct lwp *); +static int ite_newsize(struct ite_softc *, struct itewinsize *); +static void et_inittextmode(struct ite_softc *, et_sv_reg_t *, int); +void et_cursor(struct ite_softc *ip, int flag); +void et_clear(struct ite_softc *ip, int sy, int sx, int h, int w); +void et_putc(struct ite_softc *ip, int c, int dy, int dx, int mode); +void et_scroll(struct ite_softc *ip, int sy, int sx, int count, + int dir); /* * grfet config stuff */ -void grfetattach __P((struct device *, struct device *, void *)); -int grfetmatch __P((struct device *, struct cfdata *, void *)); -int grfetprint __P((void *, const char *)); +void grfetattach(struct device *, struct device *, void *); +int grfetmatch(struct device *, struct cfdata *, void *); +int grfetprint(void *, const char *); CFATTACH_DECL(grfet, sizeof(struct grf_softc), grfetmatch, grfetattach, NULL, NULL); diff --git a/sys/arch/atari/dev/itevar.h b/sys/arch/atari/dev/itevar.h index b8f093f5a0f..c1602f3a6cc 100644 --- a/sys/arch/atari/dev/itevar.h +++ b/sys/arch/atari/dev/itevar.h @@ -1,4 +1,4 @@ -/* $NetBSD: itevar.h,v 1.12 2007/03/04 05:59:40 christos Exp $ */ +/* $NetBSD: itevar.h,v 1.13 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman (Atari modifications) @@ -93,8 +93,8 @@ struct ite_softc { int save_curx; int cury; int save_cury; - int (*itexx_ioctl) __P((struct ite_softc *, u_long, - void *, int, struct lwp *)); + int (*itexx_ioctl)(struct ite_softc *, u_long, + void *, int, struct lwp *); }; enum ite_flags { @@ -185,27 +185,27 @@ struct consdev; struct termios; /* console related function */ -void ite_cnprobe __P((struct consdev *)); -void ite_cninit __P((struct consdev *)); -int ite_cngetc __P((dev_t)); -void ite_cnputc __P((dev_t, int)); -void ite_cnfinish __P((struct ite_softc *)); +void ite_cnprobe(struct consdev *); +void ite_cninit(struct consdev *); +int ite_cngetc(dev_t); +void ite_cnputc(dev_t, int); +void ite_cnfinish(struct ite_softc *); /* standard ite device entry points. */ -void iteinit __P((dev_t)); +void iteinit(dev_t); /* ite functions */ -void ite_on __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 *)); -int ite_cnfilter __P((u_int, enum caller)); -void ite_filter __P((u_int ,enum caller)); +void ite_on(dev_t, int); +void ite_off(dev_t, int); +void ite_reinit(dev_t); +int ite_param(struct tty *, struct termios *); +void ite_reset(struct ite_softc *); +int ite_cnfilter(u_int, enum caller); +void ite_filter(u_int ,enum caller); /* ite_cc functions */ -int grfcc_cnprobe __P((void)); -void grfcc_iteinit __P((struct grf_softc *)); +int grfcc_cnprobe(void); +void grfcc_iteinit(struct grf_softc *); #endif /* _KERNEL */ #endif /* _ITEVAR_H */ diff --git a/sys/arch/atari/dev/kbd.c b/sys/arch/atari/dev/kbd.c index 6d3d6600f05..fb9f723f99f 100644 --- a/sys/arch/atari/dev/kbd.c +++ b/sys/arch/atari/dev/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.32 2009/01/17 05:23:28 tsutsui Exp $ */ +/* $NetBSD: kbd.c,v 1.33 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.32 2009/01/17 05:23:28 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.33 2009/03/14 14:45:56 dsl Exp $"); #include "mouse.h" #include "ite.h" @@ -115,16 +115,16 @@ dev_type_poll(kbdpoll); dev_type_kqfilter(kbdkqfilter); /* Interrupt handler */ -void kbdintr __P((int)); +void kbdintr(int); -static void kbdsoft __P((void *, void *)); -static void kbdattach __P((struct device *, struct device *, void *)); -static int kbdmatch __P((struct device *, struct cfdata *, void *)); +static void kbdsoft(void *, void *); +static void kbdattach(struct device *, struct device *, void *); +static int kbdmatch(struct device *, struct cfdata *, void *); #if NITE>0 -static int kbd_do_modifier __P((u_char)); +static int kbd_do_modifier(u_char); #endif -static int kbd_write_poll __P((u_char *, int)); -static void kbd_pkg_start __P((struct kbd_softc *, u_char)); +static int kbd_write_poll(u_char *, int); +static void kbd_pkg_start(struct kbd_softc *, u_char); CFATTACH_DECL(kbd, sizeof(struct device), kbdmatch, kbdattach, NULL, NULL); diff --git a/sys/arch/atari/dev/kbdvar.h b/sys/arch/atari/dev/kbdvar.h index 93680997e62..0852d92f4e5 100644 --- a/sys/arch/atari/dev/kbdvar.h +++ b/sys/arch/atari/dev/kbdvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: kbdvar.h,v 1.5 2003/02/02 17:56:55 thomas Exp $ */ +/* $NetBSD: kbdvar.h,v 1.6 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -71,12 +71,12 @@ struct kbd_softc { #ifdef _KERNEL extern u_char kbd_modifier; -void kbd_bell_gparms __P((u_int *, u_int *, u_int *)); -void kbd_bell_sparms __P((u_int, u_int, u_int)); -void kbd_write __P((u_char *, int)); -int kbdgetcn __P((void)); -void kbdbell __P((void)); -void kbdenable __P((void)); +void kbd_bell_gparms(u_int *, u_int *, u_int *); +void kbd_bell_sparms(u_int, u_int, u_int); +void kbd_write(u_char *, int); +int kbdgetcn(void); +void kbdbell(void); +void kbdenable(void); #endif /* _KERNEL */ #endif /* _KBDVAR_H */ diff --git a/sys/arch/atari/dev/md_root.c b/sys/arch/atari/dev/md_root.c index 862f6d86cee..d6c98cd1f76 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.28 2008/12/28 23:00:39 tsutsui Exp $ */ +/* $NetBSD: md_root.c,v 1.29 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.28 2008/12/28 23:00:39 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: md_root.c,v 1.29 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -100,12 +100,12 @@ struct read_info { }; -static int loaddisk __P((struct md_conf *, dev_t ld_dev, struct lwp *)); -static int ramd_norm_read __P((struct read_info *)); +static int loaddisk(struct md_conf *, dev_t ld_dev, struct lwp *); +static int ramd_norm_read(struct read_info *); #ifdef support_compression -static int cpy_uncompressed __P((void *, int, struct read_info *)); -static int md_compressed __P((void *, int, struct read_info *)); +static int cpy_uncompressed(void *, int, struct read_info *); +static int md_compressed(void *, int, struct read_info *); #endif /* diff --git a/sys/arch/atari/dev/ms.c b/sys/arch/atari/dev/ms.c index 0007904e7c3..03e636e5c97 100644 --- a/sys/arch/atari/dev/ms.c +++ b/sys/arch/atari/dev/ms.c @@ -1,4 +1,4 @@ -/* $NetBSD: ms.c,v 1.21 2009/01/17 05:23:28 tsutsui Exp $ */ +/* $NetBSD: ms.c,v 1.22 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -52,7 +52,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.21 2009/01/17 05:23:28 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.22 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: ms.c,v 1.21 2009/01/17 05:23:28 tsutsui Exp $"); #define NMOUSE 1 #endif -typedef void (*FPV) __P((void *)); +typedef void (*FPV)(void *); static struct ms_softc ms_softc[NMOUSE]; @@ -95,7 +95,7 @@ const struct cdevsw ms_cdevsw = { nostop, notty, mspoll, nommap, mskqfilter, }; -static void ms_3b_delay __P((struct ms_softc *)); +static void ms_3b_delay(struct ms_softc *); int mouseattach(cnt) diff --git a/sys/arch/atari/dev/msvar.h b/sys/arch/atari/dev/msvar.h index 125629895a0..03beaa3797c 100644 --- a/sys/arch/atari/dev/msvar.h +++ b/sys/arch/atari/dev/msvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: msvar.h,v 1.2 2000/03/23 06:36:04 thorpej Exp $ */ +/* $NetBSD: msvar.h,v 1.3 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman @@ -58,8 +58,8 @@ struct ms_softc { }; #ifdef _KERNEL -void mouse_soft __P((REL_MOUSE *, int, int)); -int mouseattach __P((int)); +void mouse_soft(REL_MOUSE *, int, int); +int mouseattach(int); #endif /* _KERNEL */ #endif /* _MSVAR_H */ diff --git a/sys/arch/atari/dev/ncr5380.c b/sys/arch/atari/dev/ncr5380.c index 48d27e039dd..216891c5dc1 100644 --- a/sys/arch/atari/dev/ncr5380.c +++ b/sys/arch/atari/dev/ncr5380.c @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380.c,v 1.57 2008/11/15 21:35:31 abs Exp $ */ +/* $NetBSD: ncr5380.c,v 1.58 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.57 2008/11/15 21:35:31 abs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ncr5380.c,v 1.58 2009/03/14 14:45:56 dsl Exp $"); /* * Bit mask of targets you want debugging to be shown @@ -80,10 +80,10 @@ static volatile int main_running = 0; */ static u_char busy; -static void ncr5380_minphys __P((struct buf *bp)); -static void ncr5380_scsi_request __P((struct scsipi_channel *, - scsipi_adapter_req_t, void *)); -static void ncr5380_show_scsi_cmd __P((struct scsipi_xfer *xs)); +static void ncr5380_minphys(struct buf *bp); +static void ncr5380_scsi_request(struct scsipi_channel *, + scsipi_adapter_req_t, void *); +static void ncr5380_show_scsi_cmd(struct scsipi_xfer *xs); static SC_REQ req_queue[NREQ]; static SC_REQ *free_head = NULL; /* Free request structures */ @@ -169,8 +169,8 @@ extern inline void finish_req(SC_REQ *reqp) /* * Auto config stuff.... */ -void ncr_attach __P((struct device *, struct device *, void *)); -int ncr_match __P((struct device *, struct cfdata *, void *)); +void ncr_attach(struct device *, struct device *, void *); +int ncr_match(struct device *, struct cfdata *, void *); /* * Tricks to make driver-name configurable diff --git a/sys/arch/atari/dev/ncr5380reg.h b/sys/arch/atari/dev/ncr5380reg.h index 17dc8d652b5..7c3c97061fe 100644 --- a/sys/arch/atari/dev/ncr5380reg.h +++ b/sys/arch/atari/dev/ncr5380reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ncr5380reg.h,v 1.19 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: ncr5380reg.h,v 1.20 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -230,38 +230,38 @@ static SC_REQ *connected = NULL; /* Command currently connected */ /* * Function decls: */ -static void ack_message __P((void)); -static int check_autosense __P((SC_REQ *, int)); -static int check_intr __P((struct ncr_softc *)); -static int dma_ready __P((void)); -static void finish_req __P((SC_REQ *)); -static int handle_message __P((SC_REQ *, u_int)); -static int information_transfer __P((struct ncr_softc *)); -static void nack_message __P((SC_REQ *, u_char)); -static void ncr_aprint __P((struct ncr_softc *, const char *, ...)); -static void ncr_ctrl_intr __P((struct ncr_softc *)); -static void ncr_dma_intr __P((struct ncr_softc *)); -static void ncr_tprint __P((SC_REQ *, const char *, ...)); -static int reach_msg_out __P((struct ncr_softc *, u_long)); -static void reselect __P((struct ncr_softc *)); -static void run_main __P((struct ncr_softc *)); -static int scsi_dmaok __P((SC_REQ *)); -static void scsi_main __P((struct ncr_softc *)); -static void scsi_reset_verbose __P((struct ncr_softc *, const char *)); -static int scsi_select __P((SC_REQ *, int)); -static void show_data_sense __P((struct scsipi_xfer *)); -static void show_phase __P((SC_REQ *, int)); -static void show_request __P((SC_REQ *, const char *)); -static void show_signals __P((u_char, u_char)); -static void transfer_dma __P((SC_REQ *, u_int, int)); -static int transfer_pio __P((u_char *, u_char *, u_long *, int)); -static int wait_req_false __P((void)); -static int wait_req_true __P((void)); +static void ack_message(void); +static int check_autosense(SC_REQ *, int); +static int check_intr(struct ncr_softc *); +static int dma_ready(void); +static void finish_req(SC_REQ *); +static int handle_message(SC_REQ *, u_int); +static int information_transfer(struct ncr_softc *); +static void nack_message(SC_REQ *, u_char); +static void ncr_aprint(struct ncr_softc *, const char *, ...); +static void ncr_ctrl_intr(struct ncr_softc *); +static void ncr_dma_intr(struct ncr_softc *); +static void ncr_tprint(SC_REQ *, const char *, ...); +static int reach_msg_out(struct ncr_softc *, u_long); +static void reselect(struct ncr_softc *); +static void run_main(struct ncr_softc *); +static int scsi_dmaok(SC_REQ *); +static void scsi_main(struct ncr_softc *); +static void scsi_reset_verbose(struct ncr_softc *, const char *); +static int scsi_select(SC_REQ *, int); +static void show_data_sense(struct scsipi_xfer *); +static void show_phase(SC_REQ *, int); +static void show_request(SC_REQ *, const char *); +static void show_signals(u_char, u_char); +static void transfer_dma(SC_REQ *, u_int, int); +static int transfer_pio(u_char *, u_char *, u_long *, int); +static int wait_req_false(void); +static int wait_req_true(void); /* * You might want to call these from the debugger... */ - void scsi_show __P((void)); - void scsi_reset __P((void)); + void scsi_show(void); + void scsi_reset(void); #endif /* _NCR5380REG_H */ diff --git a/sys/arch/atari/dev/nvram.c b/sys/arch/atari/dev/nvram.c index 87cea82a870..500c61d6610 100644 --- a/sys/arch/atari/dev/nvram.c +++ b/sys/arch/atari/dev/nvram.c @@ -1,4 +1,4 @@ -/* $NetBSD: nvram.c,v 1.13 2008/06/13 08:50:12 cegger Exp $ */ +/* $NetBSD: nvram.c,v 1.14 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.13 2008/06/13 08:50:12 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.14 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -57,15 +57,15 @@ __KERNEL_RCSID(0, "$NetBSD: nvram.c,v 1.13 2008/06/13 08:50:12 cegger Exp $"); #define MC_NVRAM_CSUM (MC_NVRAM_START + MC_NVRAM_SIZE - 2) #if NNVR > 0 -static void nvram_set_csum __P((u_char csum)); -static int nvram_csum_valid __P((u_char csum)); -static u_char nvram_csum __P((void)); +static void nvram_set_csum(u_char csum); +static int nvram_csum_valid(u_char csum); +static u_char nvram_csum(void); /* * Auto config stuff.... */ -static void nvr_attach __P((struct device *, struct device *, void *)); -static int nvr_match __P((struct device *, struct cfdata *, void *)); +static void nvr_attach(struct device *, struct device *, void *); +static int nvr_match(struct device *, struct cfdata *, void *); CFATTACH_DECL(nvr, sizeof(struct nvr_softc), nvr_match, nvr_attach, NULL, NULL); diff --git a/sys/arch/atari/dev/nvramvar.h b/sys/arch/atari/dev/nvramvar.h index 0c905de4076..947605ef282 100644 --- a/sys/arch/atari/dev/nvramvar.h +++ b/sys/arch/atari/dev/nvramvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: nvramvar.h,v 1.1 1996/01/06 20:11:09 leo Exp $ */ +/* $NetBSD: nvramvar.h,v 1.2 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -48,7 +48,7 @@ struct nvr_softc { /* * Kernel internal interface to read config info from nvram */ -int nvr_get_byte __P((int)); +int nvr_get_byte(int); /* * Error return from nvr_get_byte diff --git a/sys/arch/atari/dev/ser.c b/sys/arch/atari/dev/ser.c index 933ea17ac3d..ed322df50b8 100644 --- a/sys/arch/atari/dev/ser.c +++ b/sys/arch/atari/dev/ser.c @@ -1,4 +1,4 @@ -/* $NetBSD: ser.c,v 1.39 2008/06/11 14:35:53 tsutsui Exp $ */ +/* $NetBSD: ser.c,v 1.40 2009/03/14 14:45:56 dsl Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -93,7 +93,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.39 2008/06/11 14:35:53 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.40 2009/03/14 14:45:56 dsl Exp $"); #include "opt_ddb.h" #include "opt_mbtype.h" @@ -207,41 +207,41 @@ struct ser_softc { */ #define SER_HW_CONSOLE 0x01 -void ser_break __P((struct ser_softc *, int)); -void ser_hwiflow __P((struct ser_softc *, int)); -void ser_iflush __P((struct ser_softc *)); -void ser_loadchannelregs __P((struct ser_softc *)); -void ser_modem __P((struct ser_softc *, int)); -void serdiag __P((void *)); -int serhwiflow __P((struct tty *, int)); -void serinit __P((int)); -void serinitcons __P((int)); -int sermintr __P((void *)); -int sertrintr __P((void *)); -int serparam __P((struct tty *, struct termios *)); -void serstart __P((struct tty *)); +void ser_break(struct ser_softc *, int); +void ser_hwiflow(struct ser_softc *, int); +void ser_iflush(struct ser_softc *); +void ser_loadchannelregs(struct ser_softc *); +void ser_modem(struct ser_softc *, int); +void serdiag(void *); +int serhwiflow(struct tty *, int); +void serinit(int); +void serinitcons(int); +int sermintr(void *); +int sertrintr(void *); +int serparam(struct tty *, struct termios *); +void serstart(struct tty *); struct consdev; -void sercnprobe __P((struct consdev *)); -void sercninit __P((struct consdev *)); -int sercngetc __P((dev_t)); -void sercnputc __P((dev_t, int)); -void sercnpollc __P((dev_t, int)); - -static void sermsrint __P((struct ser_softc *, struct tty*)); -static void serrxint __P((struct ser_softc *, struct tty*)); -static void ser_shutdown __P((struct ser_softc *)); -static int serspeed __P((long)); -static void sersoft __P((void *)); -static void sertxint __P((struct ser_softc *, struct tty*)); +void sercnprobe(struct consdev *); +void sercninit(struct consdev *); +int sercngetc(dev_t); +void sercnputc(dev_t, int); +void sercnpollc(dev_t, int); + +static void sermsrint(struct ser_softc *, struct tty*); +static void serrxint(struct ser_softc *, struct tty*); +static void ser_shutdown(struct ser_softc *); +static int serspeed(long); +static void sersoft(void *); +static void sertxint(struct ser_softc *, struct tty*); static volatile int ser_softintr_scheduled = 0; /* * Autoconfig stuff */ -static void serattach __P((struct device *, struct device *, void *)); -static int sermatch __P((struct device *, struct cfdata *, void *)); +static void serattach(struct device *, struct device *, void *); +static int sermatch(struct device *, struct cfdata *, void *); CFATTACH_DECL(ser, sizeof(struct ser_softc), sermatch, serattach, NULL, NULL); @@ -332,7 +332,7 @@ void *auxp; } #ifdef SER_DEBUG -void serstatus __P((struct ser_softc *, char *)); +void serstatus(struct ser_softc *, char *); void serstatus(sc, str) struct ser_softc *sc; diff --git a/sys/arch/atari/dev/view.c b/sys/arch/atari/dev/view.c index 03ccd3fcb2c..ee6cd014567 100644 --- a/sys/arch/atari/dev/view.c +++ b/sys/arch/atari/dev/view.c @@ -1,4 +1,4 @@ -/* $NetBSD: view.c,v 1.25 2008/03/23 15:50:51 cube Exp $ */ +/* $NetBSD: view.c,v 1.26 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -38,7 +38,7 @@ * a interface to graphics. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.25 2008/03/23 15:50:51 cube Exp $"); +__KERNEL_RCSID(0, "$NetBSD: view.c,v 1.26 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -55,11 +55,11 @@ __KERNEL_RCSID(0, "$NetBSD: view.c,v 1.25 2008/03/23 15:50:51 cube Exp $"); #include <atari/dev/viewvar.h> #include "view.h" -static void view_display __P((struct view_softc *)); -static void view_remove __P((struct view_softc *)); -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 *)); +static void view_display(struct view_softc *); +static void view_remove(struct view_softc *); +static int view_setsize(struct view_softc *, struct view_size *); +static int view_get_colormap(struct view_softc *, colormap_t *); +static int view_set_colormap(struct view_softc *, colormap_t *); struct view_softc views[NVIEW]; static int view_inited; @@ -83,7 +83,7 @@ const struct cdevsw view_cdevsw = { /* * functions for probeing. */ -void viewattach __P((int)); +void viewattach(int); void viewattach(cnt) diff --git a/sys/arch/atari/dev/viewvar.h b/sys/arch/atari/dev/viewvar.h index 9125756b12d..a04e745f87a 100644 --- a/sys/arch/atari/dev/viewvar.h +++ b/sys/arch/atari/dev/viewvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: viewvar.h,v 1.6 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: viewvar.h,v 1.7 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1994 Christian E. Hopps @@ -61,7 +61,7 @@ enum view_unit_flags { }; #ifdef _KERNEL -view_t *viewview __P((dev_t)); -int viewprobe __P((void)); +view_t *viewview(dev_t); +int viewprobe(void); #endif /* _KERNEL */ diff --git a/sys/arch/atari/dev/ym2149reg.h b/sys/arch/atari/dev/ym2149reg.h index e16d66b7675..c3acf3a1f67 100644 --- a/sys/arch/atari/dev/ym2149reg.h +++ b/sys/arch/atari/dev/ym2149reg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ym2149reg.h,v 1.5 2005/12/11 12:16:54 christos Exp $ */ +/* $NetBSD: ym2149reg.h,v 1.6 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. @@ -165,7 +165,7 @@ extern u_char ym2149_ioa; /* Soft-copy of port-A */ /* * Prototypes */ -void ym2149_init __P((void)); +void ym2149_init(void); #endif #endif /* _YM2149REG_H */ diff --git a/sys/arch/atari/dev/zs.c b/sys/arch/atari/dev/zs.c index 54c03277209..cfde6eaf414 100644 --- a/sys/arch/atari/dev/zs.c +++ b/sys/arch/atari/dev/zs.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.58 2009/01/28 19:55:51 tjam Exp $ */ +/* $NetBSD: zs.c,v 1.59 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1992, 1993 @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.58 2009/01/28 19:55:51 tjam Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.59 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -217,8 +217,8 @@ static u_long zs_freqs_generic[] = { static u_long *zs_frequencies; /* Definition of the driver for autoconfig. */ -static int zsmatch __P((struct device *, struct cfdata *, void *)); -static void zsattach __P((struct device *, struct device *, void *)); +static int zsmatch(struct device *, struct cfdata *, void *); +static void zsattach(struct device *, struct device *, void *); CFATTACH_DECL(zs, sizeof(struct zs_softc), zsmatch, zsattach, NULL, NULL); @@ -241,24 +241,24 @@ const struct cdevsw zs_cdevsw = { }; /* Interrupt handlers. */ -int zshard __P((long)); -static int zssoft __P((long)); -static int zsrint __P((struct zs_chanstate *, volatile struct zschan *)); -static int zsxint __P((struct zs_chanstate *, volatile struct zschan *)); -static int zssint __P((struct zs_chanstate *, volatile struct zschan *)); +int zshard(long); +static int zssoft(long); +static int zsrint(struct zs_chanstate *, volatile struct zschan *); +static int zsxint(struct zs_chanstate *, volatile struct zschan *); +static int zssint(struct zs_chanstate *, volatile struct zschan *); static struct zs_chanstate *zslist; /* Routines called from other code. */ -static void zsstart __P((struct tty *)); +static void zsstart(struct tty *); /* Routines purely local to this driver. */ -static void zsoverrun __P((int, long *, const char *)); -static int zsparam __P((struct tty *, struct termios *)); -static int zsbaudrate __P((int, int, int *, int *, int *, int *)); -static int zs_modem __P((struct zs_chanstate *, int, int)); -static void zs_loadchannelregs __P((volatile struct zschan *, u_char *)); -static void zs_shutdown __P((struct zs_chanstate *)); +static void zsoverrun(int, long *, const char *); +static int zsparam(struct tty *, struct termios *); +static int zsbaudrate(int, int, int *, int *, int *, int *); +static int zs_modem(struct zs_chanstate *, int, int); +static void zs_loadchannelregs(volatile struct zschan *, u_char *); +static void zs_shutdown(struct zs_chanstate *); static int zsmatch(pdp, cfp, auxp) diff --git a/sys/arch/atari/isa/isa_dma.c b/sys/arch/atari/isa/isa_dma.c index 5d66227acb1..f8924505609 100644 --- a/sys/arch/atari/isa/isa_dma.c +++ b/sys/arch/atari/isa/isa_dma.c @@ -1,4 +1,4 @@ -/* $NetBSD: isa_dma.c,v 1.7 2008/04/28 20:23:15 martin Exp $ */ +/* $NetBSD: isa_dma.c,v 1.8 2009/03/14 14:45:56 dsl Exp $ */ #define ISA_DMA_STATS @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.7 2008/04/28 20:23:15 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v 1.8 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -90,27 +90,27 @@ struct atari_isa_dma_cookie { #define ID_BUFTYPE_UIO 3 #define ID_BUFTYPE_RAW 4 -int _isa_bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, - bus_size_t, bus_size_t, int, bus_dmamap_t *)); -void _isa_bus_dmamap_destroy __P((bus_dma_tag_t, bus_dmamap_t)); -int _isa_bus_dmamap_load __P((bus_dma_tag_t, bus_dmamap_t, void *, - bus_size_t, struct proc *, int)); -int _isa_bus_dmamap_load_mbuf __P((bus_dma_tag_t, bus_dmamap_t, - struct mbuf *, int)); -int _isa_bus_dmamap_load_uio __P((bus_dma_tag_t, bus_dmamap_t, - struct uio *, int)); -int _isa_bus_dmamap_load_raw __P((bus_dma_tag_t, bus_dmamap_t, - bus_dma_segment_t *, int, bus_size_t, int)); -void _isa_bus_dmamap_unload __P((bus_dma_tag_t, bus_dmamap_t)); -void _isa_bus_dmamap_sync __P((bus_dma_tag_t, bus_dmamap_t, - bus_addr_t, bus_size_t, int)); - -int _isa_bus_dmamem_alloc __P((bus_dma_tag_t, bus_size_t, bus_size_t, - bus_size_t, bus_dma_segment_t *, int, int *, int)); - -int _isa_dma_alloc_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t, - bus_size_t, int)); -void _isa_dma_free_bouncebuf __P((bus_dma_tag_t, bus_dmamap_t)); +int _isa_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, + bus_size_t, bus_size_t, int, bus_dmamap_t *); +void _isa_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t); +int _isa_bus_dmamap_load(bus_dma_tag_t, bus_dmamap_t, void *, + bus_size_t, struct proc *, int); +int _isa_bus_dmamap_load_mbuf(bus_dma_tag_t, bus_dmamap_t, + struct mbuf *, int); +int _isa_bus_dmamap_load_uio(bus_dma_tag_t, bus_dmamap_t, + struct uio *, int); +int _isa_bus_dmamap_load_raw(bus_dma_tag_t, bus_dmamap_t, + bus_dma_segment_t *, int, bus_size_t, int); +void _isa_bus_dmamap_unload(bus_dma_tag_t, bus_dmamap_t); +void _isa_bus_dmamap_sync(bus_dma_tag_t, bus_dmamap_t, + bus_addr_t, bus_size_t, int); + +int _isa_bus_dmamem_alloc(bus_dma_tag_t, bus_size_t, bus_size_t, + bus_size_t, bus_dma_segment_t *, int, int *, int); + +int _isa_dma_alloc_bouncebuf(bus_dma_tag_t, bus_dmamap_t, + bus_size_t, int); +void _isa_dma_free_bouncebuf(bus_dma_tag_t, bus_dmamap_t); /* * Entry points for ISA DMA. These are mostly wrappers around diff --git a/sys/arch/atari/isa/isa_hades.c b/sys/arch/atari/isa/isa_hades.c index b0adf3fc387..1a2e2113270 100644 --- a/sys/arch/atari/isa/isa_hades.c +++ b/sys/arch/atari/isa/isa_hades.c @@ -1,4 +1,4 @@ -/* $NetBSD: isa_hades.c,v 1.5 2008/04/28 20:23:15 martin Exp $ */ +/* $NetBSD: isa_hades.c,v 1.6 2009/03/14 14:45:56 dsl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isa_hades.c,v 1.5 2008/04/28 20:23:15 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa_hades.c,v 1.6 2009/03/14 14:45:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -65,7 +65,7 @@ isa_bus_init() static isa_intr_info_t iinfo[2] = { { -1 }, { -1 } }; -static int iifun __P((int, int)); +static int iifun(int, int); static int iifun(slot, sr) @@ -158,7 +158,7 @@ void * isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg) isa_chipset_tag_t ic; int irq, type, level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; { isa_intr_info_t *iinfo_p; diff --git a/sys/arch/atari/isa/isa_machdep.c b/sys/arch/atari/isa/isa_machdep.c index 67ed0d08f36..fd8d0d0da0c 100644 --- a/sys/arch/atari/isa/isa_machdep.c +++ b/sys/arch/atari/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: isa_machdep.c,v 1.30 2007/01/24 13:08:13 hubertf Exp $ */ +/* $NetBSD: isa_machdep.c,v 1.31 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1997 Leo Weppelman. All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.30 2007/01/24 13:08:13 hubertf Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.31 2009/03/14 14:45:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -67,9 +67,9 @@ struct atari_bus_dma_tag isa_bus_dma_tag = { }; #endif /* NISADMA == 0 */ -static int atariisabusprint __P((void *auxp, const char *)); -static int isabusmatch __P((struct device *, struct cfdata *, void *)); -static void isabusattach __P((struct device *, struct device *, void *)); +static int atariisabusprint(void *auxp, const char *); +static int isabusmatch(struct device *, struct cfdata *, void *); +static void isabusattach(struct device *, struct device *, void *); struct isabus_softc { struct device sc_dev; diff --git a/sys/arch/atari/isa/isa_milan.c b/sys/arch/atari/isa/isa_milan.c index b564de0410b..2343f808ac2 100644 --- a/sys/arch/atari/isa/isa_milan.c +++ b/sys/arch/atari/isa/isa_milan.c @@ -1,4 +1,4 @@ -/* $NetBSD: isa_milan.c,v 1.9 2008/04/28 20:23:15 martin Exp $ */ +/* $NetBSD: isa_milan.c,v 1.10 2009/03/14 14:45:56 dsl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isa_milan.c,v 1.9 2008/04/28 20:23:15 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isa_milan.c,v 1.10 2009/03/14 14:45:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -204,7 +204,7 @@ void * isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg) isa_chipset_tag_t ic; int irq, type, level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; { isa_intr_info_t *iinfo_p; diff --git a/sys/arch/atari/pci/pci_hades.c b/sys/arch/atari/pci/pci_hades.c index 44f2f958363..ad922c5b5fd 100644 --- a/sys/arch/atari/pci/pci_hades.c +++ b/sys/arch/atari/pci/pci_hades.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_hades.c,v 1.8 2008/05/30 19:26:35 ad Exp $ */ +/* $NetBSD: pci_hades.c,v 1.9 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_hades.c,v 1.8 2008/05/30 19:26:35 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_hades.c,v 1.9 2009/03/14 14:45:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -63,7 +63,7 @@ pci_bus_maxdevs(pc, busno) return (4); } -static int pci_config_offset __P((pcitag_t)); +static int pci_config_offset(pcitag_t); /* * Atari_init.c maps the config areas PAGE_SIZE bytes apart.... @@ -108,7 +108,7 @@ pci_conf_write(pc, tag, reg, data) */ static pci_intr_info_t iinfo[4] = { { -1 }, { -1 }, { -1 }, { -1 } }; -static int iifun __P((int, int)); +static int iifun(int, int); static int iifun(slot, sr) @@ -162,7 +162,7 @@ pci_intr_establish(pc, ih, level, ih_fun, ih_arg) pci_chipset_tag_t pc; pci_intr_handle_t ih; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; { pci_intr_info_t *iinfo_p; diff --git a/sys/arch/atari/pci/pci_machdep.c b/sys/arch/atari/pci/pci_machdep.c index 8515b4cb0bf..a5618946e2d 100644 --- a/sys/arch/atari/pci/pci_machdep.c +++ b/sys/arch/atari/pci/pci_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.43 2005/12/11 12:16:59 christos Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.44 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman. All rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.43 2005/12/11 12:16:59 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.44 2009/03/14 14:45:56 dsl Exp $"); #include "opt_mbtype.h" @@ -101,8 +101,8 @@ typedef LIST_HEAD(pci_memreg_head, pci_memreg) PCI_MEMREG; /* * Entry points for PCI DMA. Use only the 'standard' functions. */ -int _bus_dmamap_create __P((bus_dma_tag_t, bus_size_t, int, bus_size_t, - bus_size_t, int, bus_dmamap_t *)); +int _bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t, + bus_size_t, int, bus_dmamap_t *); struct atari_bus_dma_tag pci_bus_dma_tag = { 0, #if defined(_ATARIHW_) @@ -120,14 +120,14 @@ struct atari_bus_dma_tag pci_bus_dma_tag = { _bus_dmamap_sync, }; -int ataripcibusprint __P((void *auxp, const char *)); -int pcibusmatch __P((struct device *, struct cfdata *, void *)); -void pcibusattach __P((struct device *, struct device *, void *)); +int ataripcibusprint(void *auxp, const char *); +int pcibusmatch(struct device *, struct cfdata *, void *); +void pcibusattach(struct device *, struct device *, void *); -static void enable_pci_devices __P((void)); -static void insert_into_list __P((PCI_MEMREG *head, struct pci_memreg *elem)); -static int overlap_pci_areas __P((struct pci_memreg *p, - struct pci_memreg *self, u_int addr, u_int size, u_int what)); +static void enable_pci_devices(void); +static void insert_into_list(PCI_MEMREG *head, struct pci_memreg *elem); +static int overlap_pci_areas(struct pci_memreg *p, + struct pci_memreg *self, u_int addr, u_int size, u_int what); CFATTACH_DECL(pcib, sizeof(struct device), pcibusmatch, pcibusattach, NULL, NULL); diff --git a/sys/arch/atari/pci/pci_milan.c b/sys/arch/atari/pci/pci_milan.c index 18ce61a85e6..f015f65774b 100644 --- a/sys/arch/atari/pci/pci_milan.c +++ b/sys/arch/atari/pci/pci_milan.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_milan.c,v 1.9 2008/05/30 19:26:35 ad Exp $ */ +/* $NetBSD: pci_milan.c,v 1.10 2009/03/14 14:45:56 dsl Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_milan.c,v 1.9 2008/05/30 19:26:35 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_milan.c,v 1.10 2009/03/14 14:45:56 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -111,7 +111,7 @@ pci_intr_establish(pc, ih, level, ih_fun, ih_arg) pci_chipset_tag_t pc; pci_intr_handle_t ih; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun)(void *); void *ih_arg; { if (ih == 0 || ih >= 16 || ih == 2) diff --git a/sys/arch/atari/pci/pciide_machdep.c b/sys/arch/atari/pci/pciide_machdep.c index 4db5b573a0c..bbe5d1a1a8a 100644 --- a/sys/arch/atari/pci/pciide_machdep.c +++ b/sys/arch/atari/pci/pciide_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: pciide_machdep.c,v 1.3 2005/12/11 12:17:00 christos Exp $ */ +/* $NetBSD: pciide_machdep.c,v 1.4 2009/03/14 14:45:56 dsl Exp $ */ /* * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved. @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.3 2005/12/11 12:17:00 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.4 2009/03/14 14:45:56 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg) struct device *dev; struct pci_attach_args *pa; int chan; - int (*func) __P((void *)); + int (*func)(void *); void *arg; { int irq; diff --git a/sys/arch/atari/stand/ahdilabel/privahdi.h b/sys/arch/atari/stand/ahdilabel/privahdi.h index db203cfe439..bcf5c5da01c 100644 --- a/sys/arch/atari/stand/ahdilabel/privahdi.h +++ b/sys/arch/atari/stand/ahdilabel/privahdi.h @@ -1,4 +1,4 @@ -/* $NetBSD: privahdi.h,v 1.2 2008/04/28 20:23:15 martin Exp $ */ +/* $NetBSD: privahdi.h,v 1.3 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -64,24 +64,24 @@ struct ahdi_ptable { struct ptable_part parts[MAXPARTITIONS]; }; -int ahdi_buildlabel __P((struct ahdi_ptable *)); -int ahdi_checklabel __P((struct ahdi_ptable *)); -int ahdi_readlabel __P((struct ahdi_ptable *, char *, int)); -int ahdi_writedisktab __P((struct ahdi_ptable *, char *, char *, char *)); -int ahdi_writelabel __P((struct ahdi_ptable *, char *, int)); +int ahdi_buildlabel(struct ahdi_ptable *); +int ahdi_checklabel(struct ahdi_ptable *); +int ahdi_readlabel(struct ahdi_ptable *, char *, int); +int ahdi_writedisktab(struct ahdi_ptable *, char *, char *, char *); +int ahdi_writelabel(struct ahdi_ptable *, char *, int); extern int ahdi_errp1, ahdi_errp2; /* Internal functions */ -u_int16_t ahdi_cksum __P((void *)); -void assign_letters __P((struct ahdi_ptable *)); -int check_magic __P((int, u_int, int)); -int dkcksum __P((struct disklabel *)); -void *disk_read __P((int, u_int, u_int)); -int disk_write __P((int, u_int, u_int, void *)); -int invalidate_netbsd_label __P((int, u_int32_t)); -int openraw __P((const char *, int)); -struct disklabel *read_dl __P((int)); -int read_rsec __P((int, struct ahdi_ptable *, u_int, - u_int, int)); -int write_bsl __P((int)); +u_int16_t ahdi_cksum(void *); +void assign_letters(struct ahdi_ptable *); +int check_magic(int, u_int, int); +int dkcksum(struct disklabel *); +void *disk_read(int, u_int, u_int); +int disk_write(int, u_int, u_int, void *); +int invalidate_netbsd_label(int, u_int32_t); +int openraw(const char *, int); +struct disklabel *read_dl(int); +int read_rsec(int, struct ahdi_ptable *, u_int, + u_int, int); +int write_bsl(int); diff --git a/sys/arch/atari/stand/bootpref/bootpref.c b/sys/arch/atari/stand/bootpref/bootpref.c index 506d05ab3c8..ec212e13349 100644 --- a/sys/arch/atari/stand/bootpref/bootpref.c +++ b/sys/arch/atari/stand/bootpref/bootpref.c @@ -1,4 +1,4 @@ -/* $NetBSD: bootpref.c,v 1.3 2008/04/28 20:23:15 martin Exp $ */ +/* $NetBSD: bootpref.c,v 1.4 2009/03/14 14:45:57 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -38,27 +38,27 @@ #include <sys/mman.h> #include "bootpref.h" -static void usage __P ((void)); -static int openNVRAM __P ((void)); -static void closeNVRAM __P ((int)); -static u_char readNVRAM __P ((int, int)); -static void writeNVRAM __P ((int, int, u_char)); -static void getNVpref __P ((int, u_char[])); -static void setNVpref __P ((int, u_char[], int, int)); -static void showOS __P ((u_char)); -static void showLang __P ((u_char)); -static void showKbdLang __P ((u_char)); -static void showDateFmt __P ((u_char)); -static void showDateSep __P ((u_char)); -static void showVideo2 __P ((u_char)); -static void showVideo1 __P ((u_char, u_char)); -static int checkOS __P ((u_char *, char *)); -static int checkLang __P ((u_char *, char *)); -static int checkKbdLang __P ((u_char *, char *)); -static int checkInt __P ((u_char *, char *, int, int)); -static int checkDateFmt __P ((u_char *, char *)); -static void checkDateSep __P ((u_char *, char *)); -static int checkColours __P ((u_char *, char *)); +static void usage(void); +static int openNVRAM(void); +static void closeNVRAM(int); +static u_char readNVRAM(int, int); +static void writeNVRAM(int, int, u_char); +static void getNVpref(int, u_char[]); +static void setNVpref(int, u_char[], int, int); +static void showOS(u_char); +static void showLang(u_char); +static void showKbdLang(u_char); +static void showDateFmt(u_char); +static void showDateSep(u_char); +static void showVideo2(u_char); +static void showVideo1(u_char, u_char); +static int checkOS(u_char *, char *); +static int checkLang(u_char *, char *); +static int checkKbdLang(u_char *, char *); +static int checkInt(u_char *, char *, int, int); +static int checkDateFmt(u_char *, char *); +static void checkDateSep(u_char *, char *); +static int checkColours(u_char *, char *); #define SET_OS 0x001 #define SET_LANG 0x002 diff --git a/sys/arch/atari/stand/bootxxx/bootxxx.c b/sys/arch/atari/stand/bootxxx/bootxxx.c index 6f9ec2d8e8f..c1957c72bdc 100644 --- a/sys/arch/atari/stand/bootxxx/bootxxx.c +++ b/sys/arch/atari/stand/bootxxx/bootxxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: bootxxx.c,v 1.4 2009/01/06 13:35:30 tsutsui Exp $ */ +/* $NetBSD: bootxxx.c,v 1.5 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 2001 Leo Weppelman. @@ -44,7 +44,7 @@ #include <tosdefs.h> int bootxxx(void *, void *, osdsc_t *); -void boot_BSD __P((struct kparamb *)__attribute__((noreturn))); +void boot_BSD(struct kparamb *)__attribute__((noreturn)); int bootxxx(readsector, disklabel, od) @@ -61,7 +61,7 @@ bootxxx(readsector, disklabel, od) /* XXX: Limit should be 16MB */ setheap(end, (void*)0x1000000); printf("\033v\nNetBSD/Atari tertiary bootloader " - "($Revision: 1.4 $)\n\n"); + "($Revision: 1.5 $)\n\n"); if (init_dskio(readsector, disklabel, od->rootfs)) return(-1); diff --git a/sys/arch/atari/stand/edahdi/edahdi.c b/sys/arch/atari/stand/edahdi/edahdi.c index ca84d545ade..5c9d8944d5a 100644 --- a/sys/arch/atari/stand/edahdi/edahdi.c +++ b/sys/arch/atari/stand/edahdi/edahdi.c @@ -1,4 +1,4 @@ -/* $NetBSD: edahdi.c,v 1.5 2005/12/11 12:17:00 christos Exp $ */ +/* $NetBSD: edahdi.c,v 1.6 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 1996 Leo Weppelman, Waldi Ravens. @@ -99,18 +99,18 @@ typedef struct { */ char *Clr_screen = ""; -void ahdi_cksum __P((void *)); -u_int ahdi_getparts __P((int, ptable_t *, u_int, u_int)); -int bsd_label __P((int, u_int)); -int dkcksum __P((struct disklabel *)); -int edit_parts __P((int, ptable_t *)); -void *disk_read __P((int, u_int, u_int)); -void disk_write __P((int, u_int, u_int, void *)); -char *get_id __P((void)); -void get_termcap __P((void)); -int lex __P((int *)); -int show_parts __P((ptable_t *, int)); -void update_disk __P((ptable_t *, int, int)); +void ahdi_cksum(void *); +u_int ahdi_getparts(int, ptable_t *, u_int, u_int); +int bsd_label(int, u_int); +int dkcksum(struct disklabel *); +int edit_parts(int, ptable_t *); +void *disk_read(int, u_int, u_int); +void disk_write(int, u_int, u_int, void *); +char *get_id(void); +void get_termcap(void); +int lex(int *); +int show_parts(ptable_t *, int); +void update_disk(ptable_t *, int, int); int main(argc, argv) diff --git a/sys/arch/atari/stand/installboot/disklabel.c b/sys/arch/atari/stand/installboot/disklabel.c index 46b2127e567..895032b2fb0 100644 --- a/sys/arch/atari/stand/installboot/disklabel.c +++ b/sys/arch/atari/stand/installboot/disklabel.c @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.c,v 1.3 2009/01/06 13:35:30 tsutsui Exp $ */ +/* $NetBSD: disklabel.c,v 1.4 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 1995 Waldi Ravens @@ -56,12 +56,12 @@ struct ahdilabel { struct ahdi_part *parts; }; -u_int dkcksum __P((struct disklabel *)); -u_int32_t readdisklabel __P((char *, struct disklabel *)); +u_int dkcksum(struct disklabel *); +u_int32_t readdisklabel(char *, struct disklabel *); -static int bsd_label __P((int, off_t, struct disklabel *)); -static int ahdi_label __P((int, u_int32_t *, struct disklabel *)); -static int ahdi_getparts __P((int, daddr_t, daddr_t, struct ahdilabel *)); +static int bsd_label(int, off_t, struct disklabel *); +static int ahdi_label(int, u_int32_t *, struct disklabel *); +static int ahdi_getparts(int, daddr_t, daddr_t, struct ahdilabel *); u_int dkcksum (dl) diff --git a/sys/arch/atari/stand/installboot/installboot.c b/sys/arch/atari/stand/installboot/installboot.c index 276b2e51ac8..c1174aceab6 100644 --- a/sys/arch/atari/stand/installboot/installboot.c +++ b/sys/arch/atari/stand/installboot/installboot.c @@ -1,4 +1,4 @@ -/* $NetBSD: installboot.c,v 1.22 2009/01/06 13:35:30 tsutsui Exp $ */ +/* $NetBSD: installboot.c,v 1.23 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 1995 Waldi Ravens @@ -53,18 +53,18 @@ #include "installboot.h" -static void usage __P((void)); -static void oscheck __P((void)); -static u_int abcksum __P((void *)); -static void setNVpref __P((void)); -static void setIDEpar __P((u_int8_t *, size_t)); -static void mkahdiboot __P((struct ahdi_root *, char *, - char *, u_int32_t)); -static void mkbootblock __P((struct bootblock *, char *, - char *, struct disklabel *, u_int)); -static void install_fd __P((char *, struct disklabel *)); -static void install_sd __P((char *, struct disklabel *)); -static void install_wd __P((char *, struct disklabel *)); +static void usage(void); +static void oscheck(void); +static u_int abcksum(void *); +static void setNVpref(void); +static void setIDEpar(u_int8_t *, size_t); +static void mkahdiboot(struct ahdi_root *, char *, + char *, u_int32_t); +static void mkbootblock(struct bootblock *, char *, + char *, struct disklabel *, u_int); +static void install_fd(char *, struct disklabel *); +static void install_sd(char *, struct disklabel *); +static void install_wd(char *, struct disklabel *); static struct bootblock bootarea; static struct ahdi_root ahdiboot; diff --git a/sys/arch/atari/stand/installboot/installboot.h b/sys/arch/atari/stand/installboot/installboot.h index 7fe4f6fd1b3..3ecb9786de6 100644 --- a/sys/arch/atari/stand/installboot/installboot.h +++ b/sys/arch/atari/stand/installboot/installboot.h @@ -1,4 +1,4 @@ -/* $NetBSD: installboot.h,v 1.9 2009/01/06 13:35:30 tsutsui Exp $ */ +/* $NetBSD: installboot.h,v 1.10 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 1995 Waldi Ravens @@ -45,5 +45,5 @@ */ #define BOOTVERSION 0x03 -u_int dkcksum __P((struct disklabel *)); -u_int32_t readdisklabel __P((char *, struct disklabel *)); +u_int dkcksum(struct disklabel *); +u_int32_t readdisklabel(char *, struct disklabel *); diff --git a/sys/arch/atari/stand/libsa/atari_stand.h b/sys/arch/atari/stand/libsa/atari_stand.h index a545d834636..833bab18d57 100644 --- a/sys/arch/atari/stand/libsa/atari_stand.h +++ b/sys/arch/atari/stand/libsa/atari_stand.h @@ -1,4 +1,4 @@ -/* $NetBSD: atari_stand.h,v 1.1 1997/06/28 21:36:44 leo Exp $ */ +/* $NetBSD: atari_stand.h,v 1.2 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 1997 Leo Weppelman. @@ -31,4 +31,4 @@ */ /* NetBSD/Atari specific functions */ -int init_dskio __P((void *, void *, int)); +int init_dskio(void *, void *, int); diff --git a/sys/arch/atari/stand/libsa/diskio.c b/sys/arch/atari/stand/libsa/diskio.c index 0623641b804..c2305305617 100644 --- a/sys/arch/atari/stand/libsa/diskio.c +++ b/sys/arch/atari/stand/libsa/diskio.c @@ -1,4 +1,4 @@ -/* $NetBSD: diskio.c,v 1.5 2006/08/04 01:50:30 mhitch Exp $ */ +/* $NetBSD: diskio.c,v 1.6 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 1995 Waldi Ravens. @@ -34,13 +34,13 @@ #include "atari_stand.h" #include <sys/disklabel.h> -typedef int (*rdsec_f)__P((void *buffer, u_int offset, u_int count)); +typedef int (*rdsec_f)(void *buffer, u_int offset, u_int count); typedef struct { rdsec_f rds; u_int rst; u_int rend; } bdevd_t; -static int rootstrategy __P((void *, int, daddr_t, size_t, void *, size_t *)); -static int rootopen __P((struct open_file *, ...)); -static int rootclose __P((struct open_file *)); -static int rootioctl __P((struct open_file *, u_long, void *)); +static int rootstrategy(void *, int, daddr_t, size_t, void *, size_t *); +static int rootopen(struct open_file *, ...); +static int rootclose(struct open_file *); +static int rootioctl(struct open_file *, u_long, void *); struct devsw devsw[] = { { "root", rootstrategy, rootopen, rootclose, rootioctl } diff --git a/sys/arch/atari/stand/loadkmap/loadkmap.c b/sys/arch/atari/stand/loadkmap/loadkmap.c index ac6186273a7..9bb224b9342 100644 --- a/sys/arch/atari/stand/loadkmap/loadkmap.c +++ b/sys/arch/atari/stand/loadkmap/loadkmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: loadkmap.c,v 1.4 2006/08/04 01:51:31 mhitch Exp $ */ +/* $NetBSD: loadkmap.c,v 1.5 2009/03/14 14:45:57 dsl Exp $ */ #include <sys/types.h> #include <sys/stat.h> @@ -9,7 +9,7 @@ #include <stdlib.h> -int load_kmap __P((const char *, int)); +int load_kmap(const char *, int); int dump_kmap(); int diff --git a/sys/arch/atari/stand/tostools/libtos/cread.c b/sys/arch/atari/stand/tostools/libtos/cread.c index 940668d4ef8..4f77596a878 100644 --- a/sys/arch/atari/stand/tostools/libtos/cread.c +++ b/sys/arch/atari/stand/tostools/libtos/cread.c @@ -1,4 +1,4 @@ -/* $NetBSD: cread.c,v 1.4 2005/12/11 12:17:00 christos Exp $ */ +/* $NetBSD: cread.c,v 1.5 2009/03/14 14:45:57 dsl Exp $ */ /* * Copyright (c) 1996 @@ -83,14 +83,14 @@ static struct sd { int compressed; /* 1 if input file is a .gz file */ } *ss[SOPEN_MAX]; -static int get_byte __P((struct sd *)); -static unsigned long getLong __P((struct sd *)); -static void check_header __P((struct sd *)); +static int get_byte(struct sd *); +static unsigned long getLong(struct sd *); +static void check_header(struct sd *); /* XXX - find suitable headerf ile for these: */ -void *zcalloc __P((void *, unsigned int, unsigned int)); -void zcfree __P((void *, void *)); -void zmemcpy __P((unsigned char *, unsigned char *, unsigned int)); +void *zcalloc(void *, unsigned int, unsigned int); +void zcfree(void *, void *); +void zmemcpy(unsigned char *, unsigned char *, unsigned int); /* diff --git a/sys/arch/atari/vme/et4000.c b/sys/arch/atari/vme/et4000.c index b90d0f4f59a..4ec03dfdc81 100644 --- a/sys/arch/atari/vme/et4000.c +++ b/sys/arch/atari/vme/et4000.c @@ -1,4 +1,4 @@ -/* $NetBSD: et4000.c,v 1.15 2008/06/11 14:35:53 tsutsui Exp $ */ +/* $NetBSD: et4000.c,v 1.16 2009/03/14 14:45:57 dsl Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.15 2008/06/11 14:35:53 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.16 2009/03/14 14:45:57 dsl Exp $"); #include <sys/param.h> #include <sys/ioctl.h> @@ -76,18 +76,18 @@ __KERNEL_RCSID(0, "$NetBSD: et4000.c,v 1.15 2008/06/11 14:35:53 tsutsui Exp $"); #define VGA_MAPPABLE (128 * 1024) /* 0x20000 */ #define VGA_BASE 0xa0000 -static int et_vme_match __P((struct device *, struct cfdata *, void *)); -static void et_vme_attach __P((struct device *, struct device *, void *)); -static int et_probe_addresses __P((struct vme_attach_args *)); -static void et_start __P((bus_space_tag_t *, bus_space_handle_t *, int *, - u_char *)); -static void et_stop __P((bus_space_tag_t *, bus_space_handle_t *, int *, - u_char *)); -static int et_detect __P((bus_space_tag_t *, bus_space_tag_t *, - bus_space_handle_t *, bus_space_handle_t *, u_int)); - -int eton __P((dev_t)); -int etoff __P((dev_t)); +static int et_vme_match(struct device *, struct cfdata *, void *); +static void et_vme_attach(struct device *, struct device *, void *); +static int et_probe_addresses(struct vme_attach_args *); +static void et_start(bus_space_tag_t *, bus_space_handle_t *, int *, + u_char *); +static void et_stop(bus_space_tag_t *, bus_space_handle_t *, int *, + u_char *); +static int et_detect(bus_space_tag_t *, bus_space_tag_t *, + bus_space_handle_t *, bus_space_handle_t *, u_int); + +int eton(dev_t); +int etoff(dev_t); /* Register and screen memory addresses for ET4000 based VME cards */ static struct et_addresses { diff --git a/sys/arch/atari/vme/leo.c b/sys/arch/atari/vme/leo.c index 42fa5e7b9d4..d6448b5de61 100644 --- a/sys/arch/atari/vme/leo.c +++ b/sys/arch/atari/vme/leo.c @@ -1,4 +1,4 @@ -/* $NetBSD: leo.c,v 1.13 2008/06/13 08:50:12 cegger Exp $ */ +/* $NetBSD: leo.c,v 1.14 2009/03/14 14:45:57 dsl Exp $ */ /*- * Copyright (c) 1997 maximum entropy <entropy@zippy.bernstein.com> @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.13 2008/06/13 08:50:12 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.14 2009/03/14 14:45:57 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -88,13 +88,13 @@ struct leo_softc { #define LEO_SC_FLAGS_INUSE 1 -static int leo_match __P((struct device *, struct cfdata *, void *)); -static void leo_attach __P((struct device *, struct device *, void *)); -static int leo_probe __P((bus_space_tag_t *, bus_space_tag_t *, +static int leo_match(struct device *, struct cfdata *, void *); +static void leo_attach(struct device *, struct device *, void *); +static int leo_probe(bus_space_tag_t *, bus_space_tag_t *, bus_space_handle_t *, bus_space_handle_t *, - u_int, u_int)); -static int leo_init __P((struct leo_softc *, int)); -static int leo_scroll __P((struct leo_softc *, int)); + u_int, u_int); +static int leo_init(struct leo_softc *, int); +static int leo_scroll(struct leo_softc *, int); CFATTACH_DECL(leo, sizeof(struct leo_softc), leo_match, leo_attach, NULL, NULL); diff --git a/sys/arch/atari/vme/vme.c b/sys/arch/atari/vme/vme.c index d3a5360a9c4..4e857c379ad 100644 --- a/sys/arch/atari/vme/vme.c +++ b/sys/arch/atari/vme/vme.c @@ -1,4 +1,4 @@ -/* $NetBSD: vme.c,v 1.13 2008/04/28 20:23:15 martin Exp $ */ +/* $NetBSD: vme.c,v 1.14 2009/03/14 14:45:57 dsl Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.13 2008/04/28 20:23:15 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.14 2009/03/14 14:45:57 dsl Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -40,15 +40,15 @@ __KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.13 2008/04/28 20:23:15 martin Exp $"); #include <atari/vme/vmevar.h> -int vmematch __P((struct device *, struct cfdata *, void *)); -void vmeattach __P((struct device *, struct device *, void *)); -int vmeprint __P((void *, const char *)); +int vmematch(struct device *, struct cfdata *, void *); +void vmeattach(struct device *, struct device *, void *); +int vmeprint(void *, const char *); CFATTACH_DECL(vme, sizeof(struct vme_softc), vmematch, vmeattach, NULL, NULL); -int vmesearch __P((struct device *, struct cfdata *, - const int *, void *)); +int vmesearch(struct device *, struct cfdata *, + const int *, void *); int vmematch(parent, cf, aux) diff --git a/sys/arch/atari/vme/vme_machdep.c b/sys/arch/atari/vme/vme_machdep.c index ffb4bb348a4..6c5d37e2870 100644 --- a/sys/arch/atari/vme/vme_machdep.c +++ b/sys/arch/atari/vme/vme_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vme_machdep.c,v 1.15 2008/04/28 20:23:15 martin Exp $ */ +/* $NetBSD: vme_machdep.c,v 1.16 2009/03/14 14:45:57 dsl Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.15 2008/04/28 20:23:15 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.16 2009/03/14 14:45:57 dsl Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -46,9 +46,9 @@ __KERNEL_RCSID(0, "$NetBSD: vme_machdep.c,v 1.15 2008/04/28 20:23:15 martin Exp #include <atari/atari/device.h> #include <atari/vme/vmevar.h> -static int vmebusprint __P((void *auxp, const char *)); -static int vmebusmatch __P((struct device *, struct cfdata *, void *)); -static void vmebusattach __P((struct device *, struct device *, void *)); +static int vmebusprint(void *auxp, const char *); +static int vmebusmatch(struct device *, struct cfdata *, void *); +static void vmebusattach(struct device *, struct device *, void *); CFATTACH_DECL(avmebus, sizeof(struct device), vmebusmatch, vmebusattach, NULL, NULL); |
