usb webcam: turn run-scripts into sculpt tests

Ref genodelabs/genode#5401
This commit is contained in:
Stefan Kalkowski 2024-12-10 11:14:05 +01:00 committed by Christian Helmuth
parent cd6701c483
commit ebb159d32d
17 changed files with 211 additions and 357 deletions

View File

@ -0,0 +1,24 @@
<config arch="" info="webcam example">
<common_routes>
<service name="ROM" label_last="ld.lib.so"> <parent/> </service>
<service name="ROM" label_last="init"> <parent/> </service>
<service name="CPU"> <parent/> </service>
<service name="PD"> <parent/> </service>
<service name="LOG"> <parent/> </service>
<service name="Timer"> <parent/> </service>
<service name="Capture"> <parent/> </service>
<service name="Gui"> <parent/> </service>
</common_routes>
<start name="webcam" ram="64M" pkg="usb_webcam">
<route>
<service name="Usb"> <child name="usb"/> </service>
<any-service> <parent /> </any-service>
</route>
<provides> <service name="Capture"/> <service name="Report"/> </provides>
</start>
<start name="test-capture"/>
</config>

View File

@ -0,0 +1,9 @@
<launcher name="test-capture" pkg="test-capture">
<config period_ms="20" width="640" height="480">
<view xpos="100" ypos="100"/> <!--view xpos="800" ypos="600"/-->
</config>
<route>
<service name="Capture"> <child name="webcam"/> </service>
<any-service> <parent/> </any-service>
</route>
</launcher>

View File

@ -0,0 +1,10 @@
<launcher name="test-vfs_capture" pkg="test-vfs_capture">
<config period_ms="20" width="640" height="480">
<vfs><dir name="dev"><capture/></dir></vfs>
<view xpos="100" ypos="100"/> <!--view xpos="800" ypos="600"/-->
</config>
<route>
<service name="Capture"> <child name="webcam"/> </service>
<any-service> <parent/> </any-service>
</route>
</launcher>

View File

@ -0,0 +1,25 @@
<config bios_handoff="no">
<!-- available devices are listed at /report/runtime/usb/devices -->
<policy label="webcam -> webcam -> usb_webcam -> ">
<device vendor_id="0x5986" product_id="0x366"/> <!-- Lenovo x250 -->
<device vendor_id="0x5986" product_id="0x706"/> <!-- Lenovo x260 -->
<device vendor_id="0x0bda" product_id="0x58db"/> <!-- Lenovo T470 -->
<device vendor_id="0x04f2" product_id="0xb564"/> <!-- Fujitsu S938 -->
<!-- Logitec C920 -->
<!-- <device vendor_id="0x046d" product_id="0x8e5"/> -->
<!-- Logitec C270 -->
<!-- <device vendor_id="0x046d" product_id="0x825"/> -->
<!-- Quickcam -->
<!-- <device vendor_id="0x046d" product_id="0x9c1"/> -->
<!-- Creative HD VF0770 -->
<!-- <device vendor_id="0x041e" product_id="0x4095"/> -->
</policy>
</config>

View File

@ -0,0 +1,6 @@
drivers: pc
ram_fs: depot
import: pkg/sculpt_drivers-pc pkg/test-capture pkg/test-vfs_capture
deploy: webcam
usb: webcam
launcher: test-capture test-vfs_capture

View File

@ -1,5 +1,4 @@
_/src/usb_webcam
_/raw/usb_webcam
_/src/init
_/src/jpeg
_/src/libc

View File

