Attachment #58808 for bug #92486

View | Details | Raw Unified | Return to bug 92486
Collapse All | Expand All




static void
parse_name_list(struct pci_access *a)
{
  byte *p = (byte *)a->nl_list;
  byte *q, *r;
  int lino = 0;
  unsigned int id1=0, id2=0, id3=0, id4=0;

	{
	  if (q[0] == 'C' && q[1] == ' ')
	    {
	      if (strlen((char *)q+2) < 3 ||
		  q[4] != ' ' ||
		  sscanf((char *)q+2, "%x", &id1) != 1)
		goto parserr;
	      cat = NL_CLASS;
	    }
	  else
	    {
	      if (strlen((char *)q) < 5 ||
		  q[4] != ' ' ||
		  sscanf((char *)q, "%x", &id1) != 1)
		goto parserr;
	      cat = NL_VENDOR;
	    }

	  case NL_VENDOR:
	  case NL_DEVICE:
	  case NL_SUBSYSTEM:
	    if (sscanf((char *)q, "%x", &id2) != 1 || q[4] != ' ')
	      goto parserr;
	    q += 5;
	    cat = NL_DEVICE;

	  case NL_CLASS:
	  case NL_SUBCLASS:
	  case NL_PROGIF:
	    if (sscanf((char *)q, "%x", &id2) != 1 || q[2] != ' ')
	      goto parserr;
	    q += 3;
	    cat = NL_SUBCLASS;

	  {
	  case NL_DEVICE:
	  case NL_SUBSYSTEM:
	    if (sscanf((char *)q, "%x%x", &id3, &id4) != 2 || q[9] != ' ')
	      goto parserr;
	    q += 10;
	    cat = NL_SUBSYSTEM;

	  case NL_CLASS:
	  case NL_SUBCLASS:
	  case NL_PROGIF:
	    if (sscanf((char *)q, "%x", &id3) != 1 || q[2] != ' ')
	      goto parserr;
	    q += 3;
	    cat = NL_PROGIF;

    {
    case PCI_LOOKUP_VENDOR:
      if (n = nl_lookup(a, num, NL_VENDOR, arg1, 0, 0, 0))
	return (char *)n->name;
      else
	res = snprintf(buf, size, "%04x", arg1);
      break;
    case PCI_LOOKUP_DEVICE:
      if (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2, 0, 0))
	return (char *)n->name;
      else
	res = snprintf(buf, size, "%04x", arg2);
      break;

      break;
    case PCI_LOOKUP_VENDOR | PCI_LOOKUP_SUBSYSTEM:
      if (n = nl_lookup(a, num, NL_VENDOR, arg3, 0, 0, 0))
	return (char *)n->name;
      else
	res = snprintf(buf, size, "%04x", arg2);
      break;
    case PCI_LOOKUP_DEVICE | PCI_LOOKUP_SUBSYSTEM:
      if (n = nl_lookup(a, num, NL_SUBSYSTEM, arg1, arg2, arg3, arg4))
	return (char *)n->name;
      else if (arg1 == arg3 && arg2 == arg4 && (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2, 0, 0)))
	return (char *)n->name;
      else
	res = snprintf(buf, size, "%04x", arg4);
      break;

      break;
    case PCI_LOOKUP_CLASS:
      if (n = nl_lookup(a, num, NL_SUBCLASS, arg1 >> 8, arg1 & 0xff, 0, 0))
	return (char *)n->name;
      else if (n = nl_lookup(a, num, NL_CLASS, arg1, 0, 0, 0))
	res = snprintf(buf, size, "%s [%04x]", n->name, arg1);
      else

      break;
    case PCI_LOOKUP_PROGIF:
      if (n = nl_lookup(a, num, NL_PROGIF, arg1 >> 8, arg1 & 0xff, arg2, 0))
	return (char *)n->name;
      if (arg1 == 0x0101)
	{
	  /* IDE controllers have complex prog-if semantics */




	 p->bus,
	 p->dev,
	 p->func,
	 pci_lookup_name(pacc, (char *)classbuf, sizeof(classbuf),
			 PCI_LOOKUP_CLASS,
			 get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0),
	 pci_lookup_name(pacc, (char *)devbuf, sizeof(devbuf),
			 PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
			 p->vendor_id, p->device_id, 0, 0));
  if (c = get_conf_byte(d, PCI_REVISION_ID))

    {
      char *x;
      c = get_conf_byte(d, PCI_CLASS_PROG);
      x = pci_lookup_name(pacc, (char *)devbuf, sizeof(devbuf),
			  PCI_LOOKUP_PROGIF,
			  get_conf_word(d, PCI_CLASS_DEVICE), c, 0, 0);
      if (c || x)

{
  *p++ = '\n';
  *p = 0;
  fputs((char *)line, stdout);
  for(p=line; *p; p++)
    if (*p == '+' || *p == '|')
      *p = '|';

  struct bridge *b;
  char namebuf[256];

  p += sprintf((char *)p, "%02x.%x", q->dev, q->func);
  for(b=&host_bridge; b; b=b->chain)
    if (b->br_dev == d)
      {
	if (b->secondary == b->subordinate)
	  p += sprintf((char *)p, "-[%02x]-", b->secondary);
	else
	  p += sprintf((char *)p, "-[%02x-%02x]-", b->secondary, b->subordinate);
        show_tree_bridge(b, line, p);
        return;
      }
  if (verbose)
    p += sprintf((char *)p, "  %s",
		 pci_lookup_name(pacc, (char *)namebuf, sizeof(namebuf),
				 PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE,
				 q->vendor_id, q->device_id, 0, 0));
  print_it(line, p);

  if (!b->first_bus->sibling)
    {
      if (b == &host_bridge)
        p += sprintf((char *)p, "[%02x]-", b->first_bus->number);
      show_tree_bus(b->first_bus, line, p);
    }
  else


      while (u->sibling)
        {
          k = p + sprintf((char *)p, "+-[%02x]-", u->number);
          show_tree_bus(u, line, k);
          u = u->sibling;
        }
      k = p + sprintf((char *)p, "\\-[%02x]-", u->number);
      show_tree_bus(u, line, k);
    }
}

  char line[256];

  grow_tree();
  show_tree_bridge(&host_bridge, (byte *)line, (byte *)line);
}

/* Bus mapping mode */

Return to bug 92486

Lines 87-93 Link Here

(-)pciutils-2.1.11.orig/lib/names.c (-16 / +16 lines)
87	static void	87	static void
88	parse_name_list(struct pci_access *a)	88	parse_name_list(struct pci_access *a)
89	{	89	{
90	byte *p = a->nl_list;	90	byte p = (byte )a->nl_list;
91	byte q, r;	91	byte q, r;
92	int lino = 0;	92	int lino = 0;
93	unsigned int id1=0, id2=0, id3=0, id4=0;	93	unsigned int id1=0, id2=0, id3=0, id4=0;
Lines 113-129 Link Here
113	{	113	{
114	if (q[0] == 'C' && q[1] == ' ')	114	if (q[0] == 'C' && q[1] == ' ')
115	{	115	{
116	if (strlen(q+2) < 3 \|\|	116	if (strlen((char *)q+2) < 3 \|\|
117	q[4] != ' ' \|\|	117	q[4] != ' ' \|\|
118	sscanf(q+2, "%x", &id1) != 1)	118	sscanf((char *)q+2, "%x", &id1) != 1)
119	goto parserr;	119	goto parserr;
120	cat = NL_CLASS;	120	cat = NL_CLASS;
121	}	121	}
122	else	122	else
123	{	123	{
124	if (strlen(q) < 5 \|\|	124	if (strlen((char *)q) < 5 \|\|
125	q[4] != ' ' \|\|	125	q[4] != ' ' \|\|
126	sscanf(q, "%x", &id1) != 1)	126	sscanf((char *)q, "%x", &id1) != 1)
127	goto parserr;	127	goto parserr;
128	cat = NL_VENDOR;	128	cat = NL_VENDOR;
129	}	129	}
Lines 136-142 Link Here
136	case NL_VENDOR:	136	case NL_VENDOR:
137	case NL_DEVICE:	137	case NL_DEVICE:
138	case NL_SUBSYSTEM:	138	case NL_SUBSYSTEM:
139	if (sscanf(q, "%x", &id2) != 1 \|\| q[4] != ' ')	139	if (sscanf((char *)q, "%x", &id2) != 1 \|\| q[4] != ' ')
140	goto parserr;	140	goto parserr;
141	q += 5;	141	q += 5;
142	cat = NL_DEVICE;	142	cat = NL_DEVICE;
Lines 145-151 Link Here
145	case NL_CLASS:	145	case NL_CLASS:
146	case NL_SUBCLASS:	146	case NL_SUBCLASS:
147	case NL_PROGIF:	147	case NL_PROGIF:
148	if (sscanf(q, "%x", &id2) != 1 \|\| q[2] != ' ')	148	if (sscanf((char *)q, "%x", &id2) != 1 \|\| q[2] != ' ')
149	goto parserr;	149	goto parserr;
150	q += 3;	150	q += 3;
151	cat = NL_SUBCLASS;	151	cat = NL_SUBCLASS;
Lines 159-165 Link Here
159	{	159	{
160	case NL_DEVICE:	160	case NL_DEVICE:
161	case NL_SUBSYSTEM:	161	case NL_SUBSYSTEM:
162	if (sscanf(q, "%x%x", &id3, &id4) != 2 \|\| q[9] != ' ')	162	if (sscanf((char *)q, "%x%x", &id3, &id4) != 2 \|\| q[9] != ' ')
163	goto parserr;	163	goto parserr;
164	q += 10;	164	q += 10;
165	cat = NL_SUBSYSTEM;	165	cat = NL_SUBSYSTEM;
Lines 167-173 Link Here
167	case NL_CLASS:	167	case NL_CLASS:
168	case NL_SUBCLASS:	168	case NL_SUBCLASS:
169	case NL_PROGIF:	169	case NL_PROGIF:
170	if (sscanf(q, "%x", &id3) != 1 \|\| q[2] != ' ')	170	if (sscanf((char *)q, "%x", &id3) != 1 \|\| q[2] != ' ')
171	goto parserr;	171	goto parserr;
172	q += 3;	172	q += 3;
173	cat = NL_PROGIF;	173	cat = NL_PROGIF;
Lines 245-257 Link Here
245	{	245	{
246	case PCI_LOOKUP_VENDOR:	246	case PCI_LOOKUP_VENDOR:
247	if (n = nl_lookup(a, num, NL_VENDOR, arg1, 0, 0, 0))	247	if (n = nl_lookup(a, num, NL_VENDOR, arg1, 0, 0, 0))
248	return n->name;	248	return (char *)n->name;
249	else	249	else
250	res = snprintf(buf, size, "%04x", arg1);	250	res = snprintf(buf, size, "%04x", arg1);
251	break;	251	break;
252	case PCI_LOOKUP_DEVICE:	252	case PCI_LOOKUP_DEVICE:
253	if (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2, 0, 0))	253	if (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2, 0, 0))
254	return n->name;	254	return (char *)n->name;
255	else	255	else
256	res = snprintf(buf, size, "%04x", arg2);	256	res = snprintf(buf, size, "%04x", arg2);
257	break;	257	break;
Lines 273-287 Link Here
273	break;	273	break;
274	case PCI_LOOKUP_VENDOR \| PCI_LOOKUP_SUBSYSTEM:	274	case PCI_LOOKUP_VENDOR \| PCI_LOOKUP_SUBSYSTEM:
275	if (n = nl_lookup(a, num, NL_VENDOR, arg3, 0, 0, 0))	275	if (n = nl_lookup(a, num, NL_VENDOR, arg3, 0, 0, 0))
276	return n->name;	276	return (char *)n->name;
277	else	277	else
278	res = snprintf(buf, size, "%04x", arg2);	278	res = snprintf(buf, size, "%04x", arg2);
279	break;	279	break;
280	case PCI_LOOKUP_DEVICE \| PCI_LOOKUP_SUBSYSTEM:	280	case PCI_LOOKUP_DEVICE \| PCI_LOOKUP_SUBSYSTEM:
281	if (n = nl_lookup(a, num, NL_SUBSYSTEM, arg1, arg2, arg3, arg4))	281	if (n = nl_lookup(a, num, NL_SUBSYSTEM, arg1, arg2, arg3, arg4))
282	return n->name;	282	return (char *)n->name;
283	else if (arg1 == arg3 && arg2 == arg4 && (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2, 0, 0)))	283	else if (arg1 == arg3 && arg2 == arg4 && (n = nl_lookup(a, num, NL_DEVICE, arg1, arg2, 0, 0)))
284	return n->name;	284	return (char *)n->name;
285	else	285	else
286	res = snprintf(buf, size, "%04x", arg4);	286	res = snprintf(buf, size, "%04x", arg4);
287	break;	287	break;
Lines 306-312 Link Here
306	break;	306	break;
307	case PCI_LOOKUP_CLASS:	307	case PCI_LOOKUP_CLASS:
308	if (n = nl_lookup(a, num, NL_SUBCLASS, arg1 >> 8, arg1 & 0xff, 0, 0))	308	if (n = nl_lookup(a, num, NL_SUBCLASS, arg1 >> 8, arg1 & 0xff, 0, 0))
309	return n->name;	309	return (char *)n->name;
310	else if (n = nl_lookup(a, num, NL_CLASS, arg1, 0, 0, 0))	310	else if (n = nl_lookup(a, num, NL_CLASS, arg1, 0, 0, 0))
311	res = snprintf(buf, size, "%s [%04x]", n->name, arg1);	311	res = snprintf(buf, size, "%s [%04x]", n->name, arg1);
312	else	312	else
Lines 314-320 Link Here
314	break;	314	break;
315	case PCI_LOOKUP_PROGIF:	315	case PCI_LOOKUP_PROGIF:
316	if (n = nl_lookup(a, num, NL_PROGIF, arg1 >> 8, arg1 & 0xff, arg2, 0))	316	if (n = nl_lookup(a, num, NL_PROGIF, arg1 >> 8, arg1 & 0xff, arg2, 0))
317	return n->name;	317	return (char *)n->name;
318	if (arg1 == 0x0101)	318	if (arg1 == 0x0101)
319	{	319	{
320	/* IDE controllers have complex prog-if semantics */	320	/* IDE controllers have complex prog-if semantics */

Lines 243-252 Link Here

(-)pciutils-2.1.11.orig/lspci.c (-13 / +13 lines)
243	p->bus,	243	p->bus,
244	p->dev,	244	p->dev,
245	p->func,	245	p->func,
246	pci_lookup_name(pacc, classbuf, sizeof(classbuf),	246	pci_lookup_name(pacc, (char *)classbuf, sizeof(classbuf),
247	PCI_LOOKUP_CLASS,	247	PCI_LOOKUP_CLASS,
248	get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0),	248	get_conf_word(d, PCI_CLASS_DEVICE), 0, 0, 0),
249	pci_lookup_name(pacc, devbuf, sizeof(devbuf),	249	pci_lookup_name(pacc, (char *)devbuf, sizeof(devbuf),
250	PCI_LOOKUP_VENDOR \| PCI_LOOKUP_DEVICE,	250	PCI_LOOKUP_VENDOR \| PCI_LOOKUP_DEVICE,
251	p->vendor_id, p->device_id, 0, 0));	251	p->vendor_id, p->device_id, 0, 0));
252	if (c = get_conf_byte(d, PCI_REVISION_ID))	252	if (c = get_conf_byte(d, PCI_REVISION_ID))
Lines 255-261 Link Here
255	{	255	{
256	char *x;	256	char *x;
257	c = get_conf_byte(d, PCI_CLASS_PROG);	257	c = get_conf_byte(d, PCI_CLASS_PROG);
258	x = pci_lookup_name(pacc, devbuf, sizeof(devbuf),	258	x = pci_lookup_name(pacc, (char *)devbuf, sizeof(devbuf),
259	PCI_LOOKUP_PROGIF,	259	PCI_LOOKUP_PROGIF,
260	get_conf_word(d, PCI_CLASS_DEVICE), c, 0, 0);	260	get_conf_word(d, PCI_CLASS_DEVICE), c, 0, 0);
261	if (c \|\| x)	261	if (c \|\| x)
Lines 1218-1224 Link Here
1218	{	1218	{
1219	*p++ = '\n';	1219	*p++ = '\n';
1220	*p = 0;	1220	*p = 0;
1221	fputs(line, stdout);	1221	fputs((char *)line, stdout);
1222	for(p=line; *p; p++)	1222	for(p=line; *p; p++)
1223	if (p == '+' \|\| p == '\|')	1223	if (p == '+' \|\| p == '\|')
1224	*p = '\|';	1224	*p = '\|';
Lines 1235-1254 Link Here
1235	struct bridge *b;	1235	struct bridge *b;
1236	char namebuf[256];	1236	char namebuf[256];
1237		1237
1238	p += sprintf(p, "%02x.%x", q->dev, q->func);	1238	p += sprintf((char *)p, "%02x.%x", q->dev, q->func);
1239	for(b=&host_bridge; b; b=b->chain)	1239	for(b=&host_bridge; b; b=b->chain)
1240	if (b->br_dev == d)	1240	if (b->br_dev == d)
1241	{	1241	{
1242	if (b->secondary == b->subordinate)	1242	if (b->secondary == b->subordinate)
1243	p += sprintf(p, "-[%02x]-", b->secondary);	1243	p += sprintf((char *)p, "-[%02x]-", b->secondary);
1244	else	1244	else
1245	p += sprintf(p, "-[%02x-%02x]-", b->secondary, b->subordinate);	1245	p += sprintf((char *)p, "-[%02x-%02x]-", b->secondary, b->subordinate);
1246	show_tree_bridge(b, line, p);	1246	show_tree_bridge(b, line, p);
1247	return;	1247	return;
1248	}	1248	}
1249	if (verbose)	1249	if (verbose)
1250	p += sprintf(p, " %s",	1250	p += sprintf((char *)p, " %s",
1251	pci_lookup_name(pacc, namebuf, sizeof(namebuf),	1251	pci_lookup_name(pacc, (char *)namebuf, sizeof(namebuf),
1252	PCI_LOOKUP_VENDOR \| PCI_LOOKUP_DEVICE,	1252	PCI_LOOKUP_VENDOR \| PCI_LOOKUP_DEVICE,
1253	q->vendor_id, q->device_id, 0, 0));	1253	q->vendor_id, q->device_id, 0, 0));
1254	print_it(line, p);	1254	print_it(line, p);
Lines 1288-1294 Link Here
1288	if (!b->first_bus->sibling)	1288	if (!b->first_bus->sibling)
1289	{	1289	{
1290	if (b == &host_bridge)	1290	if (b == &host_bridge)
1291	p += sprintf(p, "[%02x]-", b->first_bus->number);	1291	p += sprintf((char *)p, "[%02x]-", b->first_bus->number);
1292	show_tree_bus(b->first_bus, line, p);	1292	show_tree_bus(b->first_bus, line, p);
1293	}	1293	}
1294	else	1294	else
Lines 1298-1308 Link Here
1298		1298
1299	while (u->sibling)	1299	while (u->sibling)
1300	{	1300	{
1301	k = p + sprintf(p, "+-[%02x]-", u->number);	1301	k = p + sprintf((char *)p, "+-[%02x]-", u->number);
1302	show_tree_bus(u, line, k);	1302	show_tree_bus(u, line, k);
1303	u = u->sibling;	1303	u = u->sibling;
1304	}	1304	}
1305	k = p + sprintf(p, "\\-[%02x]-", u->number);	1305	k = p + sprintf((char *)p, "\\-[%02x]-", u->number);
1306	show_tree_bus(u, line, k);	1306	show_tree_bus(u, line, k);
1307	}	1307	}
1308	}	1308	}
Lines 1313-1319 Link Here
1313	char line[256];	1313	char line[256];
1314		1314
1315	grow_tree();	1315	grow_tree();
1316	show_tree_bridge(&host_bridge, line, line);	1316	show_tree_bridge(&host_bridge, (byte )line, (byte )line);
1317	}	1317	}
1318		1318
1319	/* Bus mapping mode */	1319	/* Bus mapping mode */