svn commit: r353456 - head/usr.sbin/pciconf

[Rodney W. Grimes]

> Author: scottl
> Date: Sat Oct 12 22:27:57 2019
> New Revision: 353456
> URL: https://svnweb.freebsd.org/changeset/base/353456
> 
> Log:
>   Change from the non-standard nomenclature of "chip" and "card" to the
>   standard nomenclature of "device" and "vendor" with the "sub" variants.
>   This changes the printed format, so anything that scrapes and parses
>   this will need to be adapted.  No compatibility shims are provided,
>   but this will not be MFC'd.

I can not "adapt" google easily, seaching for these strings are
often very usefull in finding stuff like bug reports and ohers
with similiar issues.  I am not sure the gain of this is positive
over the loss of that.

>   
>   Reviewed by:	jhb, emaste, gtetlow
>   Approved by:	jhb, emaste, gtetlow
> 
> Modified:
>   head/usr.sbin/pciconf/pciconf.c
> 
> Modified: head/usr.sbin/pciconf/pciconf.c
> ==============================================================================
> --- head/usr.sbin/pciconf/pciconf.c	Sat Oct 12 20:53:40 2019	(r353455)
> +++ head/usr.sbin/pciconf/pciconf.c	Sat Oct 12 22:27:57 2019	(r353456)
> @@ -261,8 +261,8 @@ list_devs(const char *name, int verbose, int bars, int
>  			return;
>  		}
>  		for (p = conf; p < &conf[pc.num_matches]; p++) {
> -			printf("%s%d at pci%d:%d:%d:%d:\tclass=0x%06x card=0x%08x "
> -			    "chip=0x%08x rev=0x%02x hdr=0x%02x\n",
> +			printf("%s%d at pci%d:%d:%d:%d:\tclass=0x%06x subvendor=0x%04x subdevice=0x%04x "
> +			    "vendor=0x%04x device=0x%04x rev=0x%02x hdr=0x%02x\n",
>  			    *p->pd_name ? p->pd_name :
>  			    "none",
>  			    *p->pd_name ? (int)p->pd_unit :
> @@ -270,8 +270,8 @@ list_devs(const char *name, int verbose, int bars, int
>  			    p->pc_sel.pc_bus, p->pc_sel.pc_dev,
>  			    p->pc_sel.pc_func, (p->pc_class << 16) |
>  			    (p->pc_subclass << 8) | p->pc_progif,
> -			    (p->pc_subdevice << 16) | p->pc_subvendor,
> -			    (p->pc_device << 16) | p->pc_vendor,
> +			    p->pc_subdevice, p->pc_subvendor,
> +			    p->pc_device,  p->pc_vendor,
>  			    p->pc_revid, p->pc_hdr);
>  			if (verbose)
>  				list_verbose(p);
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org