diff options
26 files changed, 121 insertions, 111 deletions
diff --git a/sys/arch/amd64/stand/boot/conf.c b/sys/arch/amd64/stand/boot/conf.c index e5416d18a98..bedf7be8d49 100644 --- a/sys/arch/amd64/stand/boot/conf.c +++ b/sys/arch/amd64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.17 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.18 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -26,6 +26,7 @@ * SUCH DAMAGE. */ +#include <sys/param.h> #include <sys/types.h> #include <netinet/in.h> #include <libsa.h> @@ -56,10 +57,10 @@ void (*i386_probe2[])(void) = { }; struct i386_boot_probes probe_list[] = { - { "probing", i386_probe1, NENTS(i386_probe1) }, - { "disk", i386_probe2, NENTS(i386_probe2) } + { "probing", i386_probe1, nitems(i386_probe1) }, + { "disk", i386_probe2, nitems(i386_probe2) } }; -int nibprobes = NENTS(probe_list); +int nibprobes = nitems(probe_list); struct fs_ops file_system[] = { @@ -74,7 +75,7 @@ struct fs_ops file_system[] = { cd9660_stat, cd9660_readdir }, #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "BIOS", biosstrategy, biosopen, biosclose, biosioctl }, @@ -82,7 +83,7 @@ struct devsw devsw[] = { { "TFTP", tftpstrategy, tftpopen, tftpclose, tftpioctl }, #endif }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct consdev constab[] = { { pc_probe, pc_init, pc_getc, pc_putc }, diff --git a/sys/arch/amd64/stand/cdboot/conf.c b/sys/arch/amd64/stand/cdboot/conf.c index 418fd239c68..48774c2687c 100644 --- a/sys/arch/amd64/stand/cdboot/conf.c +++ b/sys/arch/amd64/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.17 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.18 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <sys/param.h> #include <sys/types.h> #include <netinet/in.h> #include <libsa.h> @@ -57,10 +58,10 @@ void (*amd64_probe2[])(void) = { }; struct i386_boot_probes probe_list[] = { - { "probing", amd64_probe1, NENTS(amd64_probe1) }, - { "disk", amd64_probe2, NENTS(amd64_probe2) } + { "probing", amd64_probe1, nitems(amd64_probe1) }, + { "disk", amd64_probe2, nitems(amd64_probe2) } }; -int nibprobes = NENTS(probe_list); +int nibprobes = nitems(probe_list); struct fs_ops file_system[] = { { cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek, @@ -76,12 +77,12 @@ struct fs_ops file_system[] = { fat_stat, fat_readdir }, #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "BIOS", biosstrategy, biosopen, biosclose, biosioctl }, }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct consdev constab[] = { { pc_probe, pc_init, pc_getc, pc_putc }, diff --git a/sys/arch/amd64/stand/libsa/dev_i386.c b/sys/arch/amd64/stand/libsa/dev_i386.c index 4136e472b55..f6228c60bad 100644 --- a/sys/arch/amd64/stand/libsa/dev_i386.c +++ b/sys/arch/amd64/stand/libsa/dev_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_i386.c,v 1.5 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: dev_i386.c,v 1.6 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -38,13 +38,13 @@ const char bdevs[][4] = { "wd", "", "fd", "", "sd", "st", "cd", "mcd", "", "", "", "", "", "", "", "scd", "", "hd", "" }; -const int nbdevs = NENTS(bdevs); +const int nbdevs = nitems(bdevs); const char cdevs[][4] = { "cn", "", "", "", "", "", "", "", "com", "", "", "", "pc" }; -const int ncdevs = NENTS(cdevs); +const int ncdevs = nitems(cdevs); /* pass dev_t to the open routines */ int diff --git a/sys/arch/amd64/stand/libsa/memprobe.c b/sys/arch/amd64/stand/libsa/memprobe.c index 72cfe9320f8..d87968c8b1a 100644 --- a/sys/arch/amd64/stand/libsa/memprobe.c +++ b/sys/arch/amd64/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.9 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: memprobe.c,v 1.10 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -221,14 +221,14 @@ addrprobe(u_int kloc) { __volatile u_int *loc; register u_int i, ret = 0; - u_int save[NENTS(addrprobe_pat)]; + u_int save[nitems(addrprobe_pat)]; /* Get location */ loc = (int *)(kloc * 1024); save[0] = *loc; /* Probe address */ - for(i = 0; i < NENTS(addrprobe_pat); i++){ + for(i = 0; i < nitems(addrprobe_pat); i++){ *loc = addrprobe_pat[i]; if(*loc != addrprobe_pat[i]) ret++; @@ -237,13 +237,13 @@ addrprobe(u_int kloc) if (!ret) { /* Write address */ - for(i = 0; i < NENTS(addrprobe_pat); i++) { + for(i = 0; i < nitems(addrprobe_pat); i++) { save[i] = loc[i]; loc[i] = addrprobe_pat[i]; } /* Read address */ - for(i = 0; i < NENTS(addrprobe_pat); i++) { + for(i = 0; i < nitems(addrprobe_pat); i++) { if(loc[i] != addrprobe_pat[i]) ret++; loc[i] = save[i]; diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c index 9339e10aa0f..0463f292f05 100644 --- a/sys/arch/amd64/stand/pxeboot/conf.c +++ b/sys/arch/amd64/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.21 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.22 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <sys/param.h> #include <sys/types.h> #include <netinet/in.h> #include <libsa.h> @@ -65,17 +66,17 @@ void (*i386_probe3[])(void) = { }; struct i386_boot_probes probe_list[] = { - { "probing", i386_probe1, NENTS(i386_probe1) }, - { "disk", i386_probe2, NENTS(i386_probe2) }, - { "net", i386_probe3, NENTS(i386_probe3) }, + { "probing", i386_probe1, nitems(i386_probe1) }, + { "disk", i386_probe2, nitems(i386_probe2) }, + { "net", i386_probe3, nitems(i386_probe3) }, }; -int nibprobes = NENTS(probe_list); +int nibprobes = nitems(probe_list); /* This next list must match file_system[]. */ char *fs_name[] = { NULL, "tftp", "nfs" }; -int nfsname = NENTS(fs_name); +int nfsname = nitems(fs_name); struct fs_ops file_system[] = { { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, @@ -95,7 +96,7 @@ struct fs_ops file_system[] = { null_stat, null_readdir } #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { #ifdef _TEST @@ -104,7 +105,7 @@ struct devsw devsw[] = { { "BIOS", biosstrategy, biosopen, biosclose, biosioctl }, #endif }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct devsw netsw[] = { { "net", net_strategy, net_open, net_close, net_ioctl }, @@ -112,7 +113,7 @@ struct devsw netsw[] = { struct netif_driver *netif_drivers[] = { }; -int n_netif_drivers = NENTS(netif_drivers); +int n_netif_drivers = nitems(netif_drivers); struct consdev constab[] = { #ifdef _TEST diff --git a/sys/arch/amd64/stand/pxeboot/devopen.c b/sys/arch/amd64/stand/pxeboot/devopen.c index 87d7f8a34b1..f5fd09b817b 100644 --- a/sys/arch/amd64/stand/pxeboot/devopen.c +++ b/sys/arch/amd64/stand/pxeboot/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.6 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: devopen.c,v 1.7 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -45,13 +45,13 @@ const char bdevs[][4] = { "wd", "", "fd", "", "sd", "st", "cd", "mcd", "", "", "", "", "", "", "", "scd", "", "hd", "" }; -const int nbdevs = NENTS(bdevs); +const int nbdevs = nitems(bdevs); const char cdevs[][4] = { "cn", "", "", "", "", "", "", "", "com", "", "", "", "pc" }; -const int ncdevs = NENTS(cdevs); +const int ncdevs = nitems(cdevs); /* pass dev_t to the open routines */ int diff --git a/sys/arch/hppa/stand/boot/conf.c b/sys/arch/hppa/stand/boot/conf.c index 1f43e10553f..a1bbb454f3a 100644 --- a/sys/arch/hppa/stand/boot/conf.c +++ b/sys/arch/hppa/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.24 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.25 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -26,6 +26,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/param.h> #include <sys/types.h> #include <libsa.h> #include <lib/libsa/ufs.h> @@ -43,14 +44,14 @@ struct fs_ops file_system[] = { { lif_open, lif_close, lif_read, lif_write, lif_seek, lif_stat, lif_readdir }, }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "dk", iodcstrategy, dkopen, dkclose, noioctl }, { "ct", iodcstrategy, ctopen, ctclose, noioctl }, { "lf", iodcstrategy, lfopen, lfclose, noioctl } }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct consdev constab[] = { { ite_probe, ite_init, ite_getc, ite_putc }, diff --git a/sys/arch/hppa/stand/cdboot/cdboot.c b/sys/arch/hppa/stand/cdboot/cdboot.c index 813884fec57..266224f1e1f 100644 --- a/sys/arch/hppa/stand/cdboot/cdboot.c +++ b/sys/arch/hppa/stand/cdboot/cdboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cdboot.c,v 1.9 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: cdboot.c,v 1.10 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2003 Michael Shalayeff @@ -46,12 +46,12 @@ struct fs_ops file_system[] = { { cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek, cd9660_stat, cd9660_readdir }, }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "dk", iodcstrategy, dkopen, dkclose, noioctl }, }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct consdev constab[] = { { ite_probe, ite_init, ite_getc, ite_putc }, diff --git a/sys/arch/hppa/stand/libsa/cmd_hppa.c b/sys/arch/hppa/stand/libsa/cmd_hppa.c index 2a6f6ecf72e..8e81e22e6ee 100644 --- a/sys/arch/hppa/stand/libsa/cmd_hppa.c +++ b/sys/arch/hppa/stand/libsa/cmd_hppa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd_hppa.c,v 1.11 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: cmd_hppa.c,v 1.12 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2002, 2009 Miodrag Vallat @@ -331,13 +331,13 @@ set_serial(console, port, arg) speed = 0; if (arg == NULL || *arg == '\0') { - for (i = 0; i < NENTS(i_speeds); i++) + for (i = 0; i < nitems(i_speeds); i++) if (i_speeds[i] == 9600) { speed = i; break; } } else { - for (i = 0; i < NENTS(c_speeds); i++) + for (i = 0; i < nitems(c_speeds); i++) if (strcmp(arg, c_speeds[i]) == 0) { speed = i; break; diff --git a/sys/arch/hppa/stand/libsa/dev_hppa.c b/sys/arch/hppa/stand/libsa/dev_hppa.c index 1199976c7d9..ef3d9bb2770 100644 --- a/sys/arch/hppa/stand/libsa/dev_hppa.c +++ b/sys/arch/hppa/stand/libsa/dev_hppa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_hppa.c,v 1.13 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: dev_hppa.c,v 1.14 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -42,7 +42,7 @@ const char cdevs[][4] = { "ite", "", "", "", "", "", "", "", "", "", "", "", "" }; -const int ncdevs = NENTS(cdevs); +const int ncdevs = nitems(cdevs); const struct pdc_devs { char name[3]; @@ -78,11 +78,11 @@ devopen(f, fname, file) printf("devopen: "); #endif - for (dp = pdc_devs; dp < &pdc_devs[NENTS(pdc_devs)]; dp++) + for (dp = pdc_devs; dp < &pdc_devs[nitems(pdc_devs)]; dp++) if (!strncmp(fname, dp->name, sizeof(dp->name)-1)) break; - if (dp >= &pdc_devs[NENTS(pdc_devs)] || dp->dev_type < 0) + if (dp >= &pdc_devs[nitems(pdc_devs)] || dp->dev_type < 0) return ENODEV; #ifdef DEBUGBUG if (debug) diff --git a/sys/arch/hppa64/stand/boot/conf.c b/sys/arch/hppa64/stand/boot/conf.c index 70cd951329f..9e85a492c43 100644 --- a/sys/arch/hppa64/stand/boot/conf.c +++ b/sys/arch/hppa64/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.4 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.5 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -17,6 +17,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> #include <sys/types.h> #include <libsa.h> #include <lib/libsa/ufs.h> @@ -34,14 +35,14 @@ struct fs_ops file_system[] = { { lif_open, lif_close, lif_read, lif_write, lif_seek, lif_stat, lif_readdir }, }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "dk", iodcstrategy, dkopen, dkclose, noioctl }, { "ct", iodcstrategy, ctopen, ctclose, noioctl }, { "lf", iodcstrategy, lfopen, lfclose, noioctl } }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct consdev constab[] = { { ite_probe, ite_init, ite_getc, ite_putc }, diff --git a/sys/arch/hppa64/stand/cdboot/cdboot.c b/sys/arch/hppa64/stand/cdboot/cdboot.c index 5eb7d8a6998..19000da45d2 100644 --- a/sys/arch/hppa64/stand/cdboot/cdboot.c +++ b/sys/arch/hppa64/stand/cdboot/cdboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cdboot.c,v 1.3 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: cdboot.c,v 1.4 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -37,12 +37,12 @@ struct fs_ops file_system[] = { { cd9660_open, cd9660_close, cd9660_read, cd9660_write, cd9660_seek, cd9660_stat, cd9660_readdir }, }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "dk", iodcstrategy, dkopen, dkclose, noioctl }, }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct consdev constab[] = { { ite_probe, ite_init, ite_getc, ite_putc }, diff --git a/sys/arch/hppa64/stand/libsa/cmd_hppa64.c b/sys/arch/hppa64/stand/libsa/cmd_hppa64.c index 7a476478de7..15618973271 100644 --- a/sys/arch/hppa64/stand/libsa/cmd_hppa64.c +++ b/sys/arch/hppa64/stand/libsa/cmd_hppa64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmd_hppa64.c,v 1.3 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: cmd_hppa64.c,v 1.4 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2002 Miodrag Vallat @@ -337,13 +337,13 @@ set_serial(console, port, arg) speed = 0; if (arg == NULL || *arg == '\0') { - for (i = 0; i < NENTS(i_speeds); i++) + for (i = 0; i < nitems(i_speeds); i++) if (i_speeds[i] == 9600) { speed = i; break; } } else { - for (i = 0; i < NENTS(c_speeds); i++) + for (i = 0; i < nitems(c_speeds); i++) if (strcmp(arg, c_speeds[i]) == 0) { speed = i; break; diff --git a/sys/arch/hppa64/stand/libsa/dev_hppa64.c b/sys/arch/hppa64/stand/libsa/dev_hppa64.c index 8205affc88d..d3d85234858 100644 --- a/sys/arch/hppa64/stand/libsa/dev_hppa64.c +++ b/sys/arch/hppa64/stand/libsa/dev_hppa64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_hppa64.c,v 1.4 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: dev_hppa64.c,v 1.5 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -33,7 +33,7 @@ const char cdevs[][4] = { "ite", "", "", "", "", "", "", "", "", "", "", "", "" }; -const int ncdevs = NENTS(cdevs); +const int ncdevs = nitems(cdevs); const struct pdc_devs { char name[3]; @@ -69,11 +69,11 @@ devopen(f, fname, file) printf("devopen: "); #endif - for (dp = pdc_devs; dp < &pdc_devs[NENTS(pdc_devs)]; dp++) + for (dp = pdc_devs; dp < &pdc_devs[nitems(pdc_devs)]; dp++) if (!strncmp(fname, dp->name, sizeof(dp->name)-1)) break; - if (dp >= &pdc_devs[NENTS(pdc_devs)] || dp->dev_type < 0) + if (dp >= &pdc_devs[nitems(pdc_devs)] || dp->dev_type < 0) return ENODEV; #ifdef DEBUGBUG if (debug) diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c index 072a6598ef9..b737e41c236 100644 --- a/sys/arch/i386/stand/boot/conf.c +++ b/sys/arch/i386/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.43 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.44 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -26,6 +26,7 @@ * SUCH DAMAGE. */ +#include <sys/param.h> #include <sys/types.h> #include <netinet/in.h> #include <libsa.h> @@ -58,10 +59,10 @@ void (*i386_probe2[])(void) = { }; struct i386_boot_probes probe_list[] = { - { "probing", i386_probe1, NENTS(i386_probe1) }, - { "disk", i386_probe2, NENTS(i386_probe2) } + { "probing", i386_probe1, nitems(i386_probe1) }, + { "disk", i386_probe2, nitems(i386_probe2) } }; -int nibprobes = NENTS(probe_list); +int nibprobes = nitems(probe_list); struct fs_ops file_system[] = { @@ -80,7 +81,7 @@ struct fs_ops file_system[] = { null_stat, null_readdir } #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { #ifdef _TEST @@ -92,13 +93,13 @@ struct devsw devsw[] = { { "TFTP", tftpstrategy, tftpopen, tftpclose, tftpioctl }, #endif }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); #ifdef notdef struct netif_driver *netif_drivers[] = { NULL }; -int n_netif_drivers = NENTS(netif_drivers); +int n_netif_drivers = nitems(netif_drivers); #endif struct consdev constab[] = { diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c index 68ab147116a..597fb2e4f64 100644 --- a/sys/arch/i386/stand/cdboot/conf.c +++ b/sys/arch/i386/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.15 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.16 2010/12/06 22:51:45 jasper Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <sys/param.h> #include <sys/types.h> #include <netinet/in.h> #include <libsa.h> @@ -61,10 +62,10 @@ void (*i386_probe2[])(void) = { }; struct i386_boot_probes probe_list[] = { - { "probing", i386_probe1, NENTS(i386_probe1) }, - { "disk", i386_probe2, NENTS(i386_probe2) }, + { "probing", i386_probe1, nitems(i386_probe1) }, + { "disk", i386_probe2, nitems(i386_probe2) }, }; -int nibprobes = NENTS(probe_list); +int nibprobes = nitems(probe_list); struct fs_ops file_system[] = { { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, @@ -84,7 +85,7 @@ struct fs_ops file_system[] = { null_stat, null_readdir } #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { #ifdef _TEST @@ -93,7 +94,7 @@ struct devsw devsw[] = { { "BIOS", biosstrategy, biosopen, biosclose, biosioctl }, #endif }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct consdev constab[] = { #ifdef _TEST diff --git a/sys/arch/i386/stand/libsa/debug.c b/sys/arch/i386/stand/libsa/debug.c index 569fef851b5..e5164fbca69 100644 --- a/sys/arch/i386/stand/libsa/debug.c +++ b/sys/arch/i386/stand/libsa/debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: debug.c,v 1.15 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: debug.c,v 1.16 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -27,6 +27,7 @@ * */ +#include <sys/param.h> #include <lib/libsa/stand.h> #include <debug.h> #include <dev/cons.h> @@ -34,7 +35,7 @@ #define VBASE (0xb8000) char *const reg_names[] = { REG_NAMES }; -const int nreg = NENTS(reg_names); +const int nreg = nitems(reg_names); struct reg reg; u_int32_t *const reg_values[] = { REG_VALUES(reg) }; char *const trap_names[] = { TRAP_NAMES }; diff --git a/sys/arch/i386/stand/libsa/dev_i386.c b/sys/arch/i386/stand/libsa/dev_i386.c index f74c584eae7..099055faef1 100644 --- a/sys/arch/i386/stand/libsa/dev_i386.c +++ b/sys/arch/i386/stand/libsa/dev_i386.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dev_i386.c,v 1.32 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: dev_i386.c,v 1.33 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -38,13 +38,13 @@ const char bdevs[][4] = { "wd", "", "fd", "", "sd", "st", "cd", "mcd", "", "", "", "", "", "", "", "scd", "", "hd", "" }; -const int nbdevs = NENTS(bdevs); +const int nbdevs = nitems(bdevs); const char cdevs[][4] = { "cn", "", "", "", "", "", "", "", "com", "", "", "", "pc" }; -const int ncdevs = NENTS(cdevs); +const int ncdevs = nitems(cdevs); /* pass dev_t to the open routines */ int diff --git a/sys/arch/i386/stand/libsa/memprobe.c b/sys/arch/i386/stand/libsa/memprobe.c index db7472ac3d8..aece9b001fb 100644 --- a/sys/arch/i386/stand/libsa/memprobe.c +++ b/sys/arch/i386/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.49 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: memprobe.c,v 1.50 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -224,14 +224,14 @@ addrprobe(u_int kloc) { __volatile u_int *loc; register u_int i, ret = 0; - u_int save[NENTS(addrprobe_pat)]; + u_int save[nitems(addrprobe_pat)]; /* Get location */ loc = (int *)(kloc * 1024); save[0] = *loc; /* Probe address */ - for (i = 0; i < NENTS(addrprobe_pat); i++) { + for (i = 0; i < nitems(addrprobe_pat); i++) { *loc = addrprobe_pat[i]; if (*loc != addrprobe_pat[i]) ret++; @@ -240,13 +240,13 @@ addrprobe(u_int kloc) if (!ret) { /* Write address */ - for (i = 0; i < NENTS(addrprobe_pat); i++) { + for (i = 0; i < nitems(addrprobe_pat); i++) { save[i] = loc[i]; loc[i] = addrprobe_pat[i]; } /* Read address */ - for (i = 0; i < NENTS(addrprobe_pat); i++) { + for (i = 0; i < nitems(addrprobe_pat); i++) { if (loc[i] != addrprobe_pat[i]) ret++; loc[i] = save[i]; diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c index d136c8c9f4f..204950d0bc1 100644 --- a/sys/arch/i386/stand/pxeboot/conf.c +++ b/sys/arch/i386/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.20 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.21 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -27,6 +27,7 @@ * SUCH DAMAGE. */ +#include <sys/param.h> #include <sys/types.h> #include <netinet/in.h> #include <libsa.h> @@ -67,17 +68,17 @@ void (*i386_probe3[])(void) = { }; struct i386_boot_probes probe_list[] = { - { "probing", i386_probe1, NENTS(i386_probe1) }, - { "disk", i386_probe2, NENTS(i386_probe2) }, - { "net", i386_probe3, NENTS(i386_probe3) }, + { "probing", i386_probe1, nitems(i386_probe1) }, + { "disk", i386_probe2, nitems(i386_probe2) }, + { "net", i386_probe3, nitems(i386_probe3) }, }; -int nibprobes = NENTS(probe_list); +int nibprobes = nitems(probe_list); /* This next list must match file_system[]. */ char *fs_name[] = { NULL, "tftp", "nfs" }; -int nfsname = NENTS(fs_name); +int nfsname = nitems(fs_name); struct fs_ops file_system[] = { { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, @@ -97,7 +98,7 @@ struct fs_ops file_system[] = { null_stat, null_readdir } #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { #ifdef _TEST @@ -106,7 +107,7 @@ struct devsw devsw[] = { { "BIOS", biosstrategy, biosopen, biosclose, biosioctl }, #endif }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); struct devsw netsw[] = { { "net", net_strategy, net_open, net_close, net_ioctl }, @@ -114,7 +115,7 @@ struct devsw netsw[] = { struct netif_driver *netif_drivers[] = { }; -int n_netif_drivers = NENTS(netif_drivers); +int n_netif_drivers = nitems(netif_drivers); struct consdev constab[] = { #ifdef _TEST diff --git a/sys/arch/i386/stand/pxeboot/devopen.c b/sys/arch/i386/stand/pxeboot/devopen.c index 87d7f8a34b1..06cab9b2b75 100644 --- a/sys/arch/i386/stand/pxeboot/devopen.c +++ b/sys/arch/i386/stand/pxeboot/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.6 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: devopen.c,v 1.7 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -45,13 +45,13 @@ const char bdevs[][4] = { "wd", "", "fd", "", "sd", "st", "cd", "mcd", "", "", "", "", "", "", "", "scd", "", "hd", "" }; -const int nbdevs = NENTS(bdevs); +const int nbdevs = nitems(bdevs); const char cdevs[][4] = { "cn", "", "", "", "", "", "", "", "com", "", "", "", "pc" }; -const int ncdevs = NENTS(cdevs); +const int ncdevs = nitems(cdevs); /* pass dev_t to the open routines */ int diff --git a/sys/arch/landisk/stand/boot/conf.c b/sys/arch/landisk/stand/boot/conf.c index deea81a3034..552cfc6d290 100644 --- a/sys/arch/landisk/stand/boot/conf.c +++ b/sys/arch/landisk/stand/boot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.5 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 2006 Michael Shalayeff @@ -17,6 +17,7 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/param.h> #include <sys/types.h> #include <libsa.h> #include <lib/libsa/ufs.h> @@ -44,9 +45,9 @@ struct fs_ops file_system[] = { cd9660_stat, cd9660_readdir }, #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "dk", blkdevstrategy, blkdevopen, blkdevclose, noioctl }, }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); diff --git a/sys/arch/landisk/stand/xxboot/boot1.c b/sys/arch/landisk/stand/xxboot/boot1.c index e379bb82ebd..ff4394564c3 100644 --- a/sys/arch/landisk/stand/xxboot/boot1.c +++ b/sys/arch/landisk/stand/xxboot/boot1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot1.c,v 1.4 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: boot1.c,v 1.5 2010/12/06 22:51:46 jasper Exp $ */ /* $NetBSD: boot1.c,v 1.1 2006/09/01 21:26:19 uwe Exp $ */ /*- @@ -55,12 +55,12 @@ struct fs_ops file_system[] = { { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat, ufs_readdir }, }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "dk", blkdevstrategy, blkdevopen, blkdevclose, noioctl }, }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); const char * boot1(uint32_t *sector) diff --git a/sys/arch/zaurus/stand/zboot/conf.c b/sys/arch/zaurus/stand/zboot/conf.c index 1d1b9bab33d..ac60dd472cc 100644 --- a/sys/arch/zaurus/stand/zboot/conf.c +++ b/sys/arch/zaurus/stand/zboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.6 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.7 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -27,6 +27,7 @@ * */ +#include <sys/param.h> #include <sys/types.h> #include <netinet/in.h> #include <libsa.h> @@ -52,10 +53,10 @@ void (*zaurus_probe2[])(void) = { }; struct zaurus_boot_probes probe_list[] = { - { "probing", zaurus_probe1, NENTS(zaurus_probe1) }, - { "disk", zaurus_probe2, NENTS(zaurus_probe2) } + { "probing", zaurus_probe1, nitems(zaurus_probe1) }, + { "disk", zaurus_probe2, nitems(zaurus_probe2) } }; -int nibprobes = NENTS(probe_list); +int nibprobes = nitems(probe_list); void (*sa_cleanup)(void) = NULL; @@ -76,7 +77,7 @@ struct fs_ops file_system[] = { null_stat, null_readdir } #endif }; -int nfsys = NENTS(file_system); +int nfsys = nitems(file_system); struct devsw devsw[] = { { "UNIX", unixstrategy, unixopen, unixclose, unixioctl }, @@ -84,13 +85,13 @@ struct devsw devsw[] = { { "TFTP", tftpstrategy, tftpopen, tftpclose, tftpioctl }, #endif }; -int ndevs = NENTS(devsw); +int ndevs = nitems(devsw); #ifdef notdef struct netif_driver *netif_drivers[] = { NULL }; -int n_netif_drivers = NENTS(netif_drivers); +int n_netif_drivers = nitems(netif_drivers); #endif struct consdev constab[] = { diff --git a/sys/arch/zaurus/stand/zboot/devopen.c b/sys/arch/zaurus/stand/zboot/devopen.c index 20a4828229e..3ebdd33a456 100644 --- a/sys/arch/zaurus/stand/zboot/devopen.c +++ b/sys/arch/zaurus/stand/zboot/devopen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: devopen.c,v 1.8 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: devopen.c,v 1.9 2010/12/06 22:51:46 jasper Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -38,13 +38,13 @@ const char bdevs[][4] = { "", "", "", "", "", "", "", "scd", "", "hd", "" }; -const int nbdevs = NENTS(bdevs); +const int nbdevs = nitems(bdevs); const char cdevs[][4] = { "cn", "", "", "", "", "", "", "", "", "", "", "", "com" }; -const int ncdevs = NENTS(cdevs); +const int ncdevs = nitems(cdevs); /* pass dev_t to the open routines */ int diff --git a/sys/lib/libsa/stand.h b/sys/lib/libsa/stand.h index 7a44456ee1c..4195b9ca0a9 100644 --- a/sys/lib/libsa/stand.h +++ b/sys/lib/libsa/stand.h @@ -1,4 +1,4 @@ -/* $OpenBSD: stand.h,v 1.49 2010/12/06 22:11:01 jasper Exp $ */ +/* $OpenBSD: stand.h,v 1.50 2010/12/06 22:51:46 jasper Exp $ */ /* $NetBSD: stand.h,v 1.18 1996/11/30 04:35:51 gwr Exp $ */ /*- @@ -48,7 +48,6 @@ struct open_file; /* * Useful macros */ -#define NENTS(x) sizeof(x)/sizeof(x[0]) /* don't define if libkern included */ #ifndef LIBKERN_INLINE #define max(a,b) (((a)>(b))? (a) : (b)) |