X-Git-Url: https://git.ao2.it/gspca_kinect.git/blobdiff_plain/e300459cf61b2167a588baf548bb98ad6e68220e..1157c00add57c96b179896fc1b8051a1ad8970a1:/kinect.c

diff --git a/kinect.c b/kinect.c
index 1d7a74f..b5077ca 100644
--- a/kinect.c
+++ b/kinect.c
@@ -68,11 +68,11 @@ static const struct ctrl sd_ctrls[] = {
 #define MODE_1280x1024 0x0002
 
 #define FORMAT_BAYER   0x0010
-#define FORMAT_UYUV    0x0020
+#define FORMAT_UYVY    0x0020
 
 #define FPS_HIGH       0x0100
 
-static const struct v4l2_pix_format color_camera_mode[] = {
+static const struct v4l2_pix_format video_camera_mode[] = {
 	{640, 480, V4L2_PIX_FMT_SGRBG8, V4L2_FIELD_NONE,
 	 .bytesperline = 640,
 	 .sizeimage = 640 * 480,
@@ -82,7 +82,7 @@ static const struct v4l2_pix_format color_camera_mode[] = {
 	 .bytesperline = 640 * 2,
 	 .sizeimage = 640 * 480 * 2,
 	 .colorspace = V4L2_COLORSPACE_SRGB,
-	 .priv = MODE_640x480 | FORMAT_UYUV},
+	 .priv = MODE_640x480 | FORMAT_UYVY},
 	{1280, 1024, V4L2_PIX_FMT_SGRBG8, V4L2_FIELD_NONE,
 	 .bytesperline = 1280,
 	 .sizeimage = 1280 * 1024,
@@ -211,8 +211,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
 
 	cam = &gspca_dev->cam;
 
-	cam->cam_mode = color_camera_mode;
-	cam->nmodes = ARRAY_SIZE(color_camera_mode);
+	cam->cam_mode = video_camera_mode;
+	cam->nmodes = ARRAY_SIZE(video_camera_mode);
 
 	//cam->npkt = 15;
 	//gspca_dev->pkt_size = 960 * 2;
@@ -242,7 +242,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
 	fps_reg = 0x0e;
 
 	/* format */
-	if (mode & FORMAT_UYUV)
+	if (mode & FORMAT_UYVY)
 		fmt_val = 0x05;
 	else
 		fmt_val = 0x00;