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

grahpics: Move VNC server to drivers/video

Browse Source 
and remove the empty VNC client

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-12-31 16:22:11 +08:00 committed by Xiang Xiao
parent 902d2197b0
commit 3e85d81686
24 changed files with 25 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
View File

@ -35,6 +35,7 @@ CONFIG_AT24XX_EXTENDED=y
CONFIG_AT24XX_EXTSIZE=160
CONFIG_AT24XX_SIZE=2
CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_DRIVERS_VIDEO=y
CONFIG_ETH0_PHY_KSZ8081=y
CONFIG_EXPERIMENTAL=y
CONFIG_FS_PROCFS=y
@ -117,6 +118,7 @@ CONFIG_START_YEAR=2019
CONFIG_SYSTEM_PING=y
CONFIG_TWM4NX_ARCHINIT=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_VIDEO_FB=y
CONFIG_VNCSERVER=y
CONFIG_VNCSERVER_COLORFMT_RGB8=y
CONFIG_VNCSERVER_PRIO=120

2
boards/arm/samv7/samv71-xult/configs/vnc/defconfig
View File

@ -37,6 +37,7 @@ CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_ETH0_PHY_KSZ8061=y
CONFIG_EXAMPLES_NXIMAGE=y
CONFIG_EXAMPLES_NXIMAGE_BPP=8
@ -114,5 +115,6 @@ CONFIG_START_YEAR=2014
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_PING=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_VIDEO_FB=y
CONFIG_VNCSERVER=y
CONFIG_VNCSERVER_COLORFMT_RGB8=y

2
boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
View File

@ -37,6 +37,7 @@ CONFIG_BOARD_LOOPSPERMSEC=51262
CONFIG_BUILTIN=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DRIVERS_VIDEO=y
CONFIG_ETH0_PHY_KSZ8061=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
@ -146,5 +147,6 @@ CONFIG_START_MONTH=3
CONFIG_START_YEAR=2014
CONFIG_SYSTEM_PING=y
CONFIG_USART1_SERIAL_CONSOLE=y
CONFIG_VIDEO_FB=y
CONFIG_VNCSERVER=y
CONFIG_VNCSERVER_COLORFMT_RGB8=y

2
drivers/video/Kconfig
View File

@ -258,4 +258,6 @@ config OV2640_REGDEBUG
endif
source "drivers/video/vnc/Kconfig"
endif # DRIVERS_VIDEO

2
drivers/video/Make.defs
View File

@ -54,6 +54,8 @@ endif
endif
include video/vnc/Make.defs
# Include video driver build support
DEPPATH += --dep-path video

0
graphics/vnc/server/Kconfig → drivers/video/vnc/Kconfig
View File

8
graphics/vnc/server/Make.defs → drivers/video/vnc/Make.defs
View File

@ -1,5 +1,5 @@
############################################################################
# graphics/vnc/server/Make.defs
# drivers/video/vnc/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
@ -23,8 +23,8 @@ ifeq ($(CONFIG_VNCSERVER),y)
CSRCS += vnc_server.c vnc_negotiate.c vnc_updater.c vnc_receiver.c
CSRCS += vnc_raw.c vnc_rre.c vnc_color.c vnc_fbdev.c vnc_keymap.c
DEPPATH += --dep-path vnc/server
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/server}
VPATH += :vnc/server
DEPPATH += --dep-path video/vnc
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)video$(DELIM)vnc}
VPATH += :video/vnc
endif

2
graphics/vnc/server/vnc_color.c → drivers/video/vnc/vnc_color.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_color.c
* drivers/video/vnc/vnc_color.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
graphics/vnc/server/vnc_fbdev.c → drivers/video/vnc/vnc_fbdev.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_fbdev.c
* drivers/video/vnc/vnc_fbdev.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

4
graphics/vnc/server/vnc_keymap.c → drivers/video/vnc/vnc_keymap.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_keymap.c
* drivers/video/vnc/vnc_keymap.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@ -121,7 +121,7 @@ static const struct vnc_keymap_s g_asciimap[] =
/* Alternative encodings */
{'`', XK_dead_grave},
{'´', XK_dead_acute},
{'\xb4', XK_dead_acute},
{ASCII_TILDE, XK_dead_tilde},
{ASCII_CARET, XK_dead_circumflex},

2
graphics/vnc/server/vnc_negotiate.c → drivers/video/vnc/vnc_negotiate.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_negotiate.c
* drivers/video/vnc/vnc_negotiate.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
graphics/vnc/server/vnc_raw.c → drivers/video/vnc/vnc_raw.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_raw.c
* drivers/video/vnc/vnc_raw.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
graphics/vnc/server/vnc_receiver.c → drivers/video/vnc/vnc_receiver.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_receiver.c
* drivers/video/vnc/vnc_receiver.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
graphics/vnc/server/vnc_rre.c → drivers/video/vnc/vnc_rre.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_rre.c
* drivers/video/vnc/vnc_rre.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
graphics/vnc/server/vnc_server.c → drivers/video/vnc/vnc_server.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_server.c
* drivers/video/vnc/vnc_server.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
graphics/vnc/server/vnc_server.h → drivers/video/vnc/vnc_server.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_server.h
* drivers/video/vnc/vnc_server.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

2
graphics/vnc/server/vnc_updater.c → drivers/video/vnc/vnc_updater.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* graphics/vnc/server/vnc_updater.c
* drivers/video/vnc/vnc_updater.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with

1
graphics/Kconfig
View File

@ -523,6 +523,5 @@ config NXSTART_DEVNO
---help---
LCD device number (in case there are more than one LCDs connected).
Default: 0
source "graphics/vnc/Kconfig"
endif # NX

1
graphics/Makefile
View File

@ -24,7 +24,6 @@ include nxglib/Make.defs
include nxbe/Make.defs
include nxmu/Make.defs
include nxterm/Make.defs
include vnc/Make.defs
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)$(DELIM)graphics}

4
graphics/README.txt
View File

@ -98,10 +98,6 @@ apps/grahpics/nxwidgets
The NxWidgets code is provided as a separate package located outside of the
NuttX source tree (probably at this location).
graphics/vnc
The future home of the VNC Remote Frame Buffer (RFB) server and client
implementations.
Installing New Fonts
^^^^^^^^^^^^^^^^^^^^

7
graphics/vnc/Kconfig
View File

@ -1,7 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
source "graphics/vnc/server/Kconfig"
source "graphics/vnc/client/Kconfig"

22
graphics/vnc/Make.defs
View File

@ -1,22 +0,0 @@
############################################################################
# graphics/vnc/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################
include vnc/server/Make.defs
include vnc/client/Make.defs

15
graphics/vnc/client/Kconfig
View File

@ -1,15 +0,0 @@
#
# For a description of the syntax of this configuration file,
# see the file kconfig-language.txt in the NuttX tools repository.
#
menuconfig VNCCLIENT
bool "VNC client"
default n
depends on NET_TCP && !VNC_SERVER && EXPERIMENTAL
---help---
Enable support for a VNC Remote Frame Buffer (RFB) client
if VNCCLIENT
endif # VNCCLIENT

27
graphics/vnc/client/Make.defs
View File

@ -1,27 +0,0 @@
############################################################################
# graphics/vnc/client/Make.defs
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership. The
# ASF licenses this file to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance with the
# License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
############################################################################
ifeq ($(CONFIG_VNCCLIENT),y)
DEPPATH += --dep-path vnc/client
CFLAGS += ${shell $(INCDIR) "$(CC)" $(TOPDIR)/graphics/vnc/client}
VPATH += :vnc/client
endif