graphics: For consistency, rename fields fb->fbmem as in other structures.
This commit is contained in:
parent
419c4cb6be
commit
f2d90e6298
|
@ -121,18 +121,18 @@ void nxbe_closewindow(FAR struct nxbe_window_s *wnd)
|
|||
#ifdef CONFIG_NX_RAMBACKED
|
||||
/* Free any allocated, per-window framebuffer */
|
||||
|
||||
if (wnd->fb != NULL)
|
||||
if (wnd->fbmem != NULL)
|
||||
{
|
||||
#ifdef CONFIG_BUILD_KERNEL
|
||||
DEBUGASSERT(wnd->npages > 0);
|
||||
|
||||
/* Return the pages to the poll */
|
||||
|
||||
mm_pgfree((uintptr_t)wnd->fb, wnd->npages);
|
||||
mm_pgfree((uintptr_t)wnd->fbmem, wnd->npages);
|
||||
#else
|
||||
/* Return the memory to the user heap */
|
||||
|
||||
kumm_free(wnd->fb);
|
||||
kumm_free(wnd->fbmem);
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/****************************************************************************
|
||||
* graphics/nxglib/fb/nxsglib_copyrectangle.c
|
||||
* graphics/nxglib/fb/nxglib_copyrectangle.c
|
||||
*
|
||||
* Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
|
||||
* Author: Gregory Nutt <gnutt@nuttx.org>
|
||||
|
|
|
@ -117,8 +117,8 @@ void nxmu_openwindow(FAR struct nxbe_state_s *be, FAR struct nxbe_window_s *wnd)
|
|||
|
||||
/* Allocate the pages */
|
||||
|
||||
wnd->fb = (FAR nxgl_mxpixel_t *)mm_pgalloc(wnd->npages);
|
||||
if (wnd->fb == NULL)
|
||||
wnd->fbmem = (FAR nxgl_mxpixel_t *)mm_pgalloc(wnd->npages);
|
||||
if (wnd->fbmem == NULL)
|
||||
{
|
||||
/* Fall back to no RAM back up */
|
||||
|
||||
|
@ -136,8 +136,8 @@ void nxmu_openwindow(FAR struct nxbe_state_s *be, FAR struct nxbe_window_s *wnd)
|
|||
* levels.
|
||||
*/
|
||||
|
||||
wnd->fb = (FAR nxgl_mxpixel_t *)kumm_malloc(fbsize);
|
||||
if (wnd->fb == NULL)
|
||||
wnd->fbmem = (FAR nxgl_mxpixel_t *)kumm_malloc(fbsize);
|
||||
if (wnd->fbmem == NULL)
|
||||
{
|
||||
/* Fall back to no RAM back up */
|
||||
|
||||
|
|
|
@ -140,7 +140,7 @@ struct nxbe_window_s
|
|||
uint16_t npages; /* Number of pages in allocation */
|
||||
#endif
|
||||
nxgl_coord_t stride; /* Width of framebuffer in bytes */
|
||||
FAR nxgl_mxpixel_t *fb; /* Allocated framebuffer in kernal
|
||||
FAR nxgl_mxpixel_t *fbmem; /* Allocated framebuffer in kernel
|
||||
* address spaced. Must be contiguous.
|
||||
*/
|
||||
#endif
|
||||
|
|
|
@ -119,7 +119,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd, uint8_t flags,
|
|||
wnd->npages = 0;
|
||||
#endif
|
||||
wnd->stride = 0;
|
||||
wnd->fb = NULL;
|
||||
wnd->fbmem = NULL;
|
||||
#endif
|
||||
|
||||
/* Request initialization the new window from the server */
|
||||
|
|
Loading…
Reference in New Issue