ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-22 10:21:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

libusb: fix constructor order in vfs_libusb

Browse Source
This commit is contained in:
Christian Helmuth 2023-03-10 12:44:18 +01:00
parent f2485f624b
commit 188a214a29
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/libports/lib/mk/vfs_libusb.mk
View File

@ -5,5 +5,3 @@ LIBS += libusb
vpath %.cc $(REP_DIR)/src/lib/vfs/libusb vpath %.cc $(REP_DIR)/src/lib/vfs/libusb
SHARED_LIB = yes SHARED_LIB = yes
CC_CXX_WARN_STRICT =

7
repos/libports/run/smartcard.run
View File

@ -109,12 +109,7 @@ set fd [open [run_dir]/genode/usb_host_drv.config w]
puts $fd $usb_config puts $fd $usb_config
close $fd close $fd
build_boot_image { build_boot_image "[build_artifacts] Info.plist"
test-smartcard
ld.lib.so pcsc-lite.lib.so ccid.lib.so libusb.lib.so
libc.lib.so vfs.lib.so libm.lib.so posix.lib.so
Info.plist vfs_libusb.lib.so vfs_pipe.lib.so
}
run_genode_until { Response: 62 0A 82 01 38 83 02 3F 00 8A 01 05 90 00} 30 run_genode_until { Response: 62 0A 82 01 38 83 02 3F 00 8A 01 05 90 00} 30

10
repos/libports/src/lib/vfs/libusb/vfs_libusb.cc
View File

@ -39,7 +39,6 @@ class Libusb_file_system : public Vfs::Single_file_system
Genode::Env &_env; Genode::Env &_env;
Vfs::Env::User &_vfs_user; Vfs::Env::User &_vfs_user;
Genode::Allocator_avl _alloc_avl; Genode::Allocator_avl _alloc_avl;
Usb::Connection _usb_connection;
Genode::Io_signal_handler<Libusb_vfs_handle> _state_changed_handler { Genode::Io_signal_handler<Libusb_vfs_handle> _state_changed_handler {
_env.ep(), *this, &Libusb_vfs_handle::_handle_state_changed }; _env.ep(), *this, &Libusb_vfs_handle::_handle_state_changed };
@ -53,6 +52,9 @@ class Libusb_file_system : public Vfs::Single_file_system
*/ */
} }
Usb::Connection _usb_connection {
_env, &_alloc_avl, "usb_device", 1024*1024, _state_changed_handler };
Genode::Io_signal_handler<Libusb_vfs_handle> _ack_avail_handler { Genode::Io_signal_handler<Libusb_vfs_handle> _ack_avail_handler {
_env.ep(), *this, &Libusb_vfs_handle::_handle_ack_avail }; _env.ep(), *this, &Libusb_vfs_handle::_handle_ack_avail };
@ -70,11 +72,7 @@ class Libusb_file_system : public Vfs::Single_file_system
Vfs::Env::User &vfs_user) Vfs::Env::User &vfs_user)
: :
Single_vfs_handle(ds, fs, alloc, 0), Single_vfs_handle(ds, fs, alloc, 0),
_env(env), _vfs_user(vfs_user), _alloc_avl(&alloc), _env(env), _vfs_user(vfs_user), _alloc_avl(&alloc)
_usb_connection(_env, &_alloc_avl,
"usb_device",
1024*1024,
_state_changed_handler)
{ {
_usb_connection.tx_channel()->sigh_ack_avail(_ack_avail_handler); _usb_connection.tx_channel()->sigh_ack_avail(_ack_avail_handler);
libusb_genode_usb_connection(&_usb_connection); libusb_genode_usb_connection(&_usb_connection);