diff options
| author | dsl <dsl@NetBSD.org> | 2009-03-14 14:45:51 +0000 |
|---|---|---|
| committer | dsl <dsl@NetBSD.org> | 2009-03-14 14:45:51 +0000 |
| commit | 02cdf4d2c869ecfa1ae5484cf77eefe2fbcc6d94 (patch) | |
| tree | 9a02e625d403e5fcedfdc6be4803e2404356bf31 /sys/arch/atari/stand | |
| parent | dfbb3f921a23a1aba4463f31ef9233ac94ce606c (diff) | |
Remove all the __P() from sys (excluding sys/dist)
Diff checked with grep and MK1 eyeball.
i386 and amd64 GENERIC and sys still build.
Diffstat (limited to 'sys/arch/atari/stand')
| -rw-r--r-- | sys/arch/atari/stand/ahdilabel/privahdi.h | 36 | ||||
| -rw-r--r-- | sys/arch/atari/stand/bootpref/bootpref.c | 44 | ||||
| -rw-r--r-- | sys/arch/atari/stand/bootxxx/bootxxx.c | 6 | ||||
| -rw-r--r-- | sys/arch/atari/stand/edahdi/edahdi.c | 26 | ||||
| -rw-r--r-- | sys/arch/atari/stand/installboot/disklabel.c | 12 | ||||
| -rw-r--r-- | sys/arch/atari/stand/installboot/installboot.c | 26 | ||||
| -rw-r--r-- | sys/arch/atari/stand/installboot/installboot.h | 6 | ||||
| -rw-r--r-- | sys/arch/atari/stand/libsa/atari_stand.h | 4 | ||||
| -rw-r--r-- | sys/arch/atari/stand/libsa/diskio.c | 12 | ||||
| -rw-r--r-- | sys/arch/atari/stand/loadkmap/loadkmap.c | 4 | ||||
| -rw-r--r-- | sys/arch/atari/stand/tostools/libtos/cread.c | 14 |
11 files changed, 95 insertions, 95 deletions
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); /* |
