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

Merge remote-tracking branch 'origin/master' into vnc

Browse Source
This commit is contained in:
Gregory Nutt
2016-04-14 12:24:48 -06:00
parent d2f7483c24 46846c0c24
commit c6707e3dc1
13 changed files with 222 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graphics/nxmu/nx_start.c
+6 -4
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* graphics/nxmu/nx_start.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -128,16 +128,18 @@ int nx_server(int argc, char *argv[])
(void)dev->setpower(dev, ((3*CONFIG_LCD_MAXPOWER + 3)/4));
#else /* CONFIG_NX_LCDDRIVER */
/* Initialize the frame buffer device */
/* Initialize the frame buffer device.
* REVISIT: display == 0 is assumed.
*/
ret = up_fbinitialize();
ret = up_fbinitialize(0);
if (ret < 0)
{
gdbg("ERROR: up_fbinitialize failed: %d\n", ret);
return EXIT_FAILURE;
}
dev = up_fbgetvplane(CONFIG_NXSTART_VPLANE);
dev = up_fbgetvplane(0, CONFIG_NXSTART_VPLANE);
if (!dev)
{
gdbg("ERROR: up_fbgetvplane failed, vplane=%d\n", CONFIG_NXSTART_VPLANE);