修改点如下,通过节点名称判断usb判断video
-
--- a/kernel/drivers/media/usb/uvc/uvc_driver.c -
+++ b/kernel/drivers/media/usb/uvc/uvc_driver.c -
@@ -1736,7 +1736,10 @@ static int uvc_register_video(struct uvc_device *dev, -
*/ -
stream->vdev = vdev; -
video_set_drvdata(vdev, stream); -
- -
+ -
+ vdev->hw_portnum = dev->udev->hw_portnum; -
+ printk(KERN_ERR"CCCC vdev->hw_portnum=%d\n",vdev->hw_portnum); -
+ -
ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1); -
if (ret < 0) { -
uvc_printk(KERN_ERR, "Failed to register video device (%d).\n", -
diff --git a/kernel/drivers/media/v4l2-core/v4l2-dev.c b/kernel/drivers/media/v4l2-core/v4l2-dev.c -
index ed5040eb2e..3f37eaedd8 100644 -
--- a/kernel/drivers/media/v4l2-core/v4l2-dev.c -
+++ b/kernel/drivers/media/v4l2-core/v4l2-dev.c -
@@ -847,7 +847,23 @@ int __video_register_device(struct video_device *vdev, int type, int nr, -
/* Pick a device node number */ -
mutex_lock(&videodev_lock); -
- nr = devnode_find(vdev, nr == -1 ? 0 : nr, minor_cnt); -
+ -
+ printk(KERN_ERR "AAAA portnum=%d\n",vdev->hw_portnum); -
+ if(vdev->vfl_type == VFL_TYPE_GRABBER) { -
+ printk(KERN_ERR "BBB portnum=%d\n",vdev->hw_portnum); -
+ if(7 == vdev->hw_portnum) { -
+ nr = 7; -
+ }else if(8 == vdev->hw_portnum) { -
+ nr = 8; -
+ } -
+ } -
+ //else -
+ { -
+ -
+ nr = devnode_find(vdev, nr == -1 ? 0 : nr, minor_cnt); -
+ } -
+ -
+// nr = devnode_find(vdev, nr == -1 ? 0 : nr, minor_cnt); -
if (nr == minor_cnt) -
nr = devnode_find(vdev, 0, minor_cnt); -
if (nr == minor_cnt) {
-
--- a/kernel/drivers/usb/core/hub.c -
+++ b/kernel/drivers/usb/core/hub.c -
@@ -2147,15 +2147,24 @@ static void show_string(struct usb_device *udev, char *id, char *string) -
static void announce_device(struct usb_device *udev) -
{ -
- dev_info(&udev->dev, "New USB device found, idVendor=%04x, idProduct=%04x\n", -
+ udev->hw_portnum=0; -
+ printk(KERN_ERR"kobject_name(&udev->dev->kobj)=%s\n",kobject_name(&(udev->dev.kobj))); -
+ if(!strcmp("1-1.1.4",kobject_name(&(udev->dev.kobj)))){ -
+ udev->hw_portnum=7; -
+ }else if(!strcmp("1-1.2.4",kobject_name(&(udev->dev.kobj)))){ -
+ udev->hw_portnum=8; -
+ } -
+ printk(KERN_ERR"udev->hw_portnum=%d\n",udev->hw_portnum); -
+ -
+ dev_info(&udev->dev, "AAA New USB device found, idVendor=%04x, idProduct=%04x\n", -
le16_to_cpu(udev->descriptor.idVendor), -
le16_to_cpu(udev->descriptor.idProduct)); -
dev_info(&udev->dev, -
- "New USB device strings: Mfr=%d, Product=%d, SerialNumber=%d\n", -
+ "AAA New USB device strings: Mfr=%d, Product=%d, SerialNumber=%d\n", -
udev->descriptor.iManufacturer, -
udev->descriptor.iProduct, -
udev->descriptor.iSerialNumber); -
- show_string(udev, "Product", udev->product); -
+ show_string(udev, "AAAProduct", udev->product); -
show_string(udev, "Manufacturer", udev->manufacturer); -
show_string(udev, "SerialNumber", udev->serial); -
} -
@@ -2406,7 +2415,7 @@ int usb_new_device(struct usb_device *udev) -
err = usb_enumerate_device(udev); /* Read descriptors */ -
if (err < 0) -
goto fail; -
- dev_dbg(&udev->dev, "udev %d, busnum %d, minor = %d\n", -
+ printk(KERN_ERR "udev %d, busnum %d, minor = %d\n", -
udev->devnum, udev->bus->busnum, -
(((udev->bus->busnum-1) * 128) + (udev->devnum-1))); -
/* export the usbdev device-node for libusb */
-
--- a/kernel/include/linux/usb.h -
+++ b/kernel/include/linux/usb.h -
@@ -546,6 +546,7 @@ struct usb_device { -
unsigned short bus_mA; -
u8 portnum; -
+ u8 hw_portnum; -
u8 level; -
unsigned can_submit:1; -
diff --git a/kernel/include/media/v4l2-dev.h b/kernel/include/media/v4l2-dev.h -
index 95d1c91770..5421ee172a 100644 -
--- a/kernel/include/media/v4l2-dev.h -
+++ b/kernel/include/media/v4l2-dev.h -
@@ -126,7 +126,7 @@ struct video_device -
struct list_head fh_list; /* List of struct v4l2_fh */ -
int debug; /* Activates debug level*/ -
- -
+ int hw_portnum; /*usb hw port*/ -
/* Video standard vars */ -
v4l2_std_id tvnorms; /* Supported tv norms */ -
v4l2_std_id current_norm; /* Current tvnorm */
下面那个毛用都没有,portnum usb插拔情况下会变化
转载自:https://www.cnblogs.com/zou107/p/7895111.html
在Android的系统会有前置摄像头和后置摄像头的定义,摄像头分为SOC类型的摄像头和USB这一类的摄像头,接下要分析就是USB摄像头这一类 。
一般在android或者linux系统中分析一个模块,先从总体的框架上有一个认识,然后在局部细细的研究。
一、Android 摄像头总体架构
上面的框架,分析的比较粗糙,主要是一些自己看代码后总结下来的东西。以USB摄像为例,在插入的USB摄像头后,会生成/dev/video0这样的设备节点,而在硬件抽象层中,会去判断是否存在该设备节点,以提供给android系统层使用。再往上分析就是android部分的了,先暂时不分析。
二、Linux层中UVC摄像头注册流程
在USB子系统判断有UVC设备接入后,会去调用uvc_probe(代码位置:/driver/media/uvc/uvc_driver.c)来完成USB摄像头的创建,通过一步一步的分析,最终会走到v4L2框架中,创建摄像头的设备节点。
三、固定USB摄像头硬件端口
前面分析了这么多,都是为了接下来的做准备。
现在客户那么使用我们的主板机器,其中会使用两个USB摄像头,一个作为前置摄像头用于人脸识别,一个用于后置摄像头,由于在安装时并不知道那个端口的摄像头先插入,那个后插入(设备节点中先接入的就会分配video0,而在android中一般定义video0为后置摄像头,video1为前置摄像头),就导致android系统层前后置摄像头混乱。
为了解决该问题,就需要在驱动中,将前后置摄像头和USB的硬件端口做一个绑定。
具体改法如下:
(1) 在/include/media/v4l2-dev.h的video_device结构体中添加变量portnum
-
struct video_device -
struct list_head fh_list; /* List of struct v4l2_fh */ -
int debug; /* Activates debug level*/ -
+ int portnum; /*usb hw port*/
(2)在/drivers/media/usb/uvc/uvc_driver.c的uvc_register_video函数中添加vdev->portnum = dev->udev->portnum;
-
static int uvc_register_video(struct uvc_device *dev, -
... -
stream->vdev = vdev; -
video_set_drvdata(vdev, stream); -
+ vdev->portnum = dev->udev->portnum; -
ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
这里先将USB的portnum存下来,在创建设备节点的是否,就会根据该变量来区分硬件的上哪个USB是前置,哪个USB是后置了
(3)在/drivers/media/v4l2-core/v4l2-dev.c的__video_register_device函数中,修改
-
int __video_register_device(struct video_device *vdev, int type, int nr, -
... -
/* Pick a device node number */ -
mutex_lock(&videodev_lock);+ if(vdev->vfl_type == VFL_TYPE_GRABBER) { -
+ if(4 == vdev->portnum) { -
+ nr = 1; -
+ }else { -
+ nr = 0; -
+ } -
+ }else { -
+ nr = devnode_find(vdev, nr == -1 ? 0 : nr, minor_cnt); -
+ } -
+ -
if (nr == minor_cnt) -
nr = devnode_find(vdev, 0, minor_cnt); -
if (nr == minor_cnt) {
注意:这里的“4 == vdev->portnum”是根据时机板子的端口上的,在调试的时候,可以先将portnum变量的值打印出来,就知道如何区分了。