uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Reliability fixes for uGFXnet running on LWIP.

Browse source 
Note LWIP requires a stack larger than the default of 512.
This commit is contained in:
inmarket 2013-11-17 20:26:49 +10:00
parent 1384918a1c
commit 643670ecd1
3 changed files with 57 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
View file

@ -30,6 +30,10 @@
#ifndef GDISP_DONT_WAIT_FOR_NET_DISPLAY #ifndef GDISP_DONT_WAIT_FOR_NET_DISPLAY
#define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE
#endif #endif
#ifndef GDISP_GFXNET_UNSAFE_SOCKETS
#define GDISP_GFXNET_UNSAFE_SOCKETS FALSE
#endif
#if GNETCODE_VERSION != GNETCODE_VERSION_1_0 #if GNETCODE_VERSION != GNETCODE_VERSION_1_0
#error "GDISP: uGFXnet - This driver only support protocol V1.0" #error "GDISP: uGFXnet - This driver only support protocol V1.0"
#endif #endif
@ -75,7 +79,7 @@
#define StartSockets() Start_LWIP(); #define StartSockets() Start_LWIP();
#else #else
#include "lwipthread.h" #include "lwipthread.h"
#define StartSockets() chThdCreateStatic(wa_lwip_thread, LWIP_THREAD_STACK_SIZE, NORMALPRIO + 1, lwip_thread, 0); #define StartSockets() gfxThreadClose(gfxThreadCreate(wa_lwip_thread, LWIP_THREAD_STACK_SIZE, NORMAL_PRIORITY, lwip_thread, 0))
#endif #endif
#if !LWIP_SOCKET #if !LWIP_SOCKET
@ -85,6 +89,13 @@
#error "GDISP: uGFXnet - LWIP_COMPAT_SOCKETS must be defined in your lwipopts.h file" #error "GDISP: uGFXnet - LWIP_COMPAT_SOCKETS must be defined in your lwipopts.h file"
#endif #endif
#define SOCKET_TYPE int #define SOCKET_TYPE int
// Mutex protection is required for LWIP
#if !GDISP_GFXNET_UNSAFE_SOCKETS
#warning "GDISP: uGFXnet - LWIP sockets are not thread-safe. GDISP_GFXNET_UNSAFE_SOCKETS has been turned on for you."
#undef GDISP_GFXNET_UNSAFE_SOCKETS
#define GDISP_GFXNET_UNSAFE_SOCKETS TRUE
#endif
#endif #endif
#define GDISP_FLG_HASMOUSE (GDISP_FLG_DRIVER<<0) #define GDISP_FLG_HASMOUSE (GDISP_FLG_DRIVER<<0)
@ -116,6 +127,17 @@ static gfxThreadHandle hThread;
static GDisplay * mouseDisplay; static GDisplay * mouseDisplay;
#endif #endif
#if GDISP_GFXNET_UNSAFE_SOCKETS
static gfxMutex uGFXnetMutex;
#define MUTEX_INIT gfxMutexInit(&uGFXnetMutex)
#define MUTEX_ENTER gfxMutexEnter(&uGFXnetMutex)
#define MUTEX_EXIT gfxMutexExit(&uGFXnetMutex)
#else
#define MUTEX_INIT
#define MUTEX_ENTER
#define MUTEX_EXIT
#endif
/** /**
* Send a whole packet of data. * Send a whole packet of data.
* Len is specified in the number of uint16_t's we want to send as our protocol only talks uint16_t's. * Len is specified in the number of uint16_t's we want to send as our protocol only talks uint16_t's.
@ -134,7 +156,7 @@ static bool_t sendpkt(SOCKET_TYPE netfd, uint16_t *pkt, int len) {
return send(netfd, (const char *)pkt, len, 0) == len; return send(netfd, (const char *)pkt, len, 0) == len;
} }
static DECLARE_THREAD_STACK(waNetThread, 1024); static DECLARE_THREAD_STACK(waNetThread, 512);
static DECLARE_THREAD_FUNCTION(NetThread, param) { static DECLARE_THREAD_FUNCTION(NetThread, param) {
SOCKET_TYPE listenfd, fdmax, i, clientfd; SOCKET_TYPE listenfd, fdmax, i, clientfd;
socklen_t len; socklen_t len;
@ -231,7 +253,9 @@ static DECLARE_THREAD_FUNCTION(NetThread, param) {
sendpkt(priv->netfd, priv->data, 2); sendpkt(priv->netfd, priv->data, 2);
priv->data[0] = GDISP_LLD_PIXELFORMAT; priv->data[0] = GDISP_LLD_PIXELFORMAT;
priv->data[1] = (g->flags & GDISP_FLG_HASMOUSE) ? 1 : 0; priv->data[1] = (g->flags & GDISP_FLG_HASMOUSE) ? 1 : 0;
MUTEX_ENTER;
sendpkt(priv->netfd, priv->data, 2); sendpkt(priv->netfd, priv->data, 2);
MUTEX_EXIT;
// The display is now working // The display is now working
g->flags |= GDISP_FLG_CONNECTED; g->flags |= GDISP_FLG_CONNECTED;
@ -271,14 +295,17 @@ static DECLARE_THREAD_FUNCTION(NetThread, param) {
} }
/* handle data from a client */ /* handle data from a client */
MUTEX_ENTER;
if ((leni = recv(i, ((char *)priv->data)+priv->databytes, sizeof(priv->data)-priv->databytes, 0)) <= 0) { if ((leni = recv(i, ((char *)priv->data)+priv->databytes, sizeof(priv->data)-priv->databytes, 0)) <= 0) {
// Socket closed or in error state // Socket closed or in error state
MUTEX_EXIT;
g->flags &= ~GDISP_FLG_CONNECTED; g->flags &= ~GDISP_FLG_CONNECTED;
memset(priv, 0, sizeof(netPriv)); memset(priv, 0, sizeof(netPriv));
closesocket(i); closesocket(i);
FD_CLR(i, &master); FD_CLR(i, &master);
continue; continue;
} }
MUTEX_EXIT;
// Do we have a full reply yet // Do we have a full reply yet
priv->databytes += leni; priv->databytes += leni;
@ -329,6 +356,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
// Initialise the receiver thread (if it hasn't been done already) // Initialise the receiver thread (if it hasn't been done already)
if (!hThread) { if (!hThread) {
MUTEX_INIT;
hThread = gfxThreadCreate(waNetThread, sizeof(waNetThread), HIGH_PRIORITY, NetThread, 0); hThread = gfxThreadCreate(waNetThread, sizeof(waNetThread), HIGH_PRIORITY, NetThread, 0);
gfxThreadClose(hThread); gfxThreadClose(hThread);
} }
@ -374,7 +402,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
priv = g->priv; priv = g->priv;
buf[0] = GNETCODE_FLUSH; buf[0] = GNETCODE_FLUSH;
MUTEX_ENTER;
sendpkt(priv->netfd, buf, 1); sendpkt(priv->netfd, buf, 1);
MUTEX_EXIT;
} }
#endif #endif
@ -396,7 +426,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
buf[1] = g->p.x; buf[1] = g->p.x;
buf[2] = g->p.y; buf[2] = g->p.y;
buf[3] = COLOR2NATIVE(g->p.color); buf[3] = COLOR2NATIVE(g->p.color);
MUTEX_ENTER;
sendpkt(priv->netfd, buf, 4); sendpkt(priv->netfd, buf, 4);
MUTEX_EXIT;
} }
#endif #endif
@ -422,7 +454,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
buf[3] = g->p.cx; buf[3] = g->p.cx;
buf[4] = g->p.cy; buf[4] = g->p.cy;
buf[5] = COLOR2NATIVE(g->p.color); buf[5] = COLOR2NATIVE(g->p.color);
MUTEX_ENTER;
sendpkt(priv->netfd, buf, 6); sendpkt(priv->netfd, buf, 6);
MUTEX_EXIT;
} }
#endif #endif
@ -451,6 +485,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
buf[2] = g->p.y; buf[2] = g->p.y;
buf[3] = g->p.cx; buf[3] = g->p.cx;
buf[4] = g->p.cy; buf[4] = g->p.cy;
MUTEX_ENTER;
sendpkt(priv->netfd, buf, 5); sendpkt(priv->netfd, buf, 5);
for(y = 0; y < g->p.cy; y++, buffer += g->p.x2 - g->p.cx) { for(y = 0; y < g->p.cy; y++, buffer += g->p.x2 - g->p.cx) {
@ -459,6 +494,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
sendpkt(priv->netfd, buf, 1); sendpkt(priv->netfd, buf, 1);
} }
} }
MUTEX_EXIT;
} }
#endif #endif
@ -480,7 +516,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
buf[0] = GNETCODE_READ; buf[0] = GNETCODE_READ;
buf[1] = g->p.x; buf[1] = g->p.x;
buf[2] = g->p.y; buf[2] = g->p.y;
MUTEX_ENTER;
sendpkt(priv->netfd, buf, 3); sendpkt(priv->netfd, buf, 3);
MUTEX_EXIT;
// Now wait for a reply // Now wait for a reply
while(!(g->flags & GDISP_FLG_HAVEDATA) || priv->data[0] != GNETCODE_READ) while(!(g->flags & GDISP_FLG_HAVEDATA) || priv->data[0] != GNETCODE_READ)
@ -513,7 +551,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
buf[3] = g->p.cx; buf[3] = g->p.cx;
buf[4] = g->p.cy; buf[4] = g->p.cy;
buf[5] = g->p.y1; buf[5] = g->p.y1;
MUTEX_ENTER;
sendpkt(priv->netfd, buf, 6); sendpkt(priv->netfd, buf, 6);
MUTEX_EXIT;
} }
#endif #endif
@ -556,7 +596,9 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
buf[0] = GNETCODE_CONTROL; buf[0] = GNETCODE_CONTROL;
buf[1] = g->p.x; buf[1] = g->p.x;
buf[2] = (uint16_t)(int)g->p.ptr; buf[2] = (uint16_t)(int)g->p.ptr;
MUTEX_ENTER;
sendpkt(priv->netfd, buf, 3); sendpkt(priv->netfd, buf, 3);
MUTEX_EXIT;
// Now wait for a reply // Now wait for a reply
while(!(g->flags & GDISP_FLG_HAVEDATA) || priv->data[0] != GNETCODE_CONTROL) while(!(g->flags & GDISP_FLG_HAVEDATA) || priv->data[0] != GNETCODE_CONTROL)

