diff --git a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig index 095e98f32f..455fd0c452 100644 --- a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig +++ b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig @@ -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 diff --git a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig index ccd4d52b30..916bf6eb6c 100644 --- a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig @@ -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 diff --git a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig index 0966303ad3..e0a10f2260 100644 --- a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig +++ b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig @@ -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 diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 75ece833cf..8b57c429c2 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -258,4 +258,6 @@ config OV2640_REGDEBUG endif +source "drivers/video/vnc/Kconfig" + endif # DRIVERS_VIDEO diff --git a/drivers/video/Make.defs b/drivers/video/Make.defs index 58036805c5..0828a4ae98 100644 --- a/drivers/video/Make.defs +++ b/drivers/video/Make.defs @@ -54,6 +54,8 @@ endif endif +include video/vnc/Make.defs + # Include video driver build support DEPPATH += --dep-path video diff --git a/graphics/vnc/server/Kconfig b/drivers/video/vnc/Kconfig similarity index 100% rename from graphics/vnc/server/Kconfig rename to drivers/video/vnc/Kconfig diff --git a/graphics/vnc/server/Make.defs b/drivers/video/vnc/Make.defs similarity index 86% rename from graphics/vnc/server/Make.defs rename to drivers/video/vnc/Make.defs index 4fbcf5fd87..36d8f11946 100644 --- a/graphics/vnc/server/Make.defs +++ b/drivers/video/vnc/Make.defs @@ -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 diff --git a/graphics/vnc/server/vnc_color.c b/drivers/video/vnc/vnc_color.c similarity index 99% rename from graphics/vnc/server/vnc_color.c rename to drivers/video/vnc/vnc_color.c index 7edb0b6550..d2320d8324 100644 --- a/graphics/vnc/server/vnc_color.c +++ b/drivers/video/vnc/vnc_color.c @@ -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 diff --git a/graphics/vnc/server/vnc_fbdev.c b/drivers/video/vnc/vnc_fbdev.c similarity index 99% rename from graphics/vnc/server/vnc_fbdev.c rename to drivers/video/vnc/vnc_fbdev.c index 14e81b9ff0..6f410282af 100644 --- a/graphics/vnc/server/vnc_fbdev.c +++ b/drivers/video/vnc/vnc_fbdev.c @@ -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 diff --git a/graphics/vnc/server/vnc_keymap.c b/drivers/video/vnc/vnc_keymap.c similarity index 99% rename from graphics/vnc/server/vnc_keymap.c rename to drivers/video/vnc/vnc_keymap.c index 4d889b91ee..47d419d154 100644 --- a/graphics/vnc/server/vnc_keymap.c +++ b/drivers/video/vnc/vnc_keymap.c @@ -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}, diff --git a/graphics/vnc/server/vnc_negotiate.c b/drivers/video/vnc/vnc_negotiate.c similarity index 99% rename from graphics/vnc/server/vnc_negotiate.c rename to drivers/video/vnc/vnc_negotiate.c index d54f1fe086..2dde71893d 100644 --- a/graphics/vnc/server/vnc_negotiate.c +++ b/drivers/video/vnc/vnc_negotiate.c @@ -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 diff --git a/graphics/vnc/server/vnc_raw.c b/drivers/video/vnc/vnc_raw.c similarity index 99% rename from graphics/vnc/server/vnc_raw.c rename to drivers/video/vnc/vnc_raw.c index 70d6622228..28ef292663 100644 --- a/graphics/vnc/server/vnc_raw.c +++ b/drivers/video/vnc/vnc_raw.c @@ -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 diff --git a/graphics/vnc/server/vnc_receiver.c b/drivers/video/vnc/vnc_receiver.c similarity index 99% rename from graphics/vnc/server/vnc_receiver.c rename to drivers/video/vnc/vnc_receiver.c index 580386e7b8..4cf3fea1d6 100644 --- a/graphics/vnc/server/vnc_receiver.c +++ b/drivers/video/vnc/vnc_receiver.c @@ -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 diff --git a/graphics/vnc/server/vnc_rre.c b/drivers/video/vnc/vnc_rre.c similarity index 99% rename from graphics/vnc/server/vnc_rre.c rename to drivers/video/vnc/vnc_rre.c index 384bbb21b6..de5b48e11b 100644 --- a/graphics/vnc/server/vnc_rre.c +++ b/drivers/video/vnc/vnc_rre.c @@ -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 diff --git a/graphics/vnc/server/vnc_server.c b/drivers/video/vnc/vnc_server.c similarity index 99% rename from graphics/vnc/server/vnc_server.c rename to drivers/video/vnc/vnc_server.c index 78c6a9c2c9..acea8e7c26 100644 --- a/graphics/vnc/server/vnc_server.c +++ b/drivers/video/vnc/vnc_server.c @@ -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 diff --git a/graphics/vnc/server/vnc_server.h b/drivers/video/vnc/vnc_server.h similarity index 99% rename from graphics/vnc/server/vnc_server.h rename to drivers/video/vnc/vnc_server.h index 2f9ea96939..139f97c082 100644 --- a/graphics/vnc/server/vnc_server.h +++ b/drivers/video/vnc/vnc_server.h @@ -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 diff --git a/graphics/vnc/server/vnc_updater.c b/drivers/video/vnc/vnc_updater.c similarity index 99% rename from graphics/vnc/server/vnc_updater.c rename to drivers/video/vnc/vnc_updater.c index f2a7958c52..6a0f474a2e 100644 --- a/graphics/vnc/server/vnc_updater.c +++ b/drivers/video/vnc/vnc_updater.c @@ -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 diff --git a/graphics/Kconfig b/graphics/Kconfig index 82e12023b0..ce38e86317 100644 --- a/graphics/Kconfig +++ b/graphics/Kconfig @@ -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 diff --git a/graphics/Makefile b/graphics/Makefile index 6e867a722c..b92b270783 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -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} diff --git a/graphics/README.txt b/graphics/README.txt index 3f357bf0a7..ac84228a7d 100644 --- a/graphics/README.txt +++ b/graphics/README.txt @@ -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 ^^^^^^^^^^^^^^^^^^^^ diff --git a/graphics/vnc/Kconfig b/graphics/vnc/Kconfig deleted file mode 100644 index fed2283d62..0000000000 --- a/graphics/vnc/Kconfig +++ /dev/null @@ -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" diff --git a/graphics/vnc/Make.defs b/graphics/vnc/Make.defs deleted file mode 100644 index 827b05ecfe..0000000000 --- a/graphics/vnc/Make.defs +++ /dev/null @@ -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 diff --git a/graphics/vnc/client/Kconfig b/graphics/vnc/client/Kconfig deleted file mode 100644 index fd8ece4eda..0000000000 --- a/graphics/vnc/client/Kconfig +++ /dev/null @@ -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 diff --git a/graphics/vnc/client/Make.defs b/graphics/vnc/client/Make.defs deleted file mode 100644 index 5994ef0021..0000000000 --- a/graphics/vnc/client/Make.defs +++ /dev/null @@ -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