summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/pxeboot/conf.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/stand/pxeboot/conf.c')
-rw-r--r--sys/arch/i386/stand/pxeboot/conf.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c
index 672e897e303..d136c8c9f4f 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.19 2010/12/06 18:44:49 jasper Exp $ */
+/* $OpenBSD: conf.c,v 1.20 2010/12/06 22:11:01 jasper Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -67,17 +67,17 @@ void (*i386_probe3[])(void) = {
};
struct i386_boot_probes probe_list[] = {
- { "probing", i386_probe1, nitems(i386_probe1) },
- { "disk", i386_probe2, nitems(i386_probe2) },
- { "net", i386_probe3, nitems(i386_probe3) },
+ { "probing", i386_probe1, NENTS(i386_probe1) },
+ { "disk", i386_probe2, NENTS(i386_probe2) },
+ { "net", i386_probe3, NENTS(i386_probe3) },
};
-int nibprobes = nitems(probe_list);
+int nibprobes = NENTS(probe_list);
/* This next list must match file_system[]. */
char *fs_name[] = {
NULL, "tftp", "nfs"
};
-int nfsname = nitems(fs_name);
+int nfsname = NENTS(fs_name);
struct fs_ops file_system[] = {
{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek,
@@ -97,7 +97,7 @@ struct fs_ops file_system[] = {
null_stat, null_readdir }
#endif
};
-int nfsys = nitems(file_system);
+int nfsys = NENTS(file_system);
struct devsw devsw[] = {
#ifdef _TEST
@@ -106,7 +106,7 @@ struct devsw devsw[] = {
{ "BIOS", biosstrategy, biosopen, biosclose, biosioctl },
#endif
};
-int ndevs = nitems(devsw);
+int ndevs = NENTS(devsw);
struct devsw netsw[] = {
{ "net", net_strategy, net_open, net_close, net_ioctl },
@@ -114,7 +114,7 @@ struct devsw netsw[] = {
struct netif_driver *netif_drivers[] = {
};
-int n_netif_drivers = nitems(netif_drivers);
+int n_netif_drivers = NENTS(netif_drivers);
struct consdev constab[] = {
#ifdef _TEST