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

(-)ppbconf.c (-11 / +13 lines)
Lines 262-268 Link Here
262
262
263
	printf(">");
263
	printf(">");
264
264
265
	if ((token = search_token(str, len, "CLS")) != NULL) {
265
	if ((token = search_token(str, len, "CLS")) != NULL ||
266
	    (token = search_token(str, len, "CLASS")) != NULL) {
266
		class = search_token(token, UNKNOWN_LENGTH, ":") + 1;
267
		class = search_token(token, UNKNOWN_LENGTH, ":") + 1;
267
		printf(" %s", class);
268
		printf(" %s", class);
268
	}
269
	}
Lines 300-305 Link Here
300
	struct ppb_data * ppb = (struct ppb_data *)device_get_softc(bus);
301
	struct ppb_data * ppb = (struct ppb_data *)device_get_softc(bus);
301
	int error = 0;
302
	int error = 0;
302
	int unit = device_get_unit(bus);
303
	int unit = device_get_unit(bus);
304
	short int nmodes = 0;
303
305
304
	/* try all IEEE1284 modes, for one device only
306
	/* try all IEEE1284 modes, for one device only
305
	 * 
307
	 * 
Lines 317-343 Link Here
317
	printf("ppbus%d: IEEE1284 device found ", unit);
319
	printf("ppbus%d: IEEE1284 device found ", unit);
318
320
319
	if (!(error = ppb_1284_negociate(bus, PPB_NIBBLE, 0))) {
321
	if (!(error = ppb_1284_negociate(bus, PPB_NIBBLE, 0))) {
320
		printf("/NIBBLE");
322
		printf("%sNIBBLE", nmodes++ ? "/" : "");
321
		ppb_1284_terminate(bus);
323
		ppb_1284_terminate(bus);
322
	}
324
	}
323
325
324
	if (!(error = ppb_1284_negociate(bus, PPB_PS2, 0))) {
326
	if (!(error = ppb_1284_negociate(bus, PPB_PS2, 0))) {
325
		printf("/PS2");
327
		printf("%sPS2", nmodes++ ? "/" : "");
326
		ppb_1284_terminate(bus);
328
		ppb_1284_terminate(bus);
327
	}
329
	}
328
330
329
	if (!(error = ppb_1284_negociate(bus, PPB_ECP, 0))) {
331
	if (!(error = ppb_1284_negociate(bus, PPB_ECP, 0))) {
330
		printf("/ECP");
332
		printf("%sECP", nmodes++ ? "/" : "");
331
		ppb_1284_terminate(bus);
333
		ppb_1284_terminate(bus);
332
	}
334
	}
333
335
334
	if (!(error = ppb_1284_negociate(bus, PPB_ECP, PPB_USE_RLE))) {
336
	if (!(error = ppb_1284_negociate(bus, PPB_ECP, PPB_USE_RLE))) {
335
		printf("/ECP_RLE");
337
		printf("%sECP_RLE", nmodes++ ? "/" : "");
336
		ppb_1284_terminate(bus);
338
		ppb_1284_terminate(bus);
337
	}
339
	}
338
340
339
	if (!(error = ppb_1284_negociate(bus, PPB_EPP, 0))) {
341
	if (!(error = ppb_1284_negociate(bus, PPB_EPP, 0))) {
340
		printf("/EPP");
342
		printf("%sEPP", nmodes++ ? "/" : "");
341
		ppb_1284_terminate(bus);
343
		ppb_1284_terminate(bus);
342
	}
344
	}
343
345
Lines 345-375 Link Here
345
	if (bootverbose) {
347
	if (bootverbose) {
346
		if (!(error = ppb_1284_negociate(bus, PPB_NIBBLE,
348
		if (!(error = ppb_1284_negociate(bus, PPB_NIBBLE,
347
				PPB_REQUEST_ID))) {
349
				PPB_REQUEST_ID))) {
348
			printf("/NIBBLE_ID");
350
			printf("%sNIBBLE_ID", nmodes++ ? "/" : "");
349
			ppb_1284_terminate(bus);
351
			ppb_1284_terminate(bus);
350
		}
352
		}
351
353
352
		if (!(error = ppb_1284_negociate(bus, PPB_PS2,
354
		if (!(error = ppb_1284_negociate(bus, PPB_PS2,
353
				PPB_REQUEST_ID))) {
355
				PPB_REQUEST_ID))) {
354
			printf("/PS2_ID");
356
			printf("%sPS2_ID", nmodes++ ? "/" : "");
355
			ppb_1284_terminate(bus);
357
			ppb_1284_terminate(bus);
356
		}
358
		}
357
359
358
		if (!(error = ppb_1284_negociate(bus, PPB_ECP,
360
		if (!(error = ppb_1284_negociate(bus, PPB_ECP,
359
				PPB_REQUEST_ID))) {
361
				PPB_REQUEST_ID))) {
360
			printf("/ECP_ID");
362
			printf("%sECP_ID", nmodes++ ? "/" : "");
361
			ppb_1284_terminate(bus);
363
			ppb_1284_terminate(bus);
362
		}
364
		}
363
365
364
		if (!(error = ppb_1284_negociate(bus, PPB_ECP,
366
		if (!(error = ppb_1284_negociate(bus, PPB_ECP,
365
				PPB_REQUEST_ID | PPB_USE_RLE))) {
367
				PPB_REQUEST_ID | PPB_USE_RLE))) {
366
			printf("/ECP_RLE_ID");
368
			printf("%sECP_RLE_ID", nmodes++ ? "/" : "");
367
			ppb_1284_terminate(bus);
369
			ppb_1284_terminate(bus);
368
		}
370
		}
369
371
370
		if (!(error = ppb_1284_negociate(bus, PPB_COMPATIBLE,
372
		if (!(error = ppb_1284_negociate(bus, PPB_COMPATIBLE,
371
				PPB_EXTENSIBILITY_LINK))) {
373
				PPB_EXTENSIBILITY_LINK))) {
372
			printf("/Extensibility Link");
374
			printf("%sExtensibility Link", nmodes++ ? "/" : "");
373
			ppb_1284_terminate(bus);
375
			ppb_1284_terminate(bus);
374
		}
376
		}
375
	}
377
	}

Return to bug 17425