Commit 25c61e4c authored by Frank Schaefer's avatar Frank Schaefer Committed by Mauro Carvalho Chehab
Browse files

[media] em28xx: move norm_maxw() and norm_maxh() from em28xx.h to em28xx-video.c 



Signed-off-by: default avatarFrank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent cba8e9b3

drivers/media/usb/em28xx/em28xx-video.c

+23 −0
Original line number Diff line number Diff line
@@ -141,6 +141,29 @@ static struct em28xx_fmt format[] = { 
	},

};



/*FIXME: maxw should be dependent of alt mode */

static inline unsigned int norm_maxw(struct em28xx *dev)

{

	if (dev->board.is_webcam)

		return dev->sensor_xres;



	if (dev->board.max_range_640_480)

		return 640;



	return 720;

}



static inline unsigned int norm_maxh(struct em28xx *dev)

{

	if (dev->board.is_webcam)

		return dev->sensor_yres;



	if (dev->board.max_range_640_480)

		return 480;



	return (dev->norm & V4L2_STD_625_50) ? 576 : 480;

}



static int em28xx_vbi_supported(struct em28xx *dev)

{

	/* Modprobe option to manually disable */

drivers/media/usb/em28xx/em28xx.h

+0 −22
Original line number Diff line number Diff line
@@ -794,26 +794,4 @@ int em28xx_init_camera(struct em28xx *dev); 
	printk(KERN_WARNING "%s: "fmt,\

			dev->name , ##arg); } while (0)



/*FIXME: maxw should be dependent of alt mode */

static inline unsigned int norm_maxw(struct em28xx *dev)

{

	if (dev->board.is_webcam)

		return dev->sensor_xres;



	if (dev->board.max_range_640_480)

		return 640;



	return 720;

}



static inline unsigned int norm_maxh(struct em28xx *dev)

{

	if (dev->board.is_webcam)

		return dev->sensor_yres;



	if (dev->board.max_range_640_480)

		return 480;



	return (dev->norm & V4L2_STD_625_50) ? 576 : 480;

}

#endif