14
drivers/multiple/uGFXnet/readme.txt
View file

@ -9,11 +9,19 @@ and a touchscreen driver.
#define GINPUT_USE_MOUSE TRUE #define GINPUT_USE_MOUSE TRUE
c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
d) Optionally the following (with appropriate values): d) Optionally the following (with appropriate values):
#define GDISP_SCREEN_WIDTH 640 #define GDISP_SCREEN_WIDTH 640 // Virtual display width
#define GDISP_SCREEN_HEIGHT 480 #define GDISP_SCREEN_HEIGHT 480 // Virtual display height
#define GDISP_GFXNET_UNSAFE_SOCKETS FALSE // Your socket library is not thread-safe
// LWIP automatically sets this to TRUE
#define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE // You want a custom Start_LWIP() function (LWIP only)
#define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE // Don't halt waiting for the first connection
$define GDISP_GFXNET_PORT 13001 // The TCP port the display sits on
2. To your makefile add the following lines: 2. To your makefile add the following lines:
include $(GFXLIB)/gfx.mk include $(GFXLIB)/gfx.mk
include $(GFXLIB)/drivers/multiple/uGFXnet/gdisp_lld.mk include $(GFXLIB)/drivers/multiple/uGFXnet/gdisp_lld.mk
3. Make sure you have networking libraries included. 3. Make sure you have networking libraries included in your Makefile.
NOTE: If you are using ChibiOS with LWIP - you will probably need to increase
the default stack size for the lwip_thread. 512 bytes seems too small. 1024 seems to work.

1
gfxconf.example.h
View file

@ -193,6 +193,7 @@
#define GDISP_GFXNET_PORT 13001 #define GDISP_GFXNET_PORT 13001
#define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE
#define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE
#define GDISP_GFXNET_UNSAFE_SOCKETS FALSE
#define GDISP_USE_DMA FALSE #define GDISP_USE_DMA FALSE
#define TDISP_COLUMNS 16 #define TDISP_COLUMNS 16
#define TDISP_ROWS 2 #define TDISP_ROWS 2