summaryrefslogtreecommitdiff
path: root/sys/arch/mac68k
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/mac68k')
-rw-r--r--sys/arch/mac68k/dev/grfvar.h6
-rw-r--r--sys/arch/mac68k/dev/ncr5380.c6
-rw-r--r--sys/arch/mac68k/dev/nubus.c4
-rw-r--r--sys/arch/mac68k/include/cpu.h4
-rw-r--r--sys/arch/mac68k/include/psc.h10
-rw-r--r--sys/arch/mac68k/include/viareg.h8
-rw-r--r--sys/arch/mac68k/mac68k/disksubr.c6
-rw-r--r--sys/arch/mac68k/mac68k/machdep.c4
-rw-r--r--sys/arch/mac68k/mac68k/pmap_bootstrap.c12
9 files changed, 30 insertions, 30 deletions
diff --git a/sys/arch/mac68k/dev/grfvar.h b/sys/arch/mac68k/dev/grfvar.h
index 19d3396ae49..f959b5698e7 100644
--- a/sys/arch/mac68k/dev/grfvar.h
+++ b/sys/arch/mac68k/dev/grfvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: grfvar.h,v 1.10 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: grfvar.h,v 1.11 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: grfvar.h,v 1.11 1996/08/04 06:03:58 scottr Exp $ */
/*
@@ -151,7 +151,7 @@ int grfaddr(struct grf_softc *gp, register int off);
int grfmap(dev_t dev, caddr_t *addrp, struct proc *p);
int grfunmap(dev_t dev, caddr_t addr, struct proc *p);
-void grf_establish __P((struct grfbus_softc *, nubus_slot *,
+void grf_establish(struct grfbus_softc *, nubus_slot *,
int (*)(struct grf_softc *, int, void *),
- caddr_t (*)(struct grf_softc *, vm_offset_t)));
+ caddr_t (*)(struct grf_softc *, vm_offset_t));
int grfbusprint(void *, const char *);
diff --git a/sys/arch/mac68k/dev/ncr5380.c b/sys/arch/mac68k/dev/ncr5380.c
index a9ed67308eb..9a82fd74ca2 100644
--- a/sys/arch/mac68k/dev/ncr5380.c
+++ b/sys/arch/mac68k/dev/ncr5380.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ncr5380.c,v 1.17 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: ncr5380.c,v 1.18 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: ncr5380.c,v 1.38 1996/12/19 21:48:18 scottr Exp $ */
/*
@@ -325,7 +325,7 @@ ncr5380_scsi_cmd(struct scsi_xfer *xs)
reqp->xs = xs;
reqp->targ_id = xs->sc_link->target;
reqp->targ_lun = xs->sc_link->lun;
- reqp->xdata_ptr = (u_char*)xs->data;
+ reqp->xdata_ptr = (u_char *)xs->data;
reqp->xdata_len = xs->datalen;
memcpy(&reqp->xcmd, xs->cmd, sizeof(struct scsi_generic));
reqp->xcmd.bytes[0] |= reqp->targ_lun << 5;
@@ -1768,7 +1768,7 @@ SC_REQ *reqp;
* Initialize locals and requests' DMA-chain.
*/
req_len = reqp->xdata_len;
- req_addr = (void*)reqp->xdata_ptr;
+ req_addr = (void *)reqp->xdata_ptr;
dm = reqp->dm_cur = reqp->dm_last = reqp->dm_chain;
dm->dm_count = dm->dm_addr = 0;
reqp->dr_flag &= ~DRIVER_BOUNCING;
diff --git a/sys/arch/mac68k/dev/nubus.c b/sys/arch/mac68k/dev/nubus.c
index 631d6db420f..0b05e64abfa 100644
--- a/sys/arch/mac68k/dev/nubus.c
+++ b/sys/arch/mac68k/dev/nubus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nubus.c,v 1.25 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: nubus.c,v 1.26 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: nubus.c,v 1.35 1997/04/22 20:20:32 scottr Exp $ */
/*
@@ -833,5 +833,5 @@ nubus_mapin(paddr, sz)
#endif
pmap_update(pmap_kernel());
- return ((char*)retval);
+ return ((char *)retval);
}
diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h
index bee0b440bf6..9d72d9062a9 100644
--- a/sys/arch/mac68k/include/cpu.h
+++ b/sys/arch/mac68k/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.23 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: cpu.h,v 1.24 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: cpu.h,v 1.45 1997/02/10 22:13:40 scottr Exp $ */
/*
@@ -297,7 +297,7 @@ struct fpframe;
struct pcb;
/* machdep.c */
-void mac68k_set_bell_callback __P((int (*)(void *, int, int, int), void *));
+void mac68k_set_bell_callback(int (*)(void *, int, int, int), void *);
int mac68k_ring_bell(int, int, int);
u_int get_mapping(void);
diff --git a/sys/arch/mac68k/include/psc.h b/sys/arch/mac68k/include/psc.h
index 4e2a4436a49..59f28b5f51b 100644
--- a/sys/arch/mac68k/include/psc.h
+++ b/sys/arch/mac68k/include/psc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: psc.h,v 1.3 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: psc.h,v 1.4 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: psc.h,v 1.3 1998/04/24 05:27:24 scottr Exp $ */
/*-
@@ -39,10 +39,10 @@ extern volatile u_int8_t *PSCBase;
void psc_init(void);
-int add_psc_lev3_intr __P((void (*)(void *), void *));
-int add_psc_lev4_intr __P((int, int (*)(void *), void *));
-int add_psc_lev5_intr __P((int, void (*)(void *), void *));
-int add_psc_lev6_intr __P((int, void (*)(void *), void *));
+int add_psc_lev3_intr(void (*)(void *), void *);
+int add_psc_lev4_intr(int, int (*)(void *), void *);
+int add_psc_lev5_intr(int, void (*)(void *), void *);
+int add_psc_lev6_intr(int, void (*)(void *), void *);
int remove_psc_lev3_intr(void);
int remove_psc_lev4_intr(int);
diff --git a/sys/arch/mac68k/include/viareg.h b/sys/arch/mac68k/include/viareg.h
index c864493457a..4dfd890c8d4 100644
--- a/sys/arch/mac68k/include/viareg.h
+++ b/sys/arch/mac68k/include/viareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: viareg.h,v 1.9 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: viareg.h,v 1.10 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: viareg.h,v 1.6 1997/02/28 07:41:41 scottr Exp $ */
/*-
@@ -194,10 +194,10 @@ void via_init(void);
int rbv_vidstatus(void);
void via_shutdown(void);
void via_set_modem(int);
-int add_nubus_intr __P((int, void (*)(void *, int), void *));
+int add_nubus_intr(int, void (*)(void *, int), void *);
void enable_nubus_intr(void);
-void via1_register_irq __P((int, void (*)(void *), void *));
-void via2_register_irq __P((int, void (*)(void *), void *));
+void via1_register_irq(int, void (*)(void *), void *);
+void via2_register_irq(int, void (*)(void *), void *);
extern void (*via1itab[7])(void *);
extern void (*via2itab[7])(void *);
diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c
index 11265408e29..e6c08d951f6 100644
--- a/sys/arch/mac68k/mac68k/disksubr.c
+++ b/sys/arch/mac68k/mac68k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.16 2002/03/14 01:26:35 millert Exp $ */
+/* $OpenBSD: disksubr.c,v 1.17 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $ */
/*
@@ -107,8 +107,8 @@ static void setUfs(struct partmapentry *, struct disklabel *, int);
static void setHfs(struct partmapentry *, struct disklabel *, int);
static void setScratch(struct partmapentry *, struct disklabel *, int);
static int getNamedType(struct partmapentry *, int, struct disklabel *, int, int, int *);
-static char *read_mac_label __P((dev_t, void (*)(struct buf *),
- register struct disklabel *, struct cpu_disklabel *));
+static char *read_mac_label(dev_t, void (*)(struct buf *),
+ register struct disklabel *, struct cpu_disklabel *);
/*
* Find an entry in the disk label that is unused and return it
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c
index ceb1ca25508..846d76a09f7 100644
--- a/sys/arch/mac68k/mac68k/machdep.c
+++ b/sys/arch/mac68k/mac68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.95 2002/03/14 01:26:36 millert Exp $ */
+/* $OpenBSD: machdep.c,v 1.96 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */
/*
@@ -239,7 +239,7 @@ static u_long get_physical(u_int, u_long *);
void initcpu(void);
int cpu_dumpsize(void);
-int cpu_dump __P((int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t *));
+int cpu_dump(int (*)(dev_t, daddr_t, caddr_t, size_t), daddr_t *);
void cpu_init_kcore_hdr(void);
/* functions called from locore.s */
diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
index 6503f559a87..4cc8c4231d5 100644
--- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c
+++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap_bootstrap.c,v 1.20 2002/03/14 01:26:36 millert Exp $ */
+/* $OpenBSD: pmap_bootstrap.c,v 1.21 2002/03/14 03:15:55 millert Exp $ */
/* $NetBSD: pmap_bootstrap.c,v 1.50 1999/04/07 06:14:33 scottr Exp $ */
/*
@@ -252,14 +252,14 @@ pmap_bootstrap(nextpa, firstpa)
* Initialize the final level 1 descriptor to map the last
* block of level 2 descriptors.
*/
- ste = &(PA2VA(kstpa, u_int*))[SG4_LEV1SIZE-1];
- pte = &(PA2VA(kstpa, u_int*))[kstsize*NPTEPG - SG4_LEV2SIZE];
+ ste = &(PA2VA(kstpa, u_int *))[SG4_LEV1SIZE-1];
+ pte = &(PA2VA(kstpa, u_int *))[kstsize*NPTEPG - SG4_LEV2SIZE];
*ste = (u_int)pte | SG_U | SG_RW | SG_V;
/*
* Now initialize the final portion of that block of
* descriptors to map the "last PT page".
*/
- pte = &(PA2VA(kstpa, u_int*))
+ pte = &(PA2VA(kstpa, u_int *))
[kstsize*NPTEPG - NPTEPG/SG4_LEV3SIZE];
epte = &pte[NPTEPG/SG4_LEV3SIZE];
protoste = lkptpa | SG_U | SG_RW | SG_V;
@@ -295,8 +295,8 @@ pmap_bootstrap(nextpa, firstpa)
* and the software Sysptmap. Note that Sysptmap is also
* considered a PT page hence the +1.
*/
- ste = PA2VA(kstpa, u_int*);
- pte = PA2VA(kptmpa, u_int*);
+ ste = PA2VA(kstpa, u_int *);
+ pte = PA2VA(kptmpa, u_int *);
epte = &pte[nptpages+1];
protoste = kptpa | SG_RW | SG_V;
protopte = kptpa | PG_RW | PG_CI | PG_V;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 06:02:30 +0000