diff --git a/repos/dde_linux/README b/repos/dde_linux/README index 7f3f66b2a..555829c23 100644 --- a/repos/dde_linux/README +++ b/repos/dde_linux/README @@ -45,7 +45,7 @@ hid xml tag: !... ! -! +! ! !... diff --git a/repos/dde_linux/src/lib/usb/include/platform.h b/repos/dde_linux/src/lib/usb/include/platform.h index ac28760b4..bafa05452 100644 --- a/repos/dde_linux/src/lib/usb/include/platform.h +++ b/repos/dde_linux/src/lib/usb/include/platform.h @@ -37,8 +37,8 @@ struct Services * Screen resolution used by touch devices to convert touchscreen * absolute coordinates to screen absolute coordinates */ - unsigned long screen_x = 0; - unsigned long screen_y = 0; + unsigned long screen_width = 0; + unsigned long screen_height = 0; Services() { @@ -50,10 +50,10 @@ struct Services try { Genode::Xml_node node_screen = node_hid.sub_node("screen"); - node_screen.attribute("x").value(&screen_x); - node_screen.attribute("y").value(&screen_y); + node_screen.attribute("width").value(&screen_width); + node_screen.attribute("height").value(&screen_height); } catch (...) { - screen_x = screen_y = 0; + screen_width = screen_height = 0; PDBG("Could not read screen resolution in config node"); } } catch (Xml_node::Nonexistent_sub_node) { diff --git a/repos/dde_linux/src/lib/usb/main.cc b/repos/dde_linux/src/lib/usb/main.cc index 65e175492..d77530d40 100644 --- a/repos/dde_linux/src/lib/usb/main.cc +++ b/repos/dde_linux/src/lib/usb/main.cc @@ -94,7 +94,8 @@ void start_usb_driver(Server::Entrypoint &ep) Services services; if (services.hid) - start_input_service(&ep.rpc_ep(), services.screen_x, services.screen_y); + start_input_service(&ep.rpc_ep(), services.screen_width, + services.screen_height); Timer::init(ep); Irq::init(ep);