Attachment 8286 Details for Bug 17425 – file.diff

[patch] file.diff

file.diff (text/plain), 2.58 KB, created by spock on 2000-03-17 04:40:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: spock

Created: 2000-03-17 04:40:04 UTC

Size: 2.58 KB

patch

obsolete

>Index: ppbconf.c
>===================================================================
>RCS file: /home/ncvs/src/sys/dev/ppbus/ppbconf.c,v
>retrieving revision 1.17
>diff -u -r1.17 ppbconf.c
>--- ppbconf.c	2000/01/23 14:41:04	1.17
>+++ ppbconf.c	2000/03/17 04:34:19
>@@ -262,7 +262,8 @@
> 
> 	printf(">");
> 
>-	if ((token = search_token(str, len, "CLS")) != NULL) {
>+	if ((token = search_token(str, len, "CLS")) != NULL ||
>+	    (token = search_token(str, len, "CLASS")) != NULL) {
> 		class = search_token(token, UNKNOWN_LENGTH, ":") + 1;
> 		printf(" %s", class);
> 	}
>@@ -300,6 +301,7 @@
> 	struct ppb_data * ppb = (struct ppb_data *)device_get_softc(bus);
> 	int error = 0;
> 	int unit = device_get_unit(bus);
>+	short int nmodes = 0;
> 
> 	/* try all IEEE1284 modes, for one device only
> 	 * 
>@@ -317,27 +319,27 @@
> 	printf("ppbus%d: IEEE1284 device found ", unit);
> 
> 	if (!(error = ppb_1284_negociate(bus, PPB_NIBBLE, 0))) {
>-		printf("/NIBBLE");
>+		printf("%sNIBBLE", nmodes++ ? "/" : "");
> 		ppb_1284_terminate(bus);
> 	}
> 
> 	if (!(error = ppb_1284_negociate(bus, PPB_PS2, 0))) {
>-		printf("/PS2");
>+		printf("%sPS2", nmodes++ ? "/" : "");
> 		ppb_1284_terminate(bus);
> 	}
> 
> 	if (!(error = ppb_1284_negociate(bus, PPB_ECP, 0))) {
>-		printf("/ECP");
>+		printf("%sECP", nmodes++ ? "/" : "");
> 		ppb_1284_terminate(bus);
> 	}
> 
> 	if (!(error = ppb_1284_negociate(bus, PPB_ECP, PPB_USE_RLE))) {
>-		printf("/ECP_RLE");
>+		printf("%sECP_RLE", nmodes++ ? "/" : "");
> 		ppb_1284_terminate(bus);
> 	}
> 
> 	if (!(error = ppb_1284_negociate(bus, PPB_EPP, 0))) {
>-		printf("/EPP");
>+		printf("%sEPP", nmodes++ ? "/" : "");
> 		ppb_1284_terminate(bus);
> 	}
> 
>@@ -345,31 +347,31 @@
> 	if (bootverbose) {
> 		if (!(error = ppb_1284_negociate(bus, PPB_NIBBLE,
> 				PPB_REQUEST_ID))) {
>-			printf("/NIBBLE_ID");
>+			printf("%sNIBBLE_ID", nmodes++ ? "/" : "");
> 			ppb_1284_terminate(bus);
> 		}
> 
> 		if (!(error = ppb_1284_negociate(bus, PPB_PS2,
> 				PPB_REQUEST_ID))) {
>-			printf("/PS2_ID");
>+			printf("%sPS2_ID", nmodes++ ? "/" : "");
> 			ppb_1284_terminate(bus);
> 		}
> 
> 		if (!(error = ppb_1284_negociate(bus, PPB_ECP,
> 				PPB_REQUEST_ID))) {
>-			printf("/ECP_ID");
>+			printf("%sECP_ID", nmodes++ ? "/" : "");
> 			ppb_1284_terminate(bus);
> 		}
> 
> 		if (!(error = ppb_1284_negociate(bus, PPB_ECP,
> 				PPB_REQUEST_ID | PPB_USE_RLE))) {
>-			printf("/ECP_RLE_ID");
>+			printf("%sECP_RLE_ID", nmodes++ ? "/" : "");
> 			ppb_1284_terminate(bus);
> 		}
> 
> 		if (!(error = ppb_1284_negociate(bus, PPB_COMPATIBLE,
> 				PPB_EXTENSIBILITY_LINK))) {
>-			printf("/Extensibility Link");
>+			printf("%sExtensibility Link", nmodes++ ? "/" : "");
> 			ppb_1284_terminate(bus);
> 		}
> 	}

Actions: View | Diff

Attachments on bug 17425: 8286