diff --git a/graphics/nxbe/nxbe_closewindow.c b/graphics/nxbe/nxbe_closewindow.c index 61df9857b24..6c9cd295685 100644 --- a/graphics/nxbe/nxbe_closewindow.c +++ b/graphics/nxbe/nxbe_closewindow.c @@ -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 diff --git a/graphics/nxglib/fb/nxglib_copyrectangle.c b/graphics/nxglib/fb/nxglib_copyrectangle.c index a4e18cefda6..a6b5003acc5 100644 --- a/graphics/nxglib/fb/nxglib_copyrectangle.c +++ b/graphics/nxglib/fb/nxglib_copyrectangle.c @@ -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 diff --git a/graphics/nxmu/nxmu_openwindow.c b/graphics/nxmu/nxmu_openwindow.c index 39e203e87b3..e82a8b3b526 100644 --- a/graphics/nxmu/nxmu_openwindow.c +++ b/graphics/nxmu/nxmu_openwindow.c @@ -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 */ diff --git a/include/nuttx/nx/nxbe.h b/include/nuttx/nx/nxbe.h index 696a315d4cb..b3b6a982ede 100644 --- a/include/nuttx/nx/nxbe.h +++ b/include/nuttx/nx/nxbe.h @@ -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 diff --git a/libs/libnx/nxmu/nx_constructwindow.c b/libs/libnx/nxmu/nx_constructwindow.c index 2ea106b0a4f..6914bd15042 100644 --- a/libs/libnx/nxmu/nx_constructwindow.c +++ b/libs/libnx/nxmu/nx_constructwindow.c @@ -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 */