sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename up_nxdrvinit() to board_graphics_setup(). Add CONFIG_BOARDCTL_GRAPHICS that will enabled calls to board_graphics_setup() from boardctrl(). In apps/ and NxWidgts/, replace all calls to up_nxdrvinit with calls to boardctl().

Browse Source
This commit is contained in:
Gregory Nutt 2015-03-31 16:20:21 -06:00
parent ebb17341d0
commit 8ab1540770
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libnxwidgets/src/cnxserver.cxx
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* NxWidgets/libnxwidgets/src/cnxserver.cxx * NxWidgets/libnxwidgets/src/cnxserver.cxx
* *
* Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2012, 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,6 +40,7 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/boardctl.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
@ -125,10 +126,10 @@ bool CNxServer::connect(void)
#if defined(CONFIG_NXWIDGETS_EXTERNINIT) #if defined(CONFIG_NXWIDGETS_EXTERNINIT)
// Use external graphics driver initialization // Use external graphics driver initialization
m_hDevice = up_nxdrvinit(CONFIG_NXWIDGETS_DEVNO); m_hDevice = boardctl(BOARDIOC_GRAPHICS_SETUP, CONFIG_NXWIDGETS_DEVNO);
if (!m_hDevice) if (!m_hDevice)
{ {
gdbg("up_nxdrvinit failed, devno=%d\n", CONFIG_NXWIDGETS_DEVNO); gdbg("boardctl failed, devno=%d\n", CONFIG_NXWIDGETS_DEVNO);
return false; return false;
} }
@ -357,10 +358,10 @@ int CNxServer::server(int argc, char *argv[])
#if defined(CONFIG_NXWIDGETS_EXTERNINIT) #if defined(CONFIG_NXWIDGETS_EXTERNINIT)
// Use external graphics driver initialization // Use external graphics driver initialization
dev = up_nxdrvinit(CONFIG_NXWIDGETS_DEVNO); dev = boardctl(BOARDIOC_GRAPHICS_SETUP, CONFIG_NXWIDGETS_DEVNO);
if (!dev) if (!dev)
{ {
gdbg("up_nxdrvinit failed, devno=%d\n", CONFIG_NXWIDGETS_DEVNO); gdbg("boardctl failed, devno=%d\n", CONFIG_NXWIDGETS_DEVNO);
return EXIT_FAILURE; return EXIT_FAILURE;
} }