# HG changeset patch # User Paul Boddie # Date 1499547750 -7200 # Node ID 49f8e5bfb1cd47b79e1ce7a5693128c95f6a7c75 # Parent b4dcc2099e0fcdd01df46b17abad2cd91ad23861 Initialise framebuffer structure reference members but correct them later. diff -r b4dcc2099e0f -r 49f8e5bfb1cd stage2/lcd.c --- a/stage2/lcd.c Sat Jul 08 21:06:58 2017 +0200 +++ b/stage2/lcd.c Sat Jul 08 23:02:30 2017 +0200 @@ -25,7 +25,6 @@ #include "board.h" extern vidinfo_t panel_info; -extern struct jzfb_info jzfb; static uint32_t lcd_base; static uint16_t get_line_length() @@ -264,7 +263,7 @@ /* Initialise the member here since the address is otherwise invalid. */ - panel_info.jz_fb = (struct jzfb_info *) ((uint32_t) &jzfb & ~0x80000000); + panel_info.jz_fb = (struct jzfb_info *) ((uint32_t) panel_info.jz_fb & ~0x80000000); lcd_base = lcd_ctrl_init(); lcd_clear(lcd_base); diff -r b4dcc2099e0f -r 49f8e5bfb1cd stage2/minipc_claa070vc01.c --- a/stage2/minipc_claa070vc01.c Sat Jul 08 21:06:58 2017 +0200 +++ b/stage2/minipc_claa070vc01.c Sat Jul 08 23:02:30 2017 +0200 @@ -29,4 +29,6 @@ 800, 480, 32, 60, 80, 20, 0, 0, 0, 0 }; -vidinfo_t panel_info; +vidinfo_t panel_info = { + .jz_fb=&jzfb // this will need correcting for user mode usage +}; diff -r b4dcc2099e0f -r 49f8e5bfb1cd stage2/nanonote_gpm940b0.c --- a/stage2/nanonote_gpm940b0.c Sat Jul 08 21:06:58 2017 +0200 +++ b/stage2/nanonote_gpm940b0.c Sat Jul 08 23:02:30 2017 +0200 @@ -34,4 +34,6 @@ .efw=1, .bfw=20 /* frame limits */ }; -vidinfo_t panel_info; +vidinfo_t panel_info = { + .jz_fb=&jzfb // this will need correcting for user mode usage +};