ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-24 21:15:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dde_linux: use linux memory primitives in impl/usb

Browse Source 
Issue #3953
This commit is contained in:
Alexander Boettcher 2020-11-20 11:16:41 +01:00 committed by Norman Feske
parent bad8caee3f
commit 2c639169fd
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
repos/dde_linux/src/include/lx_emul/impl/usb.h
View File

@ -12,7 +12,6 @@
*/ */
/* Linux kit includes */ /* Linux kit includes */
#include <lx_kit/malloc.h>
#include <lx_kit/usb.h> #include <lx_kit/usb.h>
int usb_control_msg(struct usb_device *dev, unsigned int pipe, int usb_control_msg(struct usb_device *dev, unsigned int pipe,
@ -30,13 +29,23 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,
dr->wLength = cpu_to_le16(size); dr->wLength = cpu_to_le16(size);
urb * u = (urb*) usb_alloc_urb(0, GFP_KERNEL); urb * u = (urb*) usb_alloc_urb(0, GFP_KERNEL);
if (!u) return -ENOMEM; if (!u) {
kfree(dr);
return -ENOMEM;
}
Sync_ctrl_urb * scu = (Sync_ctrl_urb *)kzalloc(sizeof(Sync_ctrl_urb), GFP_KERNEL);
if (!scu) {
usb_free_urb(u);
kfree(dr);
return -ENOMEM;
}
usb_fill_control_urb(u, dev, pipe, (unsigned char *)dr, data, usb_fill_control_urb(u, dev, pipe, (unsigned char *)dr, data,
size, nullptr, nullptr); size, nullptr, nullptr);
Sync_ctrl_urb * scu = new (Lx::Malloc::mem()) Genode::construct_at<Sync_ctrl_urb>(scu, *(Usb::Connection*)(dev->bus->controller), *u);
Sync_ctrl_urb(*(Usb::Connection*)(dev->bus->controller), *u);
scu->send(timeout); scu->send(timeout);
int ret = u->actual_length; int ret = u->actual_length;
usb_free_urb(u); usb_free_urb(u);
@ -59,8 +68,12 @@ struct urb *usb_alloc_urb(int iso_packets, gfp_t mem_flags)
int usb_submit_urb(struct urb *urb, gfp_t mem_flags) int usb_submit_urb(struct urb *urb, gfp_t mem_flags)
{ {
Urb * u = new (Lx::Malloc::mem()) Urb * u = (Urb *)kzalloc(sizeof(Urb), mem_flags);
Urb(*(Usb::Connection*)(urb->dev->bus->controller), *urb); if (!u)
return 1;
Genode::construct_at<Urb>(u, *(Usb::Connection*)(urb->dev->bus->controller), *urb);
u->send(); u->send();
return 0; return 0;
} }