1.1 --- a/pkg/devices/lcd/src/jz4740/lcd-jz4740-device.cc Fri Jan 01 00:49:07 2021 +0100
1.2 +++ b/pkg/devices/lcd/src/jz4740/lcd-jz4740-device.cc Fri Jan 01 01:49:35 2021 +0100
1.3 @@ -19,7 +19,6 @@
1.4 * Boston, MA 02110-1301, USA
1.5 */
1.6
1.7 -#include <l4/devices/cpm-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 @@ -37,6 +36,7 @@
1.12 #include <stdint.h>
1.13
1.14 #include "activation_client.h"
1.15 +#include "cpm_client.h"
1.16
1.17 // Virtual addresses for the LCD register block.
1.18
1.19 @@ -46,8 +46,8 @@
1.20
1.21 static Lcd_jz4740_chip *lcd_chip = 0;
1.22
1.23 -static L4::Cap<Cpm_device_interface> cpm_device;
1.24 static Activation *display_device;
1.25 +static CPM *cpm_device;
1.26
1.27
1.28
1.29 @@ -265,8 +265,8 @@
1.30
1.31 // Obtain access to the CPM and display devices.
1.32
1.33 - cpm_device = L4Re::Env::env()->get_cap<Cpm_device_interface>("cpm");
1.34 - if (!cpm_device.is_valid()) return 1;
1.35 + l4_cap_idx_t cpm = l4re_env_get_cap("cpm");
1.36 + if (!l4_is_valid_cap(cpm)) return 1;
1.37
1.38 l4_cap_idx_t display = l4re_env_get_cap("display");
1.39 if (!l4_is_valid_cap(display)) return 1;
1.40 @@ -274,6 +274,9 @@
1.41 static client_Activation display_obj(display);
1.42 display_device = &display_obj;
1.43
1.44 + static client_CPM cpm_obj(cpm);
1.45 + cpm_device = &cpm_obj;
1.46 +
1.47 // Load the panel data from the configured library.
1.48
1.49 struct Jz4740_lcd_panel *panel = (struct Jz4740_lcd_panel *) load_panel();