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

Remove GDISP_THREAD_CHIBIOS. This is always used now.

Browse source
This commit is contained in:
inmarket 2013-07-21 17:26:11 +10:00
parent 2bef5da2f3
commit 5b2d561483
4 changed files with 21 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
drivers/multiple/X/gdisp_lld.c
View file

@ -14,11 +14,6 @@
#if GFX_USE_GDISP #if GFX_USE_GDISP
/* Our threading model - ChibiOS or POSIX */
#ifndef GDISP_THREAD_CHIBIOS
#define GDISP_THREAD_CHIBIOS TRUE
#endif
/** /**
* Our color model - Default or 24 bit only. * Our color model - Default or 24 bit only.
* *
@ -42,9 +37,6 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#if !GDISP_THREAD_CHIBIOS
#include <pthread.h>
#endif
#ifndef GDISP_SCREEN_HEIGHT #ifndef GDISP_SCREEN_HEIGHT
#define GDISP_SCREEN_HEIGHT 480 #define GDISP_SCREEN_HEIGHT 480
@ -116,34 +108,19 @@ static void ProcessEvent(void) {
} }
/* this is the X11 thread which keeps track of all events */ /* this is the X11 thread which keeps track of all events */
#if GDISP_THREAD_CHIBIOS static DECLARE_THREAD_STACK(waXThread, 1024);
static DECLARE_THREAD_STACK(waXThread, 1024); static DECLARE_THREAD_FUNCTION(ThreadX, arg) {
static DECLARE_THREAD_FUNCTION(ThreadX, arg) { (void)arg;
(void)arg;
while(1) { while(1) {
gfxSleepMilliseconds(100); gfxSleepMilliseconds(100);
while(XPending(dis)) { while(XPending(dis)) {
XNextEvent(dis, &evt); XNextEvent(dis, &evt);
ProcessEvent(); ProcessEvent();
}
} }
return 0;
} }
#else return 0;
static void * ThreadX(void *arg) { }
(void)arg;
while(1) {
pthread_yield(); // This could be a 100ms delay
while(XPending(dis)) {
XNextEvent(dis, &evt);
ProcessEvent();
}
}
return 0;
}
#endif
static int FatalXIOError(Display *d) { static int FatalXIOError(Display *d) {
(void) d; (void) d;
@ -159,12 +136,9 @@ bool_t gdisp_lld_init(void)
XSetWindowAttributes xa; XSetWindowAttributes xa;
XTextProperty WindowTitle; XTextProperty WindowTitle;
char * WindowTitleText; char * WindowTitleText;
#if GDISP_THREAD_CHIBIOS gfxThreadHandle hth;
gfxThreadHandle hth;
#else
pthread_attr_t thattr;
pthread_t thid;
#if GFX_USE_OS_POSIX
XInitThreads(); XInitThreads();
#endif #endif
@ -227,22 +201,15 @@ bool_t gdisp_lld_init(void)
XSelectInput(dis, win, XSelectInput(dis, win,
ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask); ExposureMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask);
#if GDISP_THREAD_CHIBIOS if (!(hth = gfxThreadCreate(waXThread, sizeof(waXThread), HIGH_PRIORITY, ThreadX, 0))) {
if (!(hth = gfxThreadCreate(waXThread, sizeof(waXThread), HIGH_PRIORITY, ThreadX, 0))) { fprintf(stderr, "Cannot start X Thread\n");
fprintf(stderr, "Cannot start X Thread\n"); XCloseDisplay(dis);
XCloseDisplay(dis); exit(0);
exit(0); }
} #if GFX_USE_OS_POSIX
gfxThreadClose(hth); pthread_detach(hth);
#else
if (pthread_attr_init(&thattr)
|| pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED)
|| pthread_create(&thid, &thattr, ThreadX, 0)) {
fprintf(stderr, "Cannot start X Thread\n");
XCloseDisplay(dis);
exit(0);
}
#endif #endif
gfxThreadClose(hth);
/* Initialise the GDISP structure to match */ /* Initialise the GDISP structure to match */
GDISP.Orientation = GDISP_ROTATE_0; GDISP.Orientation = GDISP_ROTATE_0;

2
drivers/multiple/X/gdisp_lld_config.h
View file

@ -32,7 +32,7 @@
#define GDISP_HARDWARE_CONTROL FALSE #define GDISP_HARDWARE_CONTROL FALSE
#define GDISP_HARDWARE_CIRCLES FALSE #define GDISP_HARDWARE_CIRCLES FALSE
#define GDISP_HARDWARE_CIRCLEFILLS FALSE #define GDISP_HARDWARE_CIRCLEFILLS FALSE
#define GDISP_HARDWARE_ARCS FALSE #define GDISP_HARDWARE_ARCS FALSE
#define GDISP_HARDWARE_ARCFILLS FALSE #define GDISP_HARDWARE_ARCFILLS FALSE
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888

5
drivers/multiple/X/readme.txt
View file

@ -20,8 +20,3 @@ and a touchscreen driver.
3. Modify your makefile to add -lX11 to the DLIBS line. i.e. 3. Modify your makefile to add -lX11 to the DLIBS line. i.e.
DLIBS = -lX11 DLIBS = -lX11
3. If you changed your threading model to POSIX modify your makefile
to add -pthread to the CC (or DDEFS) line. i.e.
CC = $(TRGT)gcc -pthread

1
gfxconf.example.h
View file

@ -143,7 +143,6 @@
#define GDISP_USE_GPIO #define GDISP_USE_GPIO
#define TDISP_COLUMNS 16 #define TDISP_COLUMNS 16
#define TDISP_ROWS 2 #define TDISP_ROWS 2
#define GDISP_THREAD_CHIBIOS TRUE
*/ */
#endif /* _GFXCONF_H */ #endif /* _GFXCONF_H */