1.1 --- a/pkg/devices/lcd/src/jz4740/lcd-jz4740-device.cc Fri Feb 16 23:11:25 2024 +0100
1.2 +++ b/pkg/devices/lcd/src/jz4740/lcd-jz4740-device.cc Sat Feb 17 23:04:12 2024 +0100
1.3 @@ -1,7 +1,7 @@
1.4 /*
1.5 * Common LCD device support for the JZ4740 and related SoCs.
1.6 *
1.7 - * Copyright (C) 2018, 2020, 2021, 2023 Paul Boddie <paul@boddie.org.uk>
1.8 + * Copyright (C) 2018, 2020, 2021, 2023, 2024 Paul Boddie <paul@boddie.org.uk>
1.9 *
1.10 * This program is free software; you can redistribute it and/or
1.11 * modify it under the terms of the GNU General Public License as
1.12 @@ -104,9 +104,9 @@
1.13 // Configure the controller.
1.14
1.15 chip->disable();
1.16 - chip->config((struct Jz4740_lcd_descriptor *) desc_vaddr,
1.17 - (struct Jz4740_lcd_descriptor *) desc_paddr,
1.18 - fb_paddr);
1.19 + chip->config((struct Jz4740_lcd_descriptor *) _desc_region.vaddr,
1.20 + (struct Jz4740_lcd_descriptor *) _desc_region.paddr,
1.21 + _fb_region.paddr);
1.22
1.23 // Activate the display channel.
1.24
1.25 @@ -125,7 +125,7 @@
1.26 {
1.27 // Test for existing setup.
1.28
1.29 - if (fb_vaddr)
1.30 + if (_fb_region.vaddr)
1.31 return 0;
1.32
1.33 // Obtain the memory requirements.
1.34 @@ -140,14 +140,13 @@
1.35 // Allocate memory for the framebuffer at 2**8 == 256 byte == 64 word
1.36 // alignment, with 2**6 == 64 byte == 16 word alignment for the descriptors.
1.37
1.38 - long err = get_dma_region(fb_size, 8, &fb_vaddr, &fb_paddr, &_fbmem);
1.39 + struct dma_region region;
1.40 + long err = get_dma_region(fb_size, 8, &_fb_region);
1.41
1.42 if (err)
1.43 return 1;
1.44
1.45 - l4_cap_idx_t descmem;
1.46 -
1.47 - err = get_dma_region(desc_size, 6, &desc_vaddr, &desc_paddr, &descmem);
1.48 + err = get_dma_region(desc_size, 6, &_desc_region);
1.49
1.50 if (err)
1.51 return 1;