@ -1,4 +1,4 @@
<runtime binary="init" caps="900" ram="64M" config="usb_webcam.config">
<runtime binary="init" caps="900" ram="64M">
<provides> <capture /> </provides>
<requires> <timer /> <usb /> </requires>
<content>
@ -15,9 +15,120 @@
<rom label="libusb.lib.so"/>
<rom label="libuvc.lib.so"/>
<rom label="stdcxx.lib.so"/>
<rom label="usb_webcam.config"/>
<rom label="nitpicker"/>
<rom label="report_rom"/>
<rom label="rom_filter"/>
</content>
<config>
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Timer"/>
<service name="Usb"/>
</parent-provides>
<default caps="100"/>
<service name="Capture"> <default-policy> <child name="nitpicker_camera"/> </default-policy> </service>
<start name="nitpicker_camera" caps="150">
<binary name="nitpicker"/>
<resource name="RAM" quantum="4M"/>
<provides>
<service name="Gui"/> <service name="Capture"/>
</provides>
<config request_framebuffer="no">
<report panorama="yes"/>
<capture/>
<domain name="" layer="1" content="client" label="no" />
<default-policy domain=""/>
</config>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="report_rom">
<binary name="report_rom"/>
<resource name="RAM" quantum="2M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides>
<config verbose="no">
<policy label="webcam_config -> panorama" report="nitpicker_camera -> panorama"/>
</config>
<route>
<any-service> <parent /> </any-service>
</route>
</start>
<start name="webcam_config">
<binary name="rom_filter"/>
<resource name="RAM" quantum="1M"/>
<provides> <service name="ROM"/> </provides>
<config verbose="no">
<input name="capture_width" rom="panorama" node="panorama" default="">
<node type="capture">
<attribute name="width"/>
</node>
</input>
<output node="config">
<if> <has_value input="capture_width" value=""/>
<then> </then>
<else>
<inline>
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Timer"/>
<service name="Gui"/>
<service name="Usb"/>
</parent-provides>
<start name="usb_webcam" caps="300">
<resource name="RAM" quantum="52M"/>
<config ld_verbose="no" enabled="yes" width="640" height="480" format="yuv" fps="15">
<vfs>
<dir name="dev">
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
<libusb/>
</dir>
<dir name="pipe"> <pipe/> </dir>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/pipe"/>
<env key="LIBUSB_DEBUG" value="0"/>
</config>
<route>
<any-service> <parent/> </any-service>
</route>
</start>
</inline>
</else></if>
</output>
</config>
<route>
<service name="ROM" label="panorama"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="webcam" caps="400">
<binary name="init"/>
<resource name="RAM" quantum="54M"/>
<route>
<service name="ROM" label="config">
<child name="webcam_config" label="config"/>
</service>
<service name="Gui"> <child name="nitpicker_camera"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
</config>
</runtime>

View File

@ -1,4 +0,0 @@
content: usb_webcam.config
usb_webcam.config:
cp $(REP_DIR)/recipes/raw/usb_webcam/$@ $@

View File

@ -1 +0,0 @@
2024-10-29 47a96974acde8af769295aaf7f4de1ea4d5a7f15

View File

@ -1,113 +0,0 @@
<config verbose="no">
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Timer"/>
<service name="Usb"/>
</parent-provides>
<default caps="100"/>
<service name="Capture"> <default-policy> <child name="nitpicker_camera"/> </default-policy> </service>
<start name="nitpicker_camera" caps="150">
<binary name="nitpicker"/>
<resource name="RAM" quantum="4M"/>
<provides>
<service name="Gui"/> <service name="Capture"/>
</provides>
<config request_framebuffer="no">
<report panorama="yes"/>
<capture/>
<domain name="" layer="1" content="client" label="no" />
<default-policy domain=""/>
</config>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="report_rom">
<binary name="report_rom"/>
<resource name="RAM" quantum="2M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides>
<config verbose="no">
<policy label="webcam_config -> panorama" report="nitpicker_camera -> panorama"/>
</config>
<route>
<any-service> <parent /> </any-service>
</route>
</start>
<start name="webcam_config">
<binary name="rom_filter"/>
<resource name="RAM" quantum="1M"/>
<provides> <service name="ROM"/> </provides>
<config verbose="no">
<input name="capture_width" rom="panorama" node="panorama" default="">
<node type="capture">
<attribute name="width"/>
</node>
</input>
<output node="config">
<if> <has_value input="capture_width" value=""/>
<then> </then>
<else>
<inline>
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Timer"/>
<service name="Gui"/>
<service name="Usb"/>
</parent-provides>
<start name="usb_webcam" caps="300">
<resource name="RAM" quantum="52M"/>
<config ld_verbose="no" enabled="yes" width="640" height="480" format="yuv" fps="15">
<vfs>
<dir name="dev">
<log/>
<inline name="rtc">2018-01-01 00:01</inline>
<libusb/>
</dir>
<dir name="pipe"> <pipe/> </dir>
</vfs>
<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" pipe="/pipe"/>
<env key="LIBUSB_DEBUG" value="0"/>
</config>
<route>
<any-service> <parent/> </any-service>
</route>
</start>
</inline>
</else></if>
</output>
</config>
<route>
<service name="ROM" label="panorama"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="webcam" caps="400">
<binary name="init"/>
<resource name="RAM" quantum="54M"/>
<route>
<service name="ROM" label="config">
<child name="webcam_config" label="config"/>
</service>
<service name="Gui"> <child name="nitpicker_camera"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
</config>

