CVS commit: src/sys/dev/usb

[Andrius Varanavicius]

Module Name:    src
Committed By:   andvar
Date:           Sun Nov 14 08:32:07 UTC 2021

Modified Files:
        src/sys/dev/usb: uvideo.c uvideoreg.h

Log Message:
revert bPreferedVersion rename. It's named like the by spec (from jmcneill).


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/usb/uvideo.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/uvideoreg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.62 src/sys/dev/usb/uvideo.c:1.63
--- src/sys/dev/usb/uvideo.c:1.62	Sat Nov 13 21:13:41 2021
+++ src/sys/dev/usb/uvideo.c	Sun Nov 14 08:32:07 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvideo.c,v 1.62 2021/11/13 21:13:41 andvar Exp $	*/
+/*	$NetBSD: uvideo.c,v 1.63 2021/11/14 08:32:07 andvar Exp $	*/
 
 /*
  * Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.62 2021/11/13 21:13:41 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.63 2021/11/14 08:32:07 andvar Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2049,11 +2049,11 @@ uvideo_set_format(void *addr, struct vid
 		      UGETDW(probe.dwMaxPayloadTransferSize)));
 	if (vs->vs_probelen == 34) {
 		DPRINTFN(15, (" dwClockFrequency=%u bmFramingInfo=0x%02x "
-			      "bPreferredVersion=%d bMinVersion=%d "
+			      "bPreferedVersion=%d bMinVersion=%d "
 			      "bMaxVersion=%d",
 			      UGETDW(probe.dwClockFrequency),
 			      probe.bmFramingInfo,
-			      probe.bPreferredVersion,
+			      probe.bPreferedVersion,
 			      probe.bMinVersion,
 			      probe.bMaxVersion));
 	}

Index: src/sys/dev/usb/uvideoreg.h
diff -u src/sys/dev/usb/uvideoreg.h:1.5 src/sys/dev/usb/uvideoreg.h:1.6
--- src/sys/dev/usb/uvideoreg.h:1.5	Sat Nov 13 21:13:41 2021
+++ src/sys/dev/usb/uvideoreg.h	Sun Nov 14 08:32:07 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvideoreg.h,v 1.5 2021/11/13 21:13:41 andvar Exp $	*/
+/*	$NetBSD: uvideoreg.h,v 1.6 2021/11/14 08:32:07 andvar Exp $	*/
 
 /*
  * Copyright (c) 2008 Patrick Mahoney
@@ -644,7 +644,7 @@ typedef struct {
 	uByte		bmFramingInfo;
 #define UVIDEO_FRAMING_INFO_FID	(1<<0)
 #define UVIDEO_FRAMING_INFO_EOF	(1<<1)
-	uByte		bPreferredVersion;
+	uByte		bPreferedVersion;
 	uByte		bMinVersion;
 	uByte		bMaxVersion;
 } UPACKED uvideo_probe_and_commit_data_t;