diff options
Diffstat (limited to 'sys/arch/arm/footbridge')
-rw-r--r-- | sys/arch/arm/footbridge/footbridge.c | 14 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/footbridge.h | 16 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/footbridge_clock.c | 12 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/footbridge_com.c | 30 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/footbridge_irqhandler.c | 4 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/footbridge_pci.c | 30 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/isa/dsrtc.c | 20 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/isa/isa_machdep.c | 14 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/isa/sysbeep_isa.c | 8 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/todclock.c | 8 | ||||
-rw-r--r-- | sys/arch/arm/footbridge/todclockvar.h | 6 |
11 files changed, 81 insertions, 81 deletions
diff --git a/sys/arch/arm/footbridge/footbridge.c b/sys/arch/arm/footbridge/footbridge.c index b150a42f171..38a1197cffa 100644 --- a/sys/arch/arm/footbridge/footbridge.c +++ b/sys/arch/arm/footbridge/footbridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: footbridge.c,v 1.2 2004/02/23 05:23:17 drahn Exp $ */ +/* $OpenBSD: footbridge.c,v 1.3 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: footbridge.c,v 1.7 2002/05/16 01:01:33 thorpej Exp $ */ /* @@ -65,12 +65,12 @@ /* Declare prototypes */ -static int footbridge_match __P((struct device *parent, void *cf, - void *aux)); -static void footbridge_attach __P((struct device *parent, struct device *self, - void *aux)); -static int footbridge_print __P((void *aux, const char *pnp)); -static int footbridge_intr __P((void *arg)); +static int footbridge_match (struct device *parent, void *cf, + void *aux); +static void footbridge_attach (struct device *parent, struct device *self, + void *aux); +static int footbridge_print (void *aux, const char *pnp); +static int footbridge_intr (void *arg); /* Driver and attach structures */ struct cfattach footbridge_ca = { diff --git a/sys/arch/arm/footbridge/footbridge.h b/sys/arch/arm/footbridge/footbridge.h index 3da3c6af1a4..bb833e1ff84 100644 --- a/sys/arch/arm/footbridge/footbridge.h +++ b/sys/arch/arm/footbridge/footbridge.h @@ -1,4 +1,4 @@ -/* $OpenBSD: footbridge.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $OpenBSD: footbridge.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: footbridge.h,v 1.2 2002/05/04 10:04:42 chris Exp $ */ #ifndef _FOOTBRIDGE_H_ @@ -6,12 +6,12 @@ #include <sys/termios.h> #include <arm/bus.h> -void footbridge_pci_bs_tag_init __P((void)); -void footbridge_sa110_cc_setup __P((void)); -void footbridge_create_io_bs_tag __P((struct bus_space *, void *)); -void footbridge_create_mem_bs_tag __P((struct bus_space *, void *)); -int fcomcnattach __P((u_int, int, tcflag_t)); -int fcomcndetach __P((void)); -void calibrate_delay __P((void)); +void footbridge_pci_bs_tag_init (void); +void footbridge_sa110_cc_setup (void); +void footbridge_create_io_bs_tag (struct bus_space *, void *); +void footbridge_create_mem_bs_tag (struct bus_space *, void *); +int fcomcnattach (u_int, int, tcflag_t); +int fcomcndetach (void); +void calibrate_delay (void); #endif diff --git a/sys/arch/arm/footbridge/footbridge_clock.c b/sys/arch/arm/footbridge/footbridge_clock.c index 43596f03384..e2fd75b197c 100644 --- a/sys/arch/arm/footbridge/footbridge_clock.c +++ b/sys/arch/arm/footbridge/footbridge_clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: footbridge_clock.c,v 1.2 2004/02/14 00:17:06 drahn Exp $ */ +/* $OpenBSD: footbridge_clock.c,v 1.3 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: footbridge_clock.c,v 1.17 2003/03/23 14:12:25 chris Exp $ */ /* @@ -57,9 +57,9 @@ extern struct footbridge_softc *clock_sc; extern u_int dc21285_fclk; -int clockhandler __P((void *)); -int statclockhandler __P((void *)); -static int load_timer __P((int, int)); +int clockhandler (void *); +int statclockhandler (void *); +static int load_timer (int, int); /* * Statistics clock variance, in usec. Variance must be a @@ -75,8 +75,8 @@ int statcountperusec; /* number of ticks per usec at current stathz */ int statprev; /* last value of we set statclock to */ #if 0 -static int clockmatch __P((struct device *parent, struct cfdata *cf, void *aux)); -static void clockattach __P((struct device *parent, struct device *self, void *aux)); +static int clockmatch (struct device *parent, struct cfdata *cf, void *aux); +static void clockattach (struct device *parent, struct device *self, void *aux); CFATTACH_DECL(footbridge_clock, sizeof(struct clock_softc), clockmatch, clockattach, NULL, NULL); diff --git a/sys/arch/arm/footbridge/footbridge_com.c b/sys/arch/arm/footbridge/footbridge_com.c index d4c1ceadf96..79e9889131e 100644 --- a/sys/arch/arm/footbridge/footbridge_com.c +++ b/sys/arch/arm/footbridge/footbridge_com.c @@ -1,4 +1,4 @@ -/* $OpenBSD: footbridge_com.c,v 1.2 2004/02/11 06:42:39 miod Exp $ */ +/* $OpenBSD: footbridge_com.c,v 1.3 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: footbridge_com.c,v 1.13 2003/03/23 14:12:25 chris Exp $ */ /*- @@ -96,19 +96,19 @@ struct fcom_softc { #define RX_BUFFER_SIZE 0x100 -static int fcom_probe __P((struct device *, void*, void *)); -static void fcom_attach __P((struct device *, struct device *, void *)); -static void fcom_softintr __P((void *)); +static int fcom_probe (struct device *, void*, void *); +static void fcom_attach (struct device *, struct device *, void *); +static void fcom_softintr (void *); -static int fcom_rxintr __P((void *)); -/*static int fcom_txintr __P((void *));*/ +static int fcom_rxintr (void *); +/*static int fcom_txintr (void *);*/ /*struct consdev;*/ -/*void fcomcnprobe __P((struct consdev *)); -void fcomcninit __P((struct consdev *));*/ -int fcomcngetc __P((dev_t)); -void fcomcnputc __P((dev_t, int)); -void fcomcnpollc __P((dev_t, int)); +/*void fcomcnprobe (struct consdev *); +void fcomcninit (struct consdev *);*/ +int fcomcngetc (dev_t); +void fcomcnputc (dev_t, int); +void fcomcnpollc (dev_t, int); struct cfattach fcom_ca = { sizeof (struct fcom_softc), fcom_probe, fcom_attach @@ -139,8 +139,8 @@ const struct cdevsw fcom_cdevsw = { }; #endif -void fcominit __P((bus_space_tag_t, bus_space_handle_t, int, int)); -void fcominitcons __P((bus_space_tag_t, bus_space_handle_t)); +void fcominit (bus_space_tag_t, bus_space_handle_t, int, int); +void fcominitcons (bus_space_tag_t, bus_space_handle_t); bus_space_tag_t fcomconstag; bus_space_handle_t fcomconsioh; @@ -227,8 +227,8 @@ fcom_attach(parent, self, aux) sc->sc_dev.dv_xname); } -static void fcomstart __P((struct tty *)); -static int fcomparam __P((struct tty *, struct termios *)); +static void fcomstart (struct tty *); +static int fcomparam (struct tty *, struct termios *); int fcomopen(dev, flag, mode, p) diff --git a/sys/arch/arm/footbridge/footbridge_irqhandler.c b/sys/arch/arm/footbridge/footbridge_irqhandler.c index b3c1cf57341..648e4348f30 100644 --- a/sys/arch/arm/footbridge/footbridge_irqhandler.c +++ b/sys/arch/arm/footbridge/footbridge_irqhandler.c @@ -1,4 +1,4 @@ -/* $OpenBSD: footbridge_irqhandler.c,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $OpenBSD: footbridge_irqhandler.c,v 1.2 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: footbridge_irqhandler.c,v 1.9 2003/06/16 20:00:57 thorpej Exp $ */ /* @@ -76,7 +76,7 @@ __volatile int footbridge_ipending; void footbridge_intr_dispatch(struct clockframe *frame); -const struct evcnt *footbridge_pci_intr_evcnt __P((void *, pci_intr_handle_t)); +const struct evcnt *footbridge_pci_intr_evcnt (void *, pci_intr_handle_t); void footbridge_do_pending(void); diff --git a/sys/arch/arm/footbridge/footbridge_pci.c b/sys/arch/arm/footbridge/footbridge_pci.c index ed06a2a6686..ab60704e0ff 100644 --- a/sys/arch/arm/footbridge/footbridge_pci.c +++ b/sys/arch/arm/footbridge/footbridge_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: footbridge_pci.c,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $OpenBSD: footbridge_pci.c,v 1.2 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: footbridge_pci.c,v 1.4 2001/09/05 16:17:35 matt Exp $ */ /* @@ -56,19 +56,19 @@ #include <dev/isa/isavar.h> #endif -void footbridge_pci_attach_hook __P((struct device *, - struct device *, struct pcibus_attach_args *)); -int footbridge_pci_bus_maxdevs __P((void *, int)); -pcitag_t footbridge_pci_make_tag __P((void *, int, int, int)); -void footbridge_pci_decompose_tag __P((void *, pcitag_t, int *, - int *, int *)); -pcireg_t footbridge_pci_conf_read __P((void *, pcitag_t, int)); -void footbridge_pci_conf_write __P((void *, pcitag_t, int, - pcireg_t)); -int footbridge_pci_intr_map __P((struct pci_attach_args *, - pci_intr_handle_t *)); -const char *footbridge_pci_intr_string __P((void *, pci_intr_handle_t)); -const struct evcnt *footbridge_pci_intr_evcnt __P((void *, pci_intr_handle_t)); +void footbridge_pci_attach_hook (struct device *, + struct device *, struct pcibus_attach_args *); +int footbridge_pci_bus_maxdevs (void *, int); +pcitag_t footbridge_pci_make_tag (void *, int, int, int); +void footbridge_pci_decompose_tag (void *, pcitag_t, int *, + int *, int *); +pcireg_t footbridge_pci_conf_read (void *, pcitag_t, int); +void footbridge_pci_conf_write (void *, pcitag_t, int, + pcireg_t); +int footbridge_pci_intr_map (struct pci_attach_args *, + pci_intr_handle_t *); +const char *footbridge_pci_intr_string (void *, pci_intr_handle_t); +const struct evcnt *footbridge_pci_intr_evcnt (void *, pci_intr_handle_t); void *footbridge_pci_intr_establish (void *, pci_intr_handle_t, int, int (*)(void *), void *, char *); void footbridge_pci_intr_disestablish (void *, void *); @@ -369,7 +369,7 @@ void * footbridge_pci_intr_establish(pcv, ih, level, func, arg, name) void *pcv; pci_intr_handle_t ih; - int level, (*func) __P((void *)); + int level, (*func) (void *); void *arg; char *name; { diff --git a/sys/arch/arm/footbridge/isa/dsrtc.c b/sys/arch/arm/footbridge/isa/dsrtc.c index b909ed406e1..abd0b068209 100644 --- a/sys/arch/arm/footbridge/isa/dsrtc.c +++ b/sys/arch/arm/footbridge/isa/dsrtc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsrtc.c,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $OpenBSD: dsrtc.c,v 1.2 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: dsrtc.c,v 1.5 2003/03/23 14:12:26 chris Exp $ */ /* @@ -58,15 +58,15 @@ struct dsrtc_softc { bus_space_handle_t sc_ioh; }; -void dsrtcattach __P((struct device *parent, struct device *self, void *aux)); -int dsrtcmatch __P((struct device *parent, void *cf, void *aux)); -int ds1687_read __P((struct dsrtc_softc *sc, int addr)); -void ds1687_write __P((struct dsrtc_softc *sc, int addr, int data)); -int ds1687_ram_read __P((struct dsrtc_softc *sc, int addr)); -void ds1687_ram_write __P((struct dsrtc_softc *sc, int addr, int data)); -static void ds1687_bank_select __P((struct dsrtc_softc *, int)); -static int dsrtc_write __P((void *, rtc_t *)); -static int dsrtc_read __P((void *, rtc_t *)); +void dsrtcattach (struct device *parent, struct device *self, void *aux); +int dsrtcmatch (struct device *parent, void *cf, void *aux); +int ds1687_read (struct dsrtc_softc *sc, int addr); +void ds1687_write (struct dsrtc_softc *sc, int addr, int data); +int ds1687_ram_read (struct dsrtc_softc *sc, int addr); +void ds1687_ram_write (struct dsrtc_softc *sc, int addr, int data); +static void ds1687_bank_select (struct dsrtc_softc *, int); +static int dsrtc_write (void *, rtc_t *); +static int dsrtc_read (void *, rtc_t *); int ds1687_read(sc, addr) diff --git a/sys/arch/arm/footbridge/isa/isa_machdep.c b/sys/arch/arm/footbridge/isa/isa_machdep.c index 8927d26ddd6..8b74eca7e45 100644 --- a/sys/arch/arm/footbridge/isa/isa_machdep.c +++ b/sys/arch/arm/footbridge/isa/isa_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.c,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $OpenBSD: isa_machdep.c,v 1.2 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: isa_machdep.c,v 1.4 2003/06/16 20:00:57 thorpej Exp $ */ /*- @@ -101,15 +101,15 @@ #include "isadma.h" /* prototypes */ -static void isa_icu_init __P((void)); +static void isa_icu_init (void); struct arm32_isa_chipset isa_chipset_tag; -void isa_strayintr __P((int)); -void intr_calculatemasks __P((void)); -int fakeintr __P((void *)); +void isa_strayintr (int); +void intr_calculatemasks (void); +int fakeintr (void *); -int isa_irqdispatch __P((void *arg)); +int isa_irqdispatch (void *arg); u_int imask[NIPL]; unsigned imen; @@ -383,7 +383,7 @@ isa_intr_establish(ic, irq, type, level, ih_fun, ih_arg, name) int irq; int type; int level; - int (*ih_fun) __P((void *)); + int (*ih_fun) (void *); void *ih_arg; char *name; { diff --git a/sys/arch/arm/footbridge/isa/sysbeep_isa.c b/sys/arch/arm/footbridge/isa/sysbeep_isa.c index 71032afebf5..2919c5cb34d 100644 --- a/sys/arch/arm/footbridge/isa/sysbeep_isa.c +++ b/sys/arch/arm/footbridge/isa/sysbeep_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sysbeep_isa.c,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $OpenBSD: sysbeep_isa.c,v 1.2 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: sysbeep_isa.c,v 1.4 2002/10/02 15:45:10 thorpej Exp $ */ /*- @@ -45,9 +45,9 @@ #include <dev/isa/pcppivar.h> /* Prototypes */ -int sysbeep_isa_match __P((struct device *parent, void *cf, void *aux)); -void sysbeep_isa_attach __P((struct device *parent, struct device *self, void *aux)); -void sysbeep_isa __P((int pitch, int period)); +int sysbeep_isa_match (struct device *parent, void *cf, void *aux); +void sysbeep_isa_attach (struct device *parent, struct device *self, void *aux); +void sysbeep_isa (int pitch, int period); /* device attach structure */ struct cfattach sysbeep_isa_ca = { diff --git a/sys/arch/arm/footbridge/todclock.c b/sys/arch/arm/footbridge/todclock.c index 6e5d0efdb2f..03579157515 100644 --- a/sys/arch/arm/footbridge/todclock.c +++ b/sys/arch/arm/footbridge/todclock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: todclock.c,v 1.2 2004/02/15 17:25:01 drahn Exp $ */ +/* $OpenBSD: todclock.c,v 1.3 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: todclock.c,v 1.4 2002/10/02 05:02:30 thorpej Exp $ */ /* @@ -62,7 +62,7 @@ #error "Can only had 1 todclock device" #endif -static int yeartoday __P((int)); +static int yeartoday (int); /* * softc structure for the todclock device @@ -71,8 +71,8 @@ static int yeartoday __P((int)); struct todclock_softc { struct device sc_dev; /* device node */ void *sc_rtc_arg; /* arg to read/write */ - int (*sc_rtc_write) __P((void *, rtc_t *)); /* rtc write function */ - int (*sc_rtc_read) __P((void *, rtc_t *)); /* rtc read function */ + int (*sc_rtc_write) (void *, rtc_t *); /* rtc write function */ + int (*sc_rtc_read) (void *, rtc_t *); /* rtc read function */ }; /* prototypes for functions */ diff --git a/sys/arch/arm/footbridge/todclockvar.h b/sys/arch/arm/footbridge/todclockvar.h index 58d296d0fa6..70c973621fd 100644 --- a/sys/arch/arm/footbridge/todclockvar.h +++ b/sys/arch/arm/footbridge/todclockvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: todclockvar.h,v 1.1 2004/02/01 05:09:49 drahn Exp $ */ +/* $OpenBSD: todclockvar.h,v 1.2 2004/05/19 03:17:07 drahn Exp $ */ /* $NetBSD: todclockvar.h,v 1.1 2002/02/10 12:26:00 chris Exp $ */ /* @@ -47,8 +47,8 @@ struct todclock_attach_args { const char *ta_name; /* device name */ void *ta_rtc_arg; /* arg to read/write */ - int (*ta_rtc_write) __P((void *, rtc_t *)); /* function to write rtc */ - int (*ta_rtc_read) __P((void *, rtc_t *)); /* function to read rtc */ + int (*ta_rtc_write) (void *, rtc_t *); /* function to write rtc */ + int (*ta_rtc_read) (void *, rtc_t *); /* function to read rtc */ int ta_flags; /* flags */ #define TODCLOCK_FLAG_FAKE 0x01 /* tod service is faked */ }; |