1.1 --- a/pkg/devices/lcd/src/jz4740/lcd-jz4740-device.cc Fri Jun 01 22:53:02 2018 +0200
1.2 +++ b/pkg/devices/lcd/src/jz4740/lcd-jz4740-device.cc Fri Jun 01 23:36:17 2018 +0200
1.3 @@ -22,7 +22,7 @@
1.4 #include <l4/devices/cpm-client.h>
1.5 #include <l4/devices/display-client.h>
1.6 #include <l4/devices/lcd-jz4740.h>
1.7 -#include <l4/devices/dl.h>
1.8 +#include <l4/devices/panel-loader.h>
1.9 #include <l4/devices/memory.h>
1.10 #include "lcd-jz4740-device.h"
1.11
1.12 @@ -46,10 +46,6 @@
1.13 static L4::Cap<Cpm_device_interface> cpm_device;
1.14 static L4::Cap<Display_device_interface> display_device;
1.15
1.16 -// Panel definition.
1.17 -
1.18 -static struct Jz4740_lcd_panel *panel;
1.19 -
1.20
1.21
1.22 // CPM operations.
1.23 @@ -246,13 +242,9 @@
1.24 display_device = L4Re::Env::env()->get_cap<Display_device_interface>("display");
1.25 if (!display_device.is_valid()) return 1;
1.26
1.27 - // Load the panel data.
1.28 + // Load the panel data from the configured library.
1.29
1.30 - void *(*panel_get)(void);
1.31 - panel_get = (void *(*)(void)) load_function("rom/mips-jz4740-panel.txt", "panel_get");
1.32 - if (!panel_get) return 1;
1.33 -
1.34 - panel = (struct Jz4740_lcd_panel *) panel_get();
1.35 + struct Jz4740_lcd_panel *panel = (struct Jz4740_lcd_panel *) load_panel();
1.36
1.37 // Initialise the LCD abstraction.
1.38