diff options
-rw-r--r-- | usr.sbin/lsdev/i386.c | 30 | ||||
-rw-r--r-- | usr.sbin/lsdev/lsdev.c | 11 | ||||
-rw-r--r-- | usr.sbin/lsdev/lsdev.h | 16 |
3 files changed, 32 insertions, 25 deletions
diff --git a/usr.sbin/lsdev/i386.c b/usr.sbin/lsdev/i386.c index 301fd42..5fa8040 100644 --- a/usr.sbin/lsdev/i386.c +++ b/usr.sbin/lsdev/i386.c @@ -1,14 +1,22 @@ -#include "lsdev.h" -#include <stdio.h> -#include <string.h> -#include <machine/vmparam.h> +#include <sys/param.h> +#include <sys/devconf.h> + +#include <pci/pcivar.h> +#include <pci/pcireg.h> + +#include <scsi/scsiconf.h> + +#include <vm/vm.h> +#include <vm/vm_param.h> #include <vm/pmap.h> + #include <i386/isa/isa_device.h> #include <i386/eisa/eisaconf.h> -#include <scsi/scsiconf.h> -#include <pci/pcivar.h> -#include <pci/pcireg.h> +#include <stdio.h> +#include <string.h> + +#include "lsdev.h" static void print_isa(struct devconf *); static void print_eisa(struct devconf *); @@ -138,7 +146,7 @@ print_isa(struct devconf *dc) if(id->id_msize) { if(id->id_msize < 0) { - printf(" iosiz ?", id->id_msize); + printf(" iosiz ?"); } else { printf(" iosiz %d", id->id_msize); } @@ -153,7 +161,7 @@ static void print_eisa(struct devconf *dc) { struct eisa_device *e_dev = (struct eisa_device *)dc->dc_data; - printf("%s%ld\tat eisa0 slot %d # %#x-%#x", + printf("%s%d\tat eisa0 slot %d # %#lx-%#lx", dc->dc_name, dc->dc_unit, e_dev->ioconf.slot, @@ -176,8 +184,8 @@ print_pci(struct devconf *dc) struct pci_externalize_buffer *pd = (struct pci_externalize_buffer *)dc->dc_data; - - u_long data, pin, line; + u_long data; + int pin, line; printf("%s%d\tat pci%d:%d", dc->dc_name, dc->dc_unit, diff --git a/usr.sbin/lsdev/lsdev.c b/usr.sbin/lsdev/lsdev.c index 8d0385d..cb5287e 100644 --- a/usr.sbin/lsdev/lsdev.c +++ b/usr.sbin/lsdev/lsdev.c @@ -1,10 +1,15 @@ -#include "lsdev.h" +#include <sys/types.h> +#include <sys/devconf.h> +#include <sys/sysctl.h> + +#include <ctype.h> +#include <err.h> #include <stdio.h> #include <stdlib.h> -#include <err.h> -#include <ctype.h> #include <string.h> +#include "lsdev.h" + const char *const devtypes[] = DEVTYPENAMES; int vflag = 0; const char *whoami; diff --git a/usr.sbin/lsdev/lsdev.h b/usr.sbin/lsdev/lsdev.h index acf0d34..acaa93c 100644 --- a/usr.sbin/lsdev/lsdev.h +++ b/usr.sbin/lsdev/lsdev.h @@ -1,17 +1,11 @@ /* * Declarations for lsdev(8). */ -#include <sys/types.h> -#include <sys/param.h> -#include <sys/time.h> -#include <sys/proc.h> -#include <vm/vm.h> -#include <sys/sysctl.h> -#include <sys/devconf.h> -extern const char *const devtypes[]; /* device type array */ -extern void print_config(struct devconf *); /* machine-specific print routine */ -extern void hprint_config(void); /* machine-specific header printer */ +extern const char *const devtypes[]; /* device type array */ extern int vflag; -extern int findtype(const char *); /* get device type by name */ +int findtype(const char *); /* get device type by name */ +void hprint_config(void); /* machine-specific header printer */ +struct devconf; +void print_config(struct devconf *); /* machine-specific print routine */ |