summaryrefslogtreecommitdiff
path: root/sys/arch/amiga
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amiga')
-rw-r--r--sys/arch/amiga/amiga/amiga_init.c4
-rw-r--r--sys/arch/amiga/amiga/disksubr.c6
-rw-r--r--sys/arch/amiga/dev/aucc.c8
-rw-r--r--sys/arch/amiga/dev/idesc.c4
-rw-r--r--sys/arch/amiga/dev/sbic.c6
-rw-r--r--sys/arch/amiga/dev/sbicreg.h4
-rw-r--r--sys/arch/amiga/dev/sbicvar.h4
-rw-r--r--sys/arch/amiga/include/mtpr.h4
-rw-r--r--sys/arch/amiga/isa/cross.c6
-rw-r--r--sys/arch/amiga/isa/ggbus.c6
-rw-r--r--sys/arch/amiga/isa/isa_machdep.h6
-rw-r--r--sys/arch/amiga/stand/boot/main.c4
-rw-r--r--sys/arch/amiga/stand/loadbsd/loadbsd.c11
13 files changed, 32 insertions, 41 deletions
diff --git a/sys/arch/amiga/amiga/amiga_init.c b/sys/arch/amiga/amiga/amiga_init.c
index 8253bb6c75d..0b6ceb42fd6 100644
--- a/sys/arch/amiga/amiga/amiga_init.c
+++ b/sys/arch/amiga/amiga/amiga_init.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amiga_init.c,v 1.26 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: amiga_init.c,v 1.27 2002/03/14 03:15:51 millert Exp $ */
/* $NetBSD: amiga_init.c,v 1.56 1997/06/10 18:22:24 veego Exp $ */
/*
@@ -1046,7 +1046,7 @@ static void
kernel_image_magic_copy(dest)
u_char *dest;
{
- *((int*)dest) = ncfdev;
+ *((int *)dest) = ncfdev;
dest += 4;
bcopy(cfdev, dest, ncfdev * sizeof(struct cfdev)
+ memlist->m_nseg * sizeof(struct boot_memseg) + 4);
diff --git a/sys/arch/amiga/amiga/disksubr.c b/sys/arch/amiga/amiga/disksubr.c
index 218a7a8fbf9..61b4f64f1a9 100644
--- a/sys/arch/amiga/amiga/disksubr.c
+++ b/sys/arch/amiga/amiga/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.21 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: disksubr.c,v 1.22 2002/03/14 03:15:51 millert Exp $ */
/* $NetBSD: disksubr.c,v 1.27 1996/10/13 03:06:34 christos Exp $ */
/*
@@ -71,8 +71,8 @@ struct rdbmap {
u_long rdbchksum(void *);
struct adostype getadostype(u_long);
-struct rdbmap *getrdbmap __P((dev_t, void (*)(struct buf *),
- struct disklabel *, struct cpu_disklabel *));
+struct rdbmap *getrdbmap(dev_t, void (*)(struct buf *),
+ struct disklabel *, struct cpu_disklabel *);
/* XXX unknown function but needed for /sys/scsi to link */
void
diff --git a/sys/arch/amiga/dev/aucc.c b/sys/arch/amiga/dev/aucc.c
index 73655844593..bfa3ced0112 100644
--- a/sys/arch/amiga/dev/aucc.c
+++ b/sys/arch/amiga/dev/aucc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aucc.c,v 1.7 2002/03/14 01:26:28 millert Exp $ */
+/* $OpenBSD: aucc.c,v 1.8 2002/03/14 03:15:51 millert Exp $ */
/* $NetBSD: aucc.c,v 1.22 1998/01/12 10:39:10 thorpej Exp $ */
/*
@@ -165,10 +165,8 @@ int aucc_set_out_sr(void *, u_long);
int aucc_query_encoding(void *, struct audio_encoding *);
int aucc_round_blocksize(void *, int);
int aucc_commit_settings(void *);
-int aucc_start_output __P((void *, void *, int, void (*)(void *),
- void *));
-int aucc_start_input __P((void *, void *, int, void (*)(void *),
- void *));
+int aucc_start_output(void *, void *, int, void (*)(void *), void *);
+int aucc_start_input(void *, void *, int, void (*)(void *), void *);
int aucc_halt_output(void *);
int aucc_halt_input(void *);
int aucc_getdev(void *, struct audio_device *);
diff --git a/sys/arch/amiga/dev/idesc.c b/sys/arch/amiga/dev/idesc.c
index 648acdddbf6..4a329b2b90c 100644
--- a/sys/arch/amiga/dev/idesc.c
+++ b/sys/arch/amiga/dev/idesc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: idesc.c,v 1.11 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: idesc.c,v 1.12 2002/03/14 03:15:51 millert Exp $ */
/* $NetBSD: idesc.c,v 1.29 1996/12/23 09:10:12 veego Exp $ */
/*
@@ -904,7 +904,7 @@ ideicmd(dev, target, cbuf, clen, buf, len)
return (0);
case MODE_SENSE:
- mdsnbuf = (void*) buf;
+ mdsnbuf = (void *) buf;
bzero(buf, *((u_char *)cbuf + 4));
switch (*((u_char *)cbuf + 2) & 0x3f) {
case 4:
diff --git a/sys/arch/amiga/dev/sbic.c b/sys/arch/amiga/dev/sbic.c
index 29391173c2e..982099b8c57 100644
--- a/sys/arch/amiga/dev/sbic.c
+++ b/sys/arch/amiga/dev/sbic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbic.c,v 1.16 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: sbic.c,v 1.17 2002/03/14 03:15:51 millert Exp $ */
/* $NetBSD: sbic.c,v 1.28 1996/10/13 03:07:29 christos Exp $ */
/*
@@ -291,7 +291,7 @@ void sbic_load_ptrs(dev, regs, target, lun)
int target, lun;
{
int s, count;
- char* vaddr, * paddr;
+ char *vaddr, *paddr;
struct sbic_acb *acb;
SBIC_TRACE(dev);
@@ -322,7 +322,7 @@ void sbic_load_ptrs(dev, regs, target, lun)
count = acb->sc_kv.dc_count;
for(count = (NBPG - ((int)vaddr & PGOFSET));
count < acb->sc_kv.dc_count
- && (char*)kvtop(vaddr + count + 4) == paddr + count + 4;
+ && (char *)kvtop(vaddr + count + 4) == paddr + count + 4;
count += NBPG);
/* If it's all contiguous... */
if(count > acb->sc_kv.dc_count ) {
diff --git a/sys/arch/amiga/dev/sbicreg.h b/sys/arch/amiga/dev/sbicreg.h
index a7b08a4dfcb..7fe4c66e855 100644
--- a/sys/arch/amiga/dev/sbicreg.h
+++ b/sys/arch/amiga/dev/sbicreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbicreg.h,v 1.3 1997/01/16 09:25:17 niklas Exp $ */
+/* $OpenBSD: sbicreg.h,v 1.4 2002/03/14 03:15:51 millert Exp $ */
/* $NetBSD: sbicreg.h,v 1.2 1994/10/26 02:04:40 cgd Exp $ */
/*
@@ -404,7 +404,7 @@ typedef volatile sbic_padded_ind_regmap_t *sbic_regmap_p;
#define SBIC_LOAD_COMMAND(regs,cmd,cmdsize) do { \
int n=(cmdsize)-1; \
- char *ptr = (char*)(cmd); \
+ char *ptr = (char *)(cmd); \
sbic_write_reg(regs,SBIC_cdb1,*ptr++); \
while (n-- > 0) (regs)->sbic_value = *ptr++; \
} while (0)
diff --git a/sys/arch/amiga/dev/sbicvar.h b/sys/arch/amiga/dev/sbicvar.h
index a08864c0740..07910fd1036 100644
--- a/sys/arch/amiga/dev/sbicvar.h
+++ b/sys/arch/amiga/dev/sbicvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sbicvar.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: sbicvar.h,v 1.6 2002/03/14 03:15:51 millert Exp $ */
/* $NetBSD: sbicvar.h,v 1.11 1996/04/21 21:12:23 veego Exp $ */
/*
@@ -96,7 +96,7 @@ struct sbic_tinfo {
int touts; /* #timeouts */
int perrs; /* #parity errors */
int senses; /* #request sense commands sent */
- u_char* bounce; /* Bounce buffer for this device */
+ u_char *bounce; /* Bounce buffer for this device */
ushort lubusy; /* What local units/subr. are busy? */
u_char flags;
u_char period; /* Period suggestion */
diff --git a/sys/arch/amiga/include/mtpr.h b/sys/arch/amiga/include/mtpr.h
index b09eaec9f7c..983b7e55763 100644
--- a/sys/arch/amiga/include/mtpr.h
+++ b/sys/arch/amiga/include/mtpr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mtpr.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: mtpr.h,v 1.6 2002/03/14 03:15:52 millert Exp $ */
/* $NetBSD: mtpr.h,v 1.10 1996/05/09 20:31:53 is Exp $ */
/*
@@ -82,7 +82,7 @@ extern unsigned char ssir;
#define setsoftcback() (ssir |= SIR_CBACK, setsoftint())
void softintr_schedule(void *);
-void *softintr_establish __P((int, void (*)(void *), void *));
+void *softintr_establish(int, void (*)(void *), void *);
#endif /* _KERNEL */
diff --git a/sys/arch/amiga/isa/cross.c b/sys/arch/amiga/isa/cross.c
index b17fcde3d37..6e1bb20bac4 100644
--- a/sys/arch/amiga/isa/cross.c
+++ b/sys/arch/amiga/isa/cross.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cross.c,v 1.21 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: cross.c,v 1.22 2002/03/14 03:15:52 millert Exp $ */
/*
* Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer
@@ -108,8 +108,8 @@ int crossintr(void *);
void cross_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
-void *cross_intr_establish __P((void *, int, int, int, int (*)(void *),
- void *, char *));
+void *cross_intr_establish(void *, int, int, int, int (*)(void *),
+ void *, char *);
void cross_intr_disestablish(void *, void *);
int cross_intr_check(void *, int, int);
diff --git a/sys/arch/amiga/isa/ggbus.c b/sys/arch/amiga/isa/ggbus.c
index c30dd46d0f2..356b148314b 100644
--- a/sys/arch/amiga/isa/ggbus.c
+++ b/sys/arch/amiga/isa/ggbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ggbus.c,v 1.15 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: ggbus.c,v 1.16 2002/03/14 03:15:52 millert Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Niklas Hallqvist
@@ -70,8 +70,8 @@ int ggbusintr(void *);
void ggbus_attach_hook(struct device *, struct device *,
struct isabus_attach_args *);
-void *ggbus_intr_establish __P((void *, int, int, int, int (*)(void *),
- void *, char *));
+void *ggbus_intr_establish(void *, int, int, int, int (*)(void *),
+ void *, char *);
void ggbus_intr_disestablish(void *, void *);
int ggbus_intr_check(void *, int, int);
diff --git a/sys/arch/amiga/isa/isa_machdep.h b/sys/arch/amiga/isa/isa_machdep.h
index 6749560e84f..3b28d6a705d 100644
--- a/sys/arch/amiga/isa/isa_machdep.h
+++ b/sys/arch/amiga/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isa_machdep.h,v 1.5 2002/03/14 01:26:29 millert Exp $ */
+/* $OpenBSD: isa_machdep.h,v 1.6 2002/03/14 03:15:52 millert Exp $ */
/*
* Copyright (c) 1995, 1996 Niklas Hallqvist
@@ -44,8 +44,8 @@ struct amiga_isa_chipset {
void (*ic_attach_hook)(struct device *, struct device *,
struct isabus_attach_args *);
- void *(*ic_intr_establish) __P((void *, int, int, int,
- int (*)(void *), void *, char *));
+ void *(*ic_intr_establish)(void *, int, int, int,
+ int (*)(void *), void *, char *);
void (*ic_intr_disestablish)(void *, void *);
int (*ic_intr_check)(void *, int, int);
};
diff --git a/sys/arch/amiga/stand/boot/main.c b/sys/arch/amiga/stand/boot/main.c
index bfaf4d86d9a..68d1a55bd4e 100644
--- a/sys/arch/amiga/stand/boot/main.c
+++ b/sys/arch/amiga/stand/boot/main.c
@@ -1,5 +1,5 @@
/*
- * $OpenBSD: main.c,v 1.5 2002/03/14 01:26:29 millert Exp $
+ * $OpenBSD: main.c,v 1.6 2002/03/14 03:15:52 millert Exp $
* $NetBSD: main.c,v 1.1.1.1 1996/11/29 23:36:29 is Exp $
*
*
@@ -382,7 +382,7 @@ pain()
printf("+%lu]", (unsigned long)stringsz);
if (read(io, (char *)nkcd, stringsz) != stringsz)
goto err;
- nkcd = (int*)((char *)nkcd + ((stringsz + 3) & ~3));
+ nkcd = (int *)((char *)nkcd + ((stringsz + 3) & ~3));
esym = (char *)(textsz + eh->a_data + eh->a_bss
+ eh->a_syms + 4 + ((stringsz + 3) & ~3));
}
diff --git a/sys/arch/amiga/stand/loadbsd/loadbsd.c b/sys/arch/amiga/stand/loadbsd/loadbsd.c
index c6725aa7849..fb95e097f95 100644
--- a/sys/arch/amiga/stand/loadbsd/loadbsd.c
+++ b/sys/arch/amiga/stand/loadbsd/loadbsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: loadbsd.c,v 1.15 2002/03/14 01:26:30 millert Exp $ */
+/* $OpenBSD: loadbsd.c,v 1.16 2002/03/14 03:15:52 millert Exp $ */
/* $NetBSD: loadbsd.c,v 1.22 1996/10/13 13:39:52 is Exp $ */
/*
@@ -66,13 +66,6 @@
#define __LDPGSZ 8192
#if !defined(__NetBSD__) && !defined(__OpenBSD__)
-#ifndef __P
-#ifdef __STDC__
-#define __P(x) x
-#else
-#define __P(x)
-#endif
-#endif
void err(int, const char *, ...);
void errx(int, const char *, ...);
void warn(const char *, ...);
@@ -387,7 +380,7 @@ main(argc, argv)
read(fd, (char *)nkcd, e.a_syms);
nkcd = (int *)((char *)nkcd + e.a_syms);
read(fd, (char *)nkcd, stringsz);
- nkcd = (int*)((char *)nkcd + ((stringsz + 3) & ~3));
+ nkcd = (int *)((char *)nkcd + ((stringsz + 3) & ~3));
esym = (char *)(textsz + e.a_data + e.a_bss
+ e.a_syms + 4 + ((stringsz + 3) & ~3));
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 14:07:59 +0000