Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:43:28 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

graphics: For consistency, rename fields fb->fbmem as in other structures.

Browse Source
This commit is contained in:
Gregory Nutt
2019-03-14 12:19:01 -06:00
parent 419c4cb6be
commit f2d90e6298
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxbe/nxbe_closewindow.c
+3 -3
View File
@@ -121,18 +121,18 @@ void nxbe_closewindow(FAR struct nxbe_window_s *wnd)
#ifdef CONFIG_NX_RAMBACKED #ifdef CONFIG_NX_RAMBACKED
/* Free any allocated, per-window framebuffer */ /* Free any allocated, per-window framebuffer */
if (wnd->fb != NULL) if (wnd->fbmem != NULL)
{ {
#ifdef CONFIG_BUILD_KERNEL #ifdef CONFIG_BUILD_KERNEL
DEBUGASSERT(wnd->npages > 0); DEBUGASSERT(wnd->npages > 0);
/* Return the pages to the poll */ /* Return the pages to the poll */
mm_pgfree((uintptr_t)wnd->fb, wnd->npages); mm_pgfree((uintptr_t)wnd->fbmem, wnd->npages);
#else #else
/* Return the memory to the user heap */ /* Return the memory to the user heap */
kumm_free(wnd->fb); kumm_free(wnd->fbmem);
#endif #endif
} }
#endif #endif
graphics/nxglib/fb/nxglib_copyrectangle.c
+1 -1
View File
@@ -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. * Copyright (C) 2008-2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
graphics/nxmu/nxmu_openwindow.c
+4 -4
View File
@@ -117,8 +117,8 @@ void nxmu_openwindow(FAR struct nxbe_state_s *be, FAR struct nxbe_window_s *wnd)
/* Allocate the pages */ /* Allocate the pages */
wnd->fb = (FAR nxgl_mxpixel_t *)mm_pgalloc(wnd->npages); wnd->fbmem = (FAR nxgl_mxpixel_t *)mm_pgalloc(wnd->npages);
if (wnd->fb == NULL) if (wnd->fbmem == NULL)
{ {
/* Fall back to no RAM back up */ /* 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. * levels.
*/ */
wnd->fb = (FAR nxgl_mxpixel_t *)kumm_malloc(fbsize); wnd->fbmem = (FAR nxgl_mxpixel_t *)kumm_malloc(fbsize);
if (wnd->fb == NULL) if (wnd->fbmem == NULL)
{ {
/* Fall back to no RAM back up */ /* Fall back to no RAM back up */
include/nuttx/nx/nxbe.h
+1 -1
View File
@@ -140,7 +140,7 @@ struct nxbe_window_s
uint16_t npages; /* Number of pages in allocation */ uint16_t npages; /* Number of pages in allocation */
#endif #endif
nxgl_coord_t stride; /* Width of framebuffer in bytes */ 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. * address spaced. Must be contiguous.
*/ */
#endif #endif
libs/libnx/nxmu/nx_constructwindow.c
+1 -1
View File
@@ -119,7 +119,7 @@ int nx_constructwindow(NXHANDLE handle, NXWINDOW hwnd, uint8_t flags,
wnd->npages = 0; wnd->npages = 0;
#endif #endif
wnd->stride = 0; wnd->stride = 0;
wnd->fb = NULL; wnd->fbmem = NULL;
#endif #endif
/* Request initialization the new window from the server */ /* Request initialization the new window from the server */