From 635cfe5b819f60f28b7e21b94322b0237c13244b Mon Sep 17 00:00:00 2001 From: Scott Long Date: Sat, 12 Oct 2019 22:27:57 +0000 Subject: [PATCH] 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. Reviewed by: jhb, emaste, gtetlow Approved by: jhb, emaste, gtetlow --- usr.sbin/pciconf/pciconf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/pciconf/pciconf.c b/usr.sbin/pciconf/pciconf.c index 47b8f96422de..878b8d17b7e2 100644 --- a/usr.sbin/pciconf/pciconf.c +++ b/usr.sbin/pciconf/pciconf.c @@ -261,8 +261,8 @@ list_devs(const char *name, int verbose, int bars, int bridge, int caps, return; } for (p = conf; p < &conf[pc.num_matches]; p++) { - printf("%s%d@pci%d:%d:%d:%d:\tclass=0x%06x card=0x%08x " - "chip=0x%08x rev=0x%02x hdr=0x%02x\n", + printf("%s%d@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 bridge, int caps, 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);