Attachment #48596 for bug #74360

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




static void
dump_deviceids_pci()
{
	struct assign *manf, *dev, *devid;
	struct section *sec;
	struct assign *assign;
	char xpsec[256];


	TAILQ_FOREACH(assign, &ah, link) {
		if (assign->section == sec) {
			devid = find_assign("strings", assign->vals[1]);
			if (strcasestr(devid->vals[0], "PCI") != NULL) {
				found++;
				break;
			}

	TAILQ_FOREACH(assign, &ah, link) {
		if (assign->section == sec) {
			dev = find_assign("strings", assign->key);
			devid = find_assign("strings", assign->vals[1]);
			/* Emit device IDs. */
			if (strcasestr(devid->vals[0], "PCI") != NULL)
				dump_pci_id(devid->vals[0]);
			else
				continue;
			/* Emit device description */

static void
dump_deviceids_pcmcia()
{
	struct assign *manf, *dev, *devid;
	struct section *sec;
	struct assign *assign;
	char xpsec[256];


	TAILQ_FOREACH(assign, &ah, link) {
		if (assign->section == sec) {
			devid = find_assign("strings", assign->vals[1]);
			if (strcasestr(devid->vals[0], "PCMCIA") != NULL) {
				found++;
				break;
			}

	TAILQ_FOREACH(assign, &ah, link) {
		if (assign->section == sec) {
			dev = find_assign("strings", assign->key);
			devid = find_assign("strings", assign->vals[1]);
			/* Emit device IDs. */
			if (strcasestr(devid->vals[0], "PCMCIA") != NULL)
				dump_pcmcia_id(devid->vals[0]);
			else
				continue;
			/* Emit device description */

Return to bug 74360

Lines 233-239 dump_pci_id(const char *s) Link Here

(-)usr.sbin/ndiscvt/inf.c (-10 / +12 lines)
233	static void	233	static void
234	dump_deviceids_pci()	234	dump_deviceids_pci()
235	{	235	{
236	struct assign manf, dev;	236	struct assign manf, dev, *devid;
237	struct section *sec;	237	struct section *sec;
238	struct assign *assign;	238	struct assign *assign;
239	char xpsec[256];	239	char xpsec[256];
Lines 258-265 dump_deviceids_pci() Link Here
258		258
259	TAILQ_FOREACH(assign, &ah, link) {	259	TAILQ_FOREACH(assign, &ah, link) {
260	if (assign->section == sec) {	260	if (assign->section == sec) {
261	dev = find_assign("strings", assign->key);	261	devid = find_assign("strings", assign->vals[1]);
262	if (strcasestr(assign->vals[1], "PCI") != NULL) {	262	if (strcasestr(devid->vals[0], "PCI") != NULL) {
263	found++;	263	found++;
264	break;	264	break;
265	}	265	}
Lines 285-293 retry: Link Here
285	TAILQ_FOREACH(assign, &ah, link) {	285	TAILQ_FOREACH(assign, &ah, link) {
286	if (assign->section == sec) {	286	if (assign->section == sec) {
287	dev = find_assign("strings", assign->key);	287	dev = find_assign("strings", assign->key);
		288	devid = find_assign("strings", assign->vals[1]);
288	/* Emit device IDs. */	289	/* Emit device IDs. */
289	if (strcasestr(assign->vals[1], "PCI") != NULL)	290	if (strcasestr(devid->vals[0], "PCI") != NULL)
290	dump_pci_id(assign->vals[1]);	291	dump_pci_id(devid->vals[0]);
291	else	292	else
292	continue;	293	continue;
293	/* Emit device description */	294	/* Emit device description */
Lines 312-318 retry: Link Here
312	static void	313	static void
313	dump_deviceids_pcmcia()	314	dump_deviceids_pcmcia()
314	{	315	{
315	struct assign manf, dev;	316	struct assign manf, dev, *devid;
316	struct section *sec;	317	struct section *sec;
317	struct assign *assign;	318	struct assign *assign;
318	char xpsec[256];	319	char xpsec[256];
Lines 337-344 dump_deviceids_pcmcia() Link Here
337		338
338	TAILQ_FOREACH(assign, &ah, link) {	339	TAILQ_FOREACH(assign, &ah, link) {
339	if (assign->section == sec) {	340	if (assign->section == sec) {
340	dev = find_assign("strings", assign->key);	341	devid = find_assign("strings", assign->vals[1]);
341	if (strcasestr(assign->vals[1], "PCMCIA") != NULL) {	342	if (strcasestr(devid->vals[0], "PCMCIA") != NULL) {
342	found++;	343	found++;
343	break;	344	break;
344	}	345	}
Lines 364-372 retry: Link Here
364	TAILQ_FOREACH(assign, &ah, link) {	365	TAILQ_FOREACH(assign, &ah, link) {
365	if (assign->section == sec) {	366	if (assign->section == sec) {
366	dev = find_assign("strings", assign->key);	367	dev = find_assign("strings", assign->key);
		368	devid = find_assign("strings", assign->vals[1]);
367	/* Emit device IDs. */	369	/* Emit device IDs. */
368	if (strcasestr(assign->vals[1], "PCMCIA") != NULL)	370	if (strcasestr(devid->vals[0], "PCMCIA") != NULL)
369	dump_pcmcia_id(assign->vals[1]);	371	dump_pcmcia_id(devid->vals[0]);
370	else	372	else
371	continue;	373	continue;
372	/* Emit device description */	374	/* Emit device description */