View File

@ -1,221 +0,0 @@
assert_spec x86
# fuji4
proc libuvc_vendor_id {} { return "0x04f2" }
proc libuvc_product_id {} { return "0xb564" }
# c270
#proc libuvc_vendor_id {} { return "0x046d" }
#proc libuvc_product_id {} { return "0x0825" }
# quickcam
#proc libuvc_vendor_id {} { return "0x046d" }
#proc libuvc_product_id {} { return "0x09c1" }
# t470
#proc libuvc_vendor_id {} { return "0x0bda" }
#proc libuvc_product_id {} { return "0x58db" }
create_boot_directory
import_from_depot [depot_user]/src/[base_src] \
[depot_user]/pkg/usb_webcam \
[depot_user]/src/acpi \
[depot_user]/src/dynamic_rom \
[depot_user]/src/init \
[depot_user]/src/nitpicker \
[depot_user]/src/pc_usb_host \
[depot_user]/src/pci_decode \
[depot_user]/src/platform \
[depot_user]/src/report_rom \
[depot_user]/src/rom_reporter \
[depot_user]/src/vesa_fb
import_from_depot $test_imports
append config {
<config verbose="no" prio_levels="2">
<parent-provides>
<service name="ROM"/>
<service name="IRQ"/>
<service name="IO_MEM"/>
<service name="IO_PORT"/>
<service name="PD"/>
<service name="RM"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="VM"/>
</parent-provides>
<default-route>
<any-service> <parent/> <any-child/> </any-service>
</default-route>
<default caps="100"/>
<start name="timer">
<resource name="RAM" quantum="1M"/>
<provides><service name="Timer"/></provides>
<route>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="report_rom">
<resource name="RAM" quantum="2M"/>
<provides> <service name="Report"/> <service name="ROM"/> </provides>
<config>
<policy label="pci_decode -> system" report="acpi -> acpi"/>
<policy label="platform -> devices" report="pci_decode -> devices"/>
</config>
</start>
<start name="acpi" caps="350">
<resource name="RAM" quantum="4M"/>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="pci_decode" caps="350">
<resource name="RAM" quantum="2M"/>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<service name="ROM" label="system"> <child name="report_rom"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="platform" caps="100" managing_system="yes">
<resource name="RAM" quantum="2M"/>
<provides>
<service name="Platform"/>
</provides>
<route>
<service name="ROM" label="devices"> <child name="report_rom"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<any-service> <parent/> </any-service>
</route>
<config>
<policy label="usb -> " info="yes"> <pci class="USB"/> </policy>
<policy label="fb -> " info="yes"> <pci class="VGA"/> </policy>
</config>
</start>
<start name="usb" priority="0" caps="200">
<binary name="pc_usb_host"/>
<resource name="RAM" quantum="16M"/>
<!-- <resource name="CPU" quantum="10"/> -->
<provides><service name="Usb"/></provides>
<config bios_handoff="no">
<policy label_suffix="usb_webcam -> ">
<device vendor_id="} [libuvc_vendor_id] {" product_id="} [libuvc_product_id] {"/>
</policy>
</config>
<route>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>
<start name="fb" priority="-1" caps="150">
<binary name="vesa_fb"/>
<resource name="RAM" quantum="20M"/>
<config/>
<route>
<service name="Capture"> <child name="nitpicker"/> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>
<start name="nitpicker" priority="-1" caps="150">
<resource name="RAM" quantum="12M"/>
<provides>
<service name="Gui"/> <service name="Capture"/> <service name="Event"/>
</provides>
<config>
<capture/>
<report focus="yes" hover="yes" />
<domain name="" layer="3" content="client" label="no" focus="click" hover="always"/>
<default-policy domain=""/>
</config>
<route>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child /> </any-service>
</route>
</start>
<start name="test_config" priority="-1">
<binary name="dynamic_rom"/>
<resource name="RAM" quantum="1M"/>
<provides> <service name="ROM"/> </provides>
<config verbose="yes">
<rom name="config">
<inline>
<config verbose="no">
<parent-provides>
<service name="ROM"/>
<service name="PD"/>
<service name="CPU"/>
<service name="LOG"/>
<service name="Timer"/>
<service name="Gui"/>
<service name="Capture"/>
</parent-provides>
<start name="} $test_binary {" caps="100">
<resource name="RAM" quantum="15M"/>
<config period_ms="20" width="640" height="480"> }
append config $test_vfs_config
append config {
<view xpos="100" ypos="100"/> <!--view xpos="800" ypos="600"/-->
</config>
<route>
<any-service> <parent/> </any-service>
</route>
</start>
</config>
</inline>
<sleep milliseconds="7000"/>
<inline/>
<sleep milliseconds="3000"/>
</rom>
</config>
<route>
<service name="Timer"> <child name="timer"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="test-capture" priority="-1" caps="200">
<binary name="init"/>
<resource name="RAM" quantum="16M"/>
<route>
<service name="ROM" label="config">
<child name="test_config" label="config"/>
</service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Gui"> <child name="nitpicker"/> </service>
<service name="Capture"> <child name="webcam"/> </service>
<any-service> <parent/> </any-service>
</route>
</start>
<start name="webcam" priority="-1" caps="900">
<binary name="init"/>
<resource name="RAM" quantum="64M"/>
<route>
<service name="ROM" label="config"> <parent label="usb_webcam.config"/> </service>
<service name="Timer"> <child name="timer"/> </service>
<service name="Usb"> <child name="usb"/> </service>
<any-service> <parent /> </any-service>
</route>
<provides> <service name="Capture"/> <service name="Report"/> </provides>
</start>
</config>}
install_config $config
build_boot_image { }
append qemu_args { -usb -device usb-host,vendorid=[libuvc_vendor_id],productid=[libuvc_product_id] }
run_genode_until forever

View File

@ -1,7 +0,0 @@
set test_imports "[depot_user]/src/test-capture"
set test_binary "test-capture"
set test_vfs_config { }
source ${genode_dir}/repos/libports/run/webcam.inc

View File

@ -1,8 +0,0 @@
set test_imports "[depot_user]/src/test-vfs_capture \
[depot_user]/src/vfs_capture"
set test_binary "test-vfs_capture"
set test_vfs_config { <vfs><dir name="dev"><capture/></dir></vfs> }
source ${genode_dir}/repos/libports/run/webcam.inc

View File

@ -0,0 +1,2 @@
Test for the VFS capture session plugin

View File

@ -0,0 +1,3 @@
_/src/test-vfs_capture
_/src/vfs
_/src/vfs_capture

View File

@ -0,0 +1 @@
2024-12-10-c f3182fa61f59571b2a102df0b5e1278ecfedecb1

View File

@ -0,0 +1,18 @@
<runtime ram="8M" caps="200" binary="test-vfs_capture">
<requires> <capture/> <gui/> <timer/> </requires>
<config period_ms="20" width="1024" height="768">
<vfs><dir name="dev"><capture/></dir></vfs>
<view/>
</config>
<content>
<rom label="ld.lib.so"/>
<rom label="test-vfs_capture"/>
<rom label="vfs"/>
<rom label="vfs.lib.so"/>
<rom label="vfs_capture.lib.so"/>
</content>
</runtime>