diff options
Diffstat (limited to 'sys/arch/zaurus')
-rw-r--r-- | sys/arch/zaurus/stand/zboot/conf.c | 14 | ||||
-rw-r--r-- | sys/arch/zaurus/stand/zboot/devopen.c | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/zaurus/stand/zboot/conf.c b/sys/arch/zaurus/stand/zboot/conf.c index b605577ac2c..1d1b9bab33d 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.5 2010/12/06 18:44:49 jasper Exp $ */ +/* $OpenBSD: conf.c,v 1.6 2010/12/06 22:11:01 jasper Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -52,10 +52,10 @@ void (*zaurus_probe2[])(void) = { }; struct zaurus_boot_probes probe_list[] = { - { "probing", zaurus_probe1, nitems(zaurus_probe1) }, - { "disk", zaurus_probe2, nitems(zaurus_probe2) } + { "probing", zaurus_probe1, NENTS(zaurus_probe1) }, + { "disk", zaurus_probe2, NENTS(zaurus_probe2) } }; -int nibprobes = nitems(probe_list); +int nibprobes = NENTS(probe_list); void (*sa_cleanup)(void) = NULL; @@ -76,7 +76,7 @@ struct fs_ops file_system[] = { null_stat, null_readdir } #endif }; -int nfsys = nitems(file_system); +int nfsys = NENTS(file_system); struct devsw devsw[] = { { "UNIX", unixstrategy, unixopen, unixclose, unixioctl }, @@ -84,13 +84,13 @@ struct devsw devsw[] = { { "TFTP", tftpstrategy, tftpopen, tftpclose, tftpioctl }, #endif }; -int ndevs = nitems(devsw); +int ndevs = NENTS(devsw); #ifdef notdef struct netif_driver *netif_drivers[] = { NULL }; -int n_netif_drivers = nitems(netif_drivers); +int n_netif_drivers = NENTS(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 24b22d4828f..20a4828229e 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.7 2010/12/06 18:44:49 jasper Exp $ */ +/* $OpenBSD: devopen.c,v 1.8 2010/12/06 22:11:01 jasper Exp $ */ /* * Copyright (c) 1996-1999 Michael Shalayeff @@ -38,13 +38,13 @@ const char bdevs[][4] = { "", "", "", "", "", "", "", "scd", "", "hd", "" }; -const int nbdevs = nitems(bdevs); +const int nbdevs = NENTS(bdevs); const char cdevs[][4] = { "cn", "", "", "", "", "", "", "", "", "", "", "", "com" }; -const int ncdevs = nitems(cdevs); +const int ncdevs = NENTS(cdevs); /* pass dev_t to the open routines */ int |