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

Fixes for LWIP in the uGFXnet driver.

Browse source
This commit is contained in:
inmarket 2013-11-16 22:50:05 +10:00
parent 915c368505
commit c0f52dee38
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,6 +43,7 @@
#if defined(WIN32) || GFX_USE_OS_WIN32 #if defined(WIN32) || GFX_USE_OS_WIN32
#include <winsock.h> #include <winsock.h>
#define SOCKET_TYPE SOCKET
static void StopSockets(void) { static void StopSockets(void) {
WSACleanup(); WSACleanup();
@ -64,12 +65,11 @@
#define closesocket(fd) close(fd) #define closesocket(fd) close(fd)
#define ioctlsocket(fd,cmd,arg) ioctl(fd,cmd,arg) #define ioctlsocket(fd,cmd,arg) ioctl(fd,cmd,arg)
#define StartSockets() #define StartSockets()
#ifndef SOCKET #define SOCKET_TYPE int
#define SOCKET int
#endif
#else #else
extern void StartSockets(void); // Where the application does the lwip stack setup extern void Start_LWIP(void); // Where the application does the lwip stack setup
#define StartSockets() Start_LWIP();
#define LWIP_COMPAT_SOCKETS TRUE #define LWIP_COMPAT_SOCKETS TRUE
#include <lwip/sockets.h> #include <lwip/sockets.h>
@ -79,9 +79,7 @@
#if !LWIP_COMPAT_SOCKETS #if !LWIP_COMPAT_SOCKETS
#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
#ifndef SOCKET #define SOCKET_TYPE int
#define SOCKET int
#endif
#endif #endif
#define GDISP_FLG_HASMOUSE (GDISP_FLG_DRIVER<<0) #define GDISP_FLG_HASMOUSE (GDISP_FLG_DRIVER<<0)
@ -98,7 +96,7 @@
/*===========================================================================*/ /*===========================================================================*/
typedef struct netPriv { typedef struct netPriv {
SOCKET netfd; // The current socket SOCKET_TYPE netfd; // The current socket
unsigned databytes; // How many bytes have been read unsigned databytes; // How many bytes have been read
uint16_t data[2]; // Buffer for storing data read. uint16_t data[2]; // Buffer for storing data read.
#if GINPUT_NEED_MOUSE #if GINPUT_NEED_MOUSE
@ -119,7 +117,7 @@ static gfxThreadHandle hThread;
* Note that contents of the packet are modified to ensure it will cross the wire in the correct format. * Note that contents of the packet are modified to ensure it will cross the wire in the correct format.
* If the connection closes before we send all the data - the call returns FALSE. * If the connection closes before we send all the data - the call returns FALSE.
*/ */
static bool_t sendpkt(SOCKET netfd, uint16_t *pkt, int len) { static bool_t sendpkt(SOCKET_TYPE netfd, uint16_t *pkt, int len) {
int i; int i;
// Convert each uint16_t to network order // Convert each uint16_t to network order
@ -133,7 +131,7 @@ static bool_t sendpkt(SOCKET netfd, uint16_t *pkt, int len) {
static DECLARE_THREAD_STACK(waNetThread, 512); static DECLARE_THREAD_STACK(waNetThread, 512);
static DECLARE_THREAD_FUNCTION(NetThread, param) { static DECLARE_THREAD_FUNCTION(NetThread, param) {
SOCKET listenfd, fdmax, i, clientfd; SOCKET_TYPE listenfd, fdmax, i, clientfd;
socklen_t len; socklen_t len;
int leni; int leni;
unsigned disp; unsigned disp;
@ -145,12 +143,13 @@ static DECLARE_THREAD_FUNCTION(NetThread, param) {
// Start the sockets layer // Start the sockets layer
StartSockets(); StartSockets();
gfxSleepMilliseconds(100); // Make sure the thread has time to start.
/* clear the master and temp sets */ /* clear the master and temp sets */
FD_ZERO(&master); FD_ZERO(&master);
FD_ZERO(&read_fds); FD_ZERO(&read_fds);
if ((listenfd = socket(AF_INET, SOCK_STREAM, 0)) == (SOCKET)-1) if ((listenfd = socket(AF_INET, SOCK_STREAM, 0)) == (SOCKET_TYPE)-1)
gfxHalt("GDISP: uGFXnet - Socket failed"); gfxHalt("GDISP: uGFXnet - Socket failed");
memset(&addr, 0, sizeof(addr)); memset(&addr, 0, sizeof(addr));
@ -186,7 +185,7 @@ static DECLARE_THREAD_FUNCTION(NetThread, param) {
// Handle new connections // Handle new connections
if(i == listenfd) { if(i == listenfd) {
len = sizeof(addr); len = sizeof(addr);
if((clientfd = accept(listenfd, (struct sockaddr *)&addr, &len)) == (SOCKET)-1) if((clientfd = accept(listenfd, (struct sockaddr *)&addr, &len)) == (SOCKET_TYPE)-1)
gfxHalt("GDISP: uGFXnet - Accept failed"); gfxHalt("GDISP: uGFXnet - Accept failed");
// Look for a display that isn't connected // Look for a display that isn't connected