1.1 --- a/pkg/devices/lcd/src/jz4740/lcd-jz4740-device.cc Wed Dec 30 22:48:28 2020 +0100
1.2 +++ b/pkg/devices/lcd/src/jz4740/lcd-jz4740-device.cc Wed Dec 30 22:51:48 2020 +0100
1.3 @@ -20,7 +20,6 @@
1.4 */
1.5
1.6 #include <l4/devices/cpm-client.h>
1.7 -#include <l4/devices/display-client.h>
1.8 #include <l4/devices/lcd-jz4740.h>
1.9 #include <l4/devices/lcd-jz4780.h>
1.10 #include <l4/devices/panel-loader.h>
1.11 @@ -29,6 +28,7 @@
1.12
1.13 #include <l4/re/dataspace>
1.14 #include <l4/re/env>
1.15 +#include <l4/re/env.h>
1.16 #include <l4/re/mem_alloc>
1.17 #include <l4/re/rm>
1.18 #include <l4/re/util/cap_alloc>
1.19 @@ -36,6 +36,8 @@
1.20
1.21 #include <stdint.h>
1.22
1.23 +#include "activation_client.h"
1.24 +
1.25 // Virtual addresses for the LCD register block.
1.26
1.27 static l4_addr_t lcd_virt_base = 0, lcd_virt_base_end = 0;
1.28 @@ -45,7 +47,7 @@
1.29 static Lcd_jz4740_chip *lcd_chip = 0;
1.30
1.31 static L4::Cap<Cpm_device_interface> cpm_device;
1.32 -static L4::Cap<Display_device_interface> display_device;
1.33 +static Activation *display_device;
1.34
1.35
1.36
1.37 @@ -266,8 +268,11 @@
1.38 cpm_device = L4Re::Env::env()->get_cap<Cpm_device_interface>("cpm");
1.39 if (!cpm_device.is_valid()) return 1;
1.40
1.41 - display_device = L4Re::Env::env()->get_cap<Display_device_interface>("display");
1.42 - if (!display_device.is_valid()) return 1;
1.43 + l4_cap_idx_t display = l4re_env_get_cap("display");
1.44 + if (!l4_is_valid_cap(display)) return 1;
1.45 +
1.46 + static client_Activation display_obj(display);
1.47 + display_device = &display_obj;
1.48
1.49 // Load the panel data from the configured library.
1.50