From d4ac277df80c92596f76f87d428977c5ddd4203a Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 23 Apr 2016 13:26:52 -0600 Subject: [PATCH] Mostly costmetic updates to comments, README --- configs/samv71-xult/README.txt | 13 +++++++++++-- graphics/vnc/server/vnc_server.c | 5 +++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configs/samv71-xult/README.txt b/configs/samv71-xult/README.txt index f08af3deb4..5cec12dc25 100644 --- a/configs/samv71-xult/README.txt +++ b/configs/samv71-xult/README.txt @@ -2499,6 +2499,15 @@ Configuration sub-directories the vnc configuration. That probably all applies here as well. Only some initial testing has been performed: The configuration - does not work. No crashes or errors are reported, but the VNC - client window stays black. I have not yet dug into this. + does not work. The NuttX VNC server is crashing because of this + assertion: + + while (sem_wait(&session->queuesem) < 0) + ... + rect = (FAR struct vnc_fbupdate_s *)sq_remfirst(&session->updqueue); + DEBUGASSERT(rect != NULL); + + I would think that could mean only that the semaphore counting is + out of sync with the number of updates in the queue. + \ No newline at end of file diff --git a/graphics/vnc/server/vnc_server.c b/graphics/vnc/server/vnc_server.c index db49b55c61..cad2f5ca3f 100644 --- a/graphics/vnc/server/vnc_server.c +++ b/graphics/vnc/server/vnc_server.c @@ -133,7 +133,12 @@ static void vnc_reset_session(FAR struct vnc_session_s *session, session->fb = fb; session->display = display; session->state = VNCSERVER_INITIALIZED; + session->nwhupd = 0; session->change = true; + + /* Careful not to disturb the keyboard/mouse callouts set by + * vnc_fbinitialize(). Client related data left in garbage state. + */ } /****************************************************************************