Merge branch 'master' into list
This commit is contained in:
commit
30df14b595
2 changed files with 9 additions and 2 deletions
|
@ -510,6 +510,13 @@ bool_t ginputCalibrateMouse(uint16_t instance) {
|
||||||
MouseConfig.flags |= FLG_CAL_SAVED;
|
MouseConfig.flags |= FLG_CAL_SAVED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clear the screen using the GWIN default background color
|
||||||
|
#if GFX_USE_GWIN
|
||||||
|
gdispClear(gwinGetDefaultBgColor());
|
||||||
|
#else
|
||||||
|
gdispClear(White);
|
||||||
|
#endif
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,7 +103,7 @@
|
||||||
pi = pqueue->head;
|
pi = pqueue->head;
|
||||||
pqueue->head = pi->next;
|
pqueue->head = pi->next;
|
||||||
pi->next = 0;
|
pi->next = 0;
|
||||||
gfxSytemUnlock();
|
gfxSystemUnlock();
|
||||||
return pi;
|
return pi;
|
||||||
}
|
}
|
||||||
void gfxQueueGSyncPut(gfxQueueGSync *pqueue, gfxQueueGSyncItem *pitem) {
|
void gfxQueueGSyncPut(gfxQueueGSync *pqueue, gfxQueueGSyncItem *pitem) {
|
||||||
|
@ -184,7 +184,7 @@
|
||||||
pi = pqueue->head;
|
pi = pqueue->head;
|
||||||
pqueue->head = pi->next;
|
pqueue->head = pi->next;
|
||||||
pi->next = 0;
|
pi->next = 0;
|
||||||
gfxSytemUnlock();
|
gfxSystemUnlock();
|
||||||
|
|
||||||
gfxSemSignalI(&pi->sem);
|
gfxSemSignalI(&pi->sem);
|
||||||
gfxSemDestroy(&pi->sem);
|
gfxSemDestroy(&pi->sem);
|
||||||
|
|
Loading…
Add table
Reference in a